summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/i18n/af.po81
-rw-r--r--addons/mail/i18n/ar.po81
-rw-r--r--addons/mail/i18n/bg.po95
-rw-r--r--addons/mail/i18n/bs.po85
-rw-r--r--addons/mail/i18n/ca.po83
-rw-r--r--addons/mail/i18n/cs.po83
-rw-r--r--addons/mail/i18n/da.po83
-rw-r--r--addons/mail/i18n/de.po89
-rw-r--r--addons/mail/i18n/el.po85
-rw-r--r--addons/mail/i18n/en_GB.po81
-rw-r--r--addons/mail/i18n/es.po83
-rw-r--r--addons/mail/i18n/es_AR.po85
-rw-r--r--addons/mail/i18n/es_BO.po81
-rw-r--r--addons/mail/i18n/es_CL.po89
-rw-r--r--addons/mail/i18n/es_CO.po89
-rw-r--r--addons/mail/i18n/es_CR.po81
-rw-r--r--addons/mail/i18n/es_DO.po89
-rw-r--r--addons/mail/i18n/es_EC.po89
-rw-r--r--addons/mail/i18n/es_MX.po81
-rw-r--r--addons/mail/i18n/es_PE.po85
-rw-r--r--addons/mail/i18n/es_PY.po81
-rw-r--r--addons/mail/i18n/es_VE.po81
-rw-r--r--addons/mail/i18n/et.po83
-rw-r--r--addons/mail/i18n/fa.po83
-rw-r--r--addons/mail/i18n/fi.po85
-rw-r--r--addons/mail/i18n/fr.po89
-rw-r--r--addons/mail/i18n/fr_CA.po635
-rw-r--r--addons/mail/i18n/gl.po81
-rw-r--r--addons/mail/i18n/he.po99
-rw-r--r--addons/mail/i18n/hr.po89
-rw-r--r--addons/mail/i18n/hu.po89
-rw-r--r--addons/mail/i18n/id.po81
-rw-r--r--addons/mail/i18n/it.po87
-rw-r--r--addons/mail/i18n/ja.po95
-rw-r--r--addons/mail/i18n/ka.po85
-rw-r--r--addons/mail/i18n/kab.po81
-rw-r--r--addons/mail/i18n/ko.po81
-rw-r--r--addons/mail/i18n/lt.po83
-rw-r--r--addons/mail/i18n/lv.po81
-rw-r--r--addons/mail/i18n/mk.po85
-rw-r--r--addons/mail/i18n/mn.po85
-rw-r--r--addons/mail/i18n/nb.po81
-rw-r--r--addons/mail/i18n/nl.po91
-rw-r--r--addons/mail/i18n/nl_BE.po81
-rw-r--r--addons/mail/i18n/pl.po87
-rw-r--r--addons/mail/i18n/pt.po85
-rw-r--r--addons/mail/i18n/pt_BR.po89
-rw-r--r--addons/mail/i18n/ro.po83
-rw-r--r--addons/mail/i18n/ru.po87
-rw-r--r--addons/mail/i18n/sk.po89
-rw-r--r--addons/mail/i18n/sl.po85
-rw-r--r--addons/mail/i18n/sr.po81
-rw-r--r--addons/mail/i18n/sr@latin.po81
-rw-r--r--addons/mail/i18n/sv.po85
-rw-r--r--addons/mail/i18n/th.po87
-rw-r--r--addons/mail/i18n/tr.po85
-rw-r--r--addons/mail/i18n/uk.po89
-rw-r--r--addons/mail/i18n/vi.po91
-rw-r--r--addons/mail/i18n/zh_CN.po90
-rw-r--r--addons/mail/i18n/zh_TW.po83
60 files changed, 1728 insertions, 3939 deletions
diff --git a/addons/mail/i18n/af.po b/addons/mail/i18n/af.po
index 449daf907b4..3322caf6c4b 100644
--- a/addons/mail/i18n/af.po
+++ b/addons/mail/i18n/af.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "van"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Boodskappe"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s geskep"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Belangrike boodskappe"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Boodskappe"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Kennisgewing"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index e2d455cc871..5109ab11b84 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-15 20:50+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Arabic (http://www.transifex.com/odoo/odoo-9/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (نسخة)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "تم إنشاء %s"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "رسالة جديدة"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "صندوق الوارد"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "معرف - الرسالة"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "معرف - الرسالة"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "الرسائل"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "الإخطارات"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "إخطار المتابعين"
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 3c676d6dad2..4b20678888a 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -3,15 +3,15 @@
# * mail
#
# Translators:
-# Anton Vassilev <anton.vasilev@gmail.com>, 2016
+# Anton Vassilev, 2016
# Kaloyan Naumov <kaloyan@lumnus.net>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-16 08:22+0000\n"
-"Last-Translator: Anton Vassilev <anton.vasilev@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Bulgarian (http://www.transifex.com/odoo/odoo-9/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,13 +124,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "от"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -139,19 +134,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (копие)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s създадени"
@@ -275,20 +270,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@Входящи"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Входящи"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -811,9 +792,9 @@ msgstr "Съставяне на имейл"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -934,7 +915,7 @@ msgstr "Дата"
#: model:ir.model.fields,help:mail.field_res_partner_message_last_post
#: model:ir.model.fields,help:mail.field_res_users_message_last_post
msgid "Date of the last message posted on the record."
-msgstr ""
+msgstr "Дата на последното съобщение, публикувано на записа."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
@@ -998,20 +979,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1020,7 +987,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
msgid "Discuss"
-msgstr ""
+msgstr "Обсъждане"
#. module: mail
#: model:ir.model,name:mail.model_mail_channel
@@ -1318,7 +1285,7 @@ msgstr "Последователи"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
msgid "Followers (Channels)"
-msgstr ""
+msgstr "Последователи (канали)"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids
@@ -1326,7 +1293,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
msgid "Followers (Partners)"
-msgstr ""
+msgstr "Последователи (партньори)"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_subscription_form
@@ -1492,11 +1459,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1504,7 +1466,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Входящи"
@@ -1568,16 +1532,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1729,6 +1693,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1931,8 +1900,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1940,7 +1907,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Съобщения"
@@ -2139,13 +2105,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
@@ -3191,7 +3150,7 @@ msgstr "Непрочетени съобщения"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter
#: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter
msgid "Unread Messages Counter"
-msgstr ""
+msgstr "Брой непрочетени съобщения"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_search
diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po
index 7d3d44be396..a36d353a812 100644
--- a/addons/mail/i18n/bs.po
+++ b/addons/mail/i18n/bs.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-06 14:13+0000\n"
-"Last-Translator: bluesoft83 <bluesoft83@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Bosnian (http://www.transifex.com/odoo/odoo-9/language/bs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "od"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s kreiran"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Prijemno sanduče"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Prijemno sanduče"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Sastavi e-poštu"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Sastavi novu poruku"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Opis koji će biti dodan u objavljenoj poruci za ovaj podtip. Ako nedost
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Prijemno sanduče"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Id-poruke"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Id-poruke"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Poruke"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Obavještenje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 1f7e29d8256..7141b0e4975 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/ca.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-01 09:47+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -118,14 +120,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Sent by</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>using</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -138,19 +133,19 @@ msgstr "${object.subject o (object.record_name i 'Re: %s' % object.record_name)
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Missatges"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (còpia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creat"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Bústia d'entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Bústia d'entrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "Compondre correu electrònic"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr "Descripció que s'afegira al missatge enviat per aquest subtipus. Si no
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Si heu configurat un domini de correu \"agafa-ho tot\" re-dirigit a un servidor Odoo, entreu el nom del domini aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr "Pseudònim inactiu"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bústia d'entrada"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Id del missatge"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Id del missatge"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Missatges"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Notificació "
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificacions"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar als seguidors"
diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po
index d6696e1a392..a55f73ef6ec 100644
--- a/addons/mail/i18n/cs.po
+++ b/addons/mail/i18n/cs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-23 12:24+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Czech (http://www.transifex.com/odoo/odoo-9/language/cs/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,10 +790,10 @@ msgstr "Napsat e-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Napsat zprávu"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr "Popis, který bude přidánke zprávě tohoto poddruhu. Je-li prázdné,
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Příchozí zprávy"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "ID zprávy"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "ID zprávy"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Zprávy"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "Upozornění"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 3c18b9e631d..c7ba5e3db83 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-09 06:23+0000\n"
-"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Danish (http://www.transifex.com/odoo/odoo-9/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopi)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s oprettet"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "Opret e-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Indbakke"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Beskeder"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Påmindelse"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 145838a5b9f..1449c2ee98c 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-09 15:46+0000\n"
-"Last-Translator: Thorsten Vocks <thorsten.vocks@openbig.org>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,14 +124,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Über <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Absender</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>nutzt</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "von"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -142,19 +137,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Nachrichten"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s erstellt"
@@ -278,20 +273,6 @@ msgid ""
msgstr "<strong>Ferner empfehlen wir Ihnen das Massen-E-Mail Modul, wenn Sie viele E-Mails versenden wollen</strong>. <br/>\n Wenn Sie diesen Wizard beenden, so wird dies einige Minuten dauern. In dieser Zeit ist Ihr Browser blockiert."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Posteingang"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Posteingang"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -814,10 +795,10 @@ msgstr "E-Mail schreiben"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Eine neue Nachricht verfassen"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1001,20 +982,6 @@ msgstr "Beschreibung, die zur versendeten Nachricht hinzugefügt wird. Falls es
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Abtrennen"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Gespräch abtrennen"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1495,11 +1462,6 @@ msgid ""
msgstr "Wenn Sie eine Catch-All E-Mail-Aliasanschrift eingerichtet haben, geben Sie hier die Domain an."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Wichtige Nachrichten"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1507,7 +1469,9 @@ msgstr "Inaktiver Alias"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Eingang"
@@ -1571,17 +1535,17 @@ msgstr "Beobachter einladen"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Personen einladen"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Personen zu %s einladen"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1732,6 +1696,11 @@ msgid "Listeners"
msgstr "Zuhörer"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1934,8 +1903,6 @@ msgid "Message-Id"
msgstr "Nachricht-ID"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1943,7 +1910,6 @@ msgstr "Nachricht-ID"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mitteilungen"
@@ -2142,13 +2108,6 @@ msgid "Notification"
msgstr "Benachrichtigung"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Beobachter benachrichtigen"
diff --git a/addons/mail/i18n/el.po b/addons/mail/i18n/el.po
index 4384c763677..e9df6d84e5b 100644
--- a/addons/mail/i18n/el.po
+++ b/addons/mail/i18n/el.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-22 08:45+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "από"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (αντίγραφο)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s δημιουργήθηκε"
@@ -274,20 +269,6 @@ msgid ""
msgstr "<strong>Επιπλέον, αν θέλετε να στείλετε πολλά μηνύματα ηλεκτρονικού ταχυδρομείου, σας προτείνουμε να χρησιμοποιήσετε το άρθρωμα της μαζικής αλληλογραφίας</strong>.<br/>\nΕπιβεβαιώνοντας αυτόν τον οδηγό, κατά πάσα πιθανότητα θα κλειδώσει ο browser για λίγα λεπτά."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Εισερχόμενα"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Σύνταξη Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Σύνταξη νέου μηνύματος"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Περιγραφή που θα προστεθεί στο δημοσιεÏ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Αποσύνδεση"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Εάν έχετε ρυθμίσει στον τομέα (domain) ένα 'catch-all' email, να ανακατευθύνεται σε διακομιστή Odoo , πληκτρολογήστε το όνομα τομέα εδώ."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Σημαντικά μηνύματα"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr "Ανενεργό Ψευδώνυμο"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Εισερχόμενα"
@@ -1567,17 +1531,17 @@ msgstr "Πρόσκληση Ακόλουθου"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Πρόσκληση ατόμων"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Πρόσκληση ατόμων σε %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr "Ακροατές"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Κωδικός Μηνύματος"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Κωδικός Μηνύματος"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Μηνύματα"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Ειδοποίηση"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Ειδοποίηση ακολούθων"
diff --git a/addons/mail/i18n/en_GB.po b/addons/mail/i18n/en_GB.po
index 52ad05b5ba6..429d2ab0a32 100644
--- a/addons/mail/i18n/en_GB.po
+++ b/addons/mail/i18n/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/odoo/odoo-9/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Messages"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index bfda4bd29b7..2050f4e865e 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-22 15:46+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -28,8 +28,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -125,13 +127,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -142,19 +137,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -278,20 +273,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -814,10 +795,10 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Redactar un nuevo mensaje"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1001,20 +982,6 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1495,11 +1462,6 @@ msgid ""
msgstr "Si tiene un dominio de correo electrónico general redireccionado a un servidor de Odoo, ponga el nombre del dominio aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1507,7 +1469,9 @@ msgstr "Seudónimo inactivo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1571,16 +1535,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1732,6 +1696,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1934,8 +1903,6 @@ msgid "Message-Id"
msgstr "Id del mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1943,7 +1910,6 @@ msgstr "Id del mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2142,13 +2108,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar a los seguidores"
diff --git a/addons/mail/i18n/es_AR.po b/addons/mail/i18n/es_AR.po
index 0afcb930b60..e5194ca4f84 100644
--- a/addons/mail/i18n/es_AR.po
+++ b/addons/mail/i18n/es_AR.po
@@ -3,13 +3,13 @@
# * mail
#
# Translators:
-# Leonardo Germán Chianea <noamixcontenidos@gmail.com>, 2015
+# Leonardo Chianea <noamixcontenidos@gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/odoo/odoo-9/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Redactar un nuevo Mensaje"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "ID del mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "ID del mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notifique a los seguidores"
diff --git a/addons/mail/i18n/es_BO.po b/addons/mail/i18n/es_BO.po
index 2a48363d191..54bd9fb38b1 100644
--- a/addons/mail/i18n/es_BO.po
+++ b/addons/mail/i18n/es_BO.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Bolivia) (http://www.transifex.com/odoo/odoo-9/language/es_BO/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es_CL.po b/addons/mail/i18n/es_CL.po
index 5834050849e..a576750849f 100644
--- a/addons/mail/i18n/es_CL.po
+++ b/addons/mail/i18n/es_CL.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/odoo/odoo-9/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -118,13 +120,6 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"Ver ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Acerca <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Enviado por</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>usando</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
msgstr ""
#. module: mail
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -236,7 +231,7 @@ msgid ""
" <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">the current search filter</span>.\n"
" </span>\n"
" <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Followers of the document and</span>"
-msgstr ""
+msgstr "<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n <strong>Email masivo</strong> en\n <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\"> los registros seleccionados</span>\n <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">el actual filtro de búsqueda</span>.\n </span>\n <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Seguidores del documento y</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2135,14 +2101,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Notification"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
+msgstr "Notificación"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
@@ -2333,7 +2292,7 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_mail
msgid "Outgoing Mails"
-msgstr ""
+msgstr "Correos Salientes"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_mail_server_id
@@ -3278,7 +3237,7 @@ msgstr "Usuarios"
#: code:addons/mail/models/mail_thread.py:595
#, python-format
msgid "View"
-msgstr "Vista"
+msgstr "Ver"
#. module: mail
#. openerp-web
diff --git a/addons/mail/i18n/es_CO.po b/addons/mail/i18n/es_CO.po
index 307285584ef..f11d7550fa3 100644
--- a/addons/mail/i18n/es_CO.po
+++ b/addons/mail/i18n/es_CO.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-19 15:04+0000\n"
-"Last-Translator: Esteban Echeverry <tebanep@nubark.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,14 +122,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n% endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n\n% elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Enviado por</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>usando</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n% endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n</td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -140,19 +135,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado/a"
@@ -276,20 +271,6 @@ msgid ""
msgstr "<strong> Por otra parte, si usted desea enviar una gran cantidad de mensajes de correo electrónico, le recomendamos que utilice el módulo de envío masivo de correo </strong>. <br/>\nConfirmar este asistente probablemente tomará unos minutos bloqueando su navegador."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Inbox"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@BandejadeEntrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Redactar Correo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Redactar Nuevo Mensaje"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr "Descripción que será añadida en el mensaje enviado para este subtipo.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Dividir"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Dividir la conversación"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr "Si tiene un dominio de correo electrónico general redireccionado a un servidor de Odoo, ponga el nombre del dominio aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Mensajes importantes"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Alias Inactivo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inbox"
@@ -1569,17 +1533,17 @@ msgstr "Invitar Seguidor"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Invitar personas"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Invitar personas a %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr "Seguidores"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "Id-Mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "Id-Mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar a los seguidores"
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index 0a4b6889ddd..3bc3af64bbb 100644
--- a/addons/mail/i18n/es_CR.po
+++ b/addons/mail/i18n/es_CR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Costa Rica) (http://www.transifex.com/odoo/odoo-9/language/es_CR/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "Id del mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "Id del mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es_DO.po b/addons/mail/i18n/es_DO.po
index 4258073ac7c..407fa5d989f 100644
--- a/addons/mail/i18n/es_DO.po
+++ b/addons/mail/i18n/es_DO.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-13 21:31+0000\n"
-"Last-Translator: Juliano Henriquez <juliano@consultoriahenca.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Dominican Republic) (http://www.transifex.com/odoo/odoo-9/language/es_DO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,14 +122,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Sent by</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>using</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "De"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -140,19 +135,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -276,20 +271,6 @@ msgid ""
msgstr "<strong>Por otra parte, si usted desea enviar una gran cantidad de mensajes de correo electrónico, le recomendamos que utilice el módulo de correo masivo.</strong> <br/> Confirmando este asistente Probablemente tomará unos minutos bloqueando su navegador."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Bandeja de entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "Bandeja de entrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Redactar un nuevo mensaje"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Desprender"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Separe la conversación"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr "Si tiene un dominio de correo electrónico general redireccionado a un servidor de Odoo, ponga el nombre del dominio aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Mensajes importantes"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Seudónimo inactivo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1569,17 +1533,17 @@ msgstr "Invitar Seguidor"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Invitar personas"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Invitar a personas a %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr "Miembros"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "Id del mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "Id del mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificación"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar a los seguidores"
diff --git a/addons/mail/i18n/es_EC.po b/addons/mail/i18n/es_EC.po
index 1a2582ff345..4805eb1eb43 100644
--- a/addons/mail/i18n/es_EC.po
+++ b/addons/mail/i18n/es_EC.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-10 19:40+0000\n"
-"Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,14 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Enviado por</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>usando</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -277,20 +272,6 @@ msgid ""
msgstr "<strong> Por otra parte, si usted desea enviar una gran cantidad de mensajes de correo electrónico, le recomendamos que utilice el módulo de envío masivo de correo </strong>. <br/>\nConfirmar este asistente probablemente tomará unos minutos bloqueando su navegador."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Bandeja de entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@BandejadeEntrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Componer correo electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Redactar un nuevo mensaje"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Dividir"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Dividir la conversación"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr "Si tiene un dominio de correo electrónico general redireccionado a un servidor de Odoo, ponga el nombre del dominio aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Mensajes importantes"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr "Seudónimo inactivo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1570,17 +1534,17 @@ msgstr "Invitar seguidor"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Invitar personas"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Invitar personas a a%s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr "Seguidore"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "Id del mensaje"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "Id del mensaje"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificaciones"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar a los seguidores"
diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po
index 2e21f2a2ad9..2bffcea1e5e 100644
--- a/addons/mail/i18n/es_MX.po
+++ b/addons/mail/i18n/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-11 17:13+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -25,8 +25,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,13 +124,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -139,19 +134,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -275,20 +270,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Bandeja de Entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -811,9 +792,9 @@ msgstr "Componer Correo Electrónico"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -998,20 +979,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1492,11 +1459,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1504,7 +1466,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1568,16 +1532,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1729,6 +1693,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1931,8 +1900,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1940,7 +1907,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2139,13 +2105,6 @@ msgid "Notification"
msgstr "Notificación"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es_PE.po b/addons/mail/i18n/es_PE.po
index 07e49b07a7a..522ea1dabe1 100644
--- a/addons/mail/i18n/es_PE.po
+++ b/addons/mail/i18n/es_PE.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-22 23:35+0000\n"
-"Last-Translator: Carlos Eduardo Rodriguez Rossi <crodriguez@samemotion.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Peru) (http://www.transifex.com/odoo/odoo-9/language/es_PE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -118,14 +120,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Sent by</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>using</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensajes"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creados"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Bandeja de Entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Bandeja de Entrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "Redactar Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Si tiene un dominio de correo electrónico general redireccionado a un servidor de Odoo, ponga el nombre del dominio aquí."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index 61541304fde..7c888f2881f 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Paraguay) (http://www.transifex.com/odoo/odoo-9/language/es_PY/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po
index 6e51a4446b3..d95cfda05fd 100644
--- a/addons/mail/i18n/es_VE.po
+++ b/addons/mail/i18n/es_VE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-15 18:50+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Spanish (Venezuela) (http://www.transifex.com/odoo/odoo-9/language/es_VE/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandeja de entrada"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensajes"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po
index e934ebd3fb4..f9e0350134c 100644
--- a/addons/mail/i18n/et.po
+++ b/addons/mail/i18n/et.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Estonian (http://www.transifex.com/odoo/odoo-9/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -25,8 +25,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,13 +124,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -139,19 +134,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (koopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -275,20 +270,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -811,10 +792,10 @@ msgstr "Koosta e-kiri"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Koosta uus sõnum"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -998,20 +979,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1492,11 +1459,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1504,7 +1466,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Saabuvad"
@@ -1568,16 +1532,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1729,6 +1693,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1931,8 +1900,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1940,7 +1907,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Sõnumid"
@@ -2139,13 +2105,6 @@ msgid "Notification"
msgstr "Märge"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/fa.po b/addons/mail/i18n/fa.po
index 92c18ce382a..95625ab2824 100644
--- a/addons/mail/i18n/fa.po
+++ b/addons/mail/i18n/fa.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-23 20:25+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Persian (http://www.transifex.com/odoo/odoo-9/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (کپی)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s ایجاد شد"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1216,7 +1183,7 @@ msgstr "همگان"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Extended Filters..."
-msgstr ""
+msgstr "فیلتر های بسط یافته..."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_base_config_settings_fail_counter
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "صندوق پستی"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "پیام‌ها"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "اعلان"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index d10e3abe0d2..d50533bafbd 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-15 14:00+0000\n"
-"Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -125,13 +127,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -142,19 +137,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopio)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s luotu"
@@ -278,20 +273,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -814,10 +795,10 @@ msgstr "Luo sähköposti"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Lähetä uusi viesti"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1001,20 +982,6 @@ msgstr "Kuvaus, joka lisätään tähän alatyyppiin lähetettyihin viesteihin.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1495,11 +1462,6 @@ msgid ""
msgstr "Jos haluat asettaa catchall-sähköpostidomainin (osoite joka vastaanottaa kaikki domainiin saapuvat postit, joilla ei ole vastaanottajaa), joka ohjataan Odoo-palvelimelle, aseta domainin nimi tässä"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1507,7 +1469,9 @@ msgstr "Passiivinen alias"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Saapuneet"
@@ -1571,16 +1535,16 @@ msgstr "Kutsu seuraaja"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1732,6 +1696,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1934,8 +1903,6 @@ msgid "Message-Id"
msgstr "Viestin ID"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1943,7 +1910,6 @@ msgstr "Viestin ID"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Viestit"
@@ -2142,13 +2108,6 @@ msgid "Notification"
msgstr "Ilmoitus"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Huomauta seuraajia"
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 0bb0a8d77d6..3c88b96ed90 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -22,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-26 14:56+0000\n"
-"Last-Translator: Julien Martin <204336@supinfo.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\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"
@@ -38,8 +38,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -132,14 +134,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Sent by</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>using</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -152,19 +147,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d messages"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s créé(e)"
@@ -288,20 +283,6 @@ msgid ""
msgstr "<strong>De plus, si vous souhaitez envoyer de nombreux e-mails, nous vous recommandons d'utiliser le module envoi de masse</strong>.<br/>\nLa confirmation de ce formulaire va probablement prendre quelques minutes et bloquer votre navigateur."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Boîte de réception"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Boîte de réception"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -824,10 +805,10 @@ msgstr "Rédiger un courriel"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Rédiger un nouveau message"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1011,20 +992,6 @@ msgstr "Description qui sera ajoutée dans le message envoyé pour ce sous-type.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Détacher"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Détacher la conversation"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1505,11 +1472,6 @@ msgid ""
msgstr "Si vous avez configuré un domain \"catch-all\" email redirigé vers le serveur d'Odoo, entrez le nom du domaine ici."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Messages importants"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1517,7 +1479,9 @@ msgstr "Alias inactif"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Boîte de réception"
@@ -1581,17 +1545,17 @@ msgstr "Invités des abonnés"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Invite des gens"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Inviter des gens à %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1742,6 +1706,11 @@ msgid "Listeners"
msgstr "Ecouteurs"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1944,8 +1913,6 @@ msgid "Message-Id"
msgstr "ID du message"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1953,7 +1920,6 @@ msgstr "ID du message"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Messages"
@@ -2152,13 +2118,6 @@ msgid "Notification"
msgstr "Notification"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notifications"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Avertir les abonnés"
diff --git a/addons/mail/i18n/fr_CA.po b/addons/mail/i18n/fr_CA.po
index 4c40db5a7a3..01ae59782ac 100644
--- a/addons/mail/i18n/fr_CA.po
+++ b/addons/mail/i18n/fr_CA.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-10-10 09:46+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: French (Canada) (http://www.transifex.com/odoo/odoo-9/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
@@ -23,15 +23,17 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
-"<div class=\"snippet_row bg-color\" style=\"padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777\" data-snippet-theme=\"basic_theme\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\">\n"
+"<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
" <tbody><tr>\n"
-" <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 5px;font-size: 30px\">\n"
+" <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n"
" % if ctx.get('button_access'):\n"
" <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n"
" % endif\n"
@@ -44,7 +46,7 @@ msgid ""
" % endif\n"
"\n"
" % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n"
-" <p style=\"padding: 5px 10px; font-size: 12px;\"\">\n"
+" <p style=\"padding: 5px 10px; font-size: 12px;\">\n"
" About <strong>${ctx['model_name']}\n"
" % if ctx.get('record_name'):\n"
" : ${ctx['record_name']}\n"
@@ -53,12 +55,12 @@ msgid ""
" </p>\n"
" % endif\n"
" </td>\n"
-" <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:10px 15px 10px 10px; font-size: 12px;\">\n"
+" <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n"
" <p>\n"
" % if ctx.get('actions'):\n"
" % for action in ctx['actions']:\n"
" <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n"
-" %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n"
+" %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n"
" |\n"
" % endif\n"
" % endfor\n"
@@ -72,65 +74,54 @@ msgid ""
" </a>\n"
" % endif\n"
" <strong>using</strong>\n"
-" <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n"
+" <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n"
" % endif\n"
+" </p>\n"
" </td>\n"
" </tr>\n"
" </tbody></table>\n"
"</div>\n"
-"<div style=\"padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF\" class=\"\">\n"
-" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody>\n"
-" <tr>\n"
-" <td valign=\"top\" style=\"width:600px\">\n"
-" <div>\n"
-" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
-" </div>\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
+"<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n"
+" <div>\n"
+" <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n"
+" </div>\n"
+" </td>\n"
+" </tr></tbody>\n"
" </table>\n"
"</div>\n"
-"<div class=\"snippet_row bg-color\" style=\"padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777\">\n"
-" <table style=\"width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit\">\n"
+"<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
" <tbody><tr>\n"
-" <td style=\"padding:10px 30px; font-size:14px\">\n"
+" <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n"
" ${object.body | safe}\n"
" % if ctx.get('tracking'):\n"
+" <ul>\n"
" % for tracking in ctx['tracking']\n"
-" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n"
+" <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n"
" % endfor\n"
+" </ul>\n"
" % endif\n"
" </td>\n"
-" </tr>\n"
-" </tbody></table>\n"
+" </tr></tbody>\n"
+" </table>\n"
"</div>\n"
"% if ctx.get('signature'):\n"
-"<div class=\"snippet_row bg-color\" style=\"padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777\">\n"
-" <center>\n"
-" <table width=\"600\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit\">\n"
-" <tbody><tr>\n"
-" <td style=\"font-size:12px; padding: 5px 30px; text-align: left;\">\n"
-" &nbsp;\n"
-" ${ctx['signature'] | safe}\n"
-" &nbsp;\n"
-" </td>\n"
-" </tr>\n"
-" </tbody>\n"
-" </table>\n"
-" </center>\n"
+"<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n"
+" <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n"
+" <tbody><tr>\n"
+" <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n"
+" ${ctx['signature'] | safe}\n"
+" </td>\n"
+" </tr></tbody>\n"
+" </table>\n"
"</div>\n"
"% endif\n"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:50
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -140,13 +131,20 @@ msgid ""
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:83
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -159,6 +157,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:96
+#, python-format
+msgid "(from"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:48
#, python-format
msgid "(no email address)"
@@ -173,16 +178,40 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:122
+#: code:addons/mail/static/src/xml/thread.xml:147
#, python-format
-msgid "-------- Show more messages --------"
+msgid "-------- Show older messages --------"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:513
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">created <a href=\"#\" "
+"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:489
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">joined <a href=\"#\" "
+"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/models/mail_channel.py:151
+#, python-format
+msgid ""
+"<div class=\"o_mail_notification\">left <a href=\"#\" "
+"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
msgstr ""
#. module: mail
#: code:addons/mail/wizard/invite.py:22
#, python-format
msgid ""
-"<div><p>Hello,</p><p>%s invited you to follow %s document: %s.<p></div>"
+"<div><p>Hello,</p><p>%s invited you to follow %s document: %s.</p></div>"
msgstr ""
#. module: mail
@@ -239,13 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -267,13 +289,6 @@ msgid "Access Groups"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:154
-#, python-format
-msgid "Action"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
@@ -305,6 +320,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:78
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:144
#, python-format
msgid "Add Channels"
@@ -356,7 +378,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid "Advanced Settings"
-msgstr ""
+msgstr "Configurations avancées"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_id
@@ -411,13 +433,20 @@ msgid "Aliases"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:12
+#, python-format
+msgid "All"
+msgstr "Tout"
+
+#. module: mail
#: selection:res.partner,notify_email:0
msgid "All Messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread.js:38
+#: code:addons/mail/static/src/js/chat_manager.js:190
#, python-format
msgid "Anonymous"
msgstr ""
@@ -479,7 +508,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_message_author_id
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Author"
-msgstr ""
+msgstr "Auteur"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -542,13 +571,10 @@ msgid "Available for mass mailing"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr ""
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:162
+#, python-format
+msgid "Be careful with channels following internal notifications"
msgstr ""
#. module: mail
@@ -638,6 +664,7 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:23
+#: code:addons/mail/static/src/xml/client_action.xml:89
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids
@@ -657,7 +684,10 @@ msgid "Channels/Partner"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/systray.xml:13
#: model:ir.actions.client,name:mail.mail_channel_action_client_chat
+#, python-format
msgid "Chat"
msgstr ""
@@ -760,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -771,6 +801,13 @@ msgid "Composition mode"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:24
+#, python-format
+msgid "Congratulations, your inbox is empty"
+msgstr ""
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_contacts
#: model:ir.ui.menu,name:mail.menu_contacts
msgid "Contacts"
@@ -801,14 +838,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:217
+#: code:addons/mail/static/src/xml/systray.xml:14
#, python-format
-msgid "Create %s"
+msgid "Conversations"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
-msgid "Create Date"
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:250
+#, python-format
+msgid "Create %s"
msgstr ""
#. module: mail
@@ -830,6 +869,7 @@ msgstr "Créé par"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_create_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_create_date
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_create_date
#: model:ir.model.fields,field_description:mail.field_mail_mail_create_date
@@ -937,21 +977,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid ""
-"Did you know ? Type '@someone' in the composer to cite someone in your "
-"message, and make it appear in his own inbox."
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1061,11 +1087,6 @@ msgid "Email Search"
msgstr ""
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
-msgid "Email Sent"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
msgid "Email Template"
msgstr ""
@@ -1172,7 +1193,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Failed"
-msgstr ""
+msgstr "Échoué"
#. module: mail
#: code:addons/mail/models/mail_template.py:352
@@ -1382,6 +1403,13 @@ msgid "Id of the followed resource"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Idle"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_message_unread
#: model:ir.model.fields,help:mail.field_mail_thread_message_unread
#: model:ir.model.fields,help:mail.field_res_partner_message_unread
@@ -1429,24 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
-msgid "Important Messages"
-msgstr ""
-
-#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid ""
-"In the \"Channels\" section, you will find the public and restricted channel.<br/>\n"
-" The \"Direct Message\" section allows you to talk directly to one person.<br/>\n"
-" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.<br/>"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1454,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1480,7 +1492,7 @@ msgid ""
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1549
+#: code:addons/mail/models/mail_thread.py:1607
#, python-format
msgid ""
"Invalid record set: should be called as model (without records) or on "
@@ -1488,7 +1500,14 @@ msgid ""
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/invite.py:52
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:514
+#, python-format
+msgid "Invitation"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:53
#, python-format
msgid "Invitation to follow %s: %s"
msgstr ""
@@ -1510,16 +1529,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:31
+#: code:addons/mail/static/src/js/client_action.js:30
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1546,6 +1566,11 @@ msgid "Is Notification"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+msgid "Is a member"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
msgid "Is pinned on the interface"
msgstr ""
@@ -1637,6 +1662,13 @@ msgid "Last Updated on"
msgstr "Dernière mise à jour le"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "Leave this channel"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids
msgid ""
"List of channels that will be added as listeners of the current document."
@@ -1665,6 +1697,13 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/js/chatter.js:443
+#, python-format
+msgid "Log"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:75
#, python-format
msgid "Log a note. Followers will not be notified."
@@ -1718,6 +1757,35 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:125
+#, python-format
+msgid "Mark all as read"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:125
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:105
+#, python-format
+msgid "Mark as Read"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:68
+#: code:addons/mail/static/src/xml/thread.xml:102
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1743,13 +1811,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr ""
-
-#. module: mail
#: model:ir.model,name:mail.model_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_message
@@ -1785,6 +1846,13 @@ 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 "
@@ -1846,14 +1914,6 @@ msgid "Messages Search"
msgstr ""
#. module: mail
-#: model:ir.model.fields,help:mail.field_mail_channel_message_ids
-#: model:ir.model.fields,help:mail.field_mail_thread_message_ids
-#: model:ir.model.fields,help:mail.field_res_partner_message_ids
-#: model:ir.model.fields,help:mail.field_res_users_message_ids
-msgid "Messages and communication history"
-msgstr "Historique des messages et des communications"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_internal
msgid ""
"Messages with internal subtypes will be visible only by employees, aka "
@@ -1914,11 +1974,8 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_needaction
-#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
#: model:ir.model.fields,help:mail.field_mail_compose_message_needaction
#: model:ir.model.fields,help:mail.field_mail_mail_needaction
#: model:ir.model.fields,help:mail.field_mail_message_needaction
@@ -1963,14 +2020,31 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:48
-#: code:addons/mail/static/src/xml/chatter.xml:72
+#: code:addons/mail/static/src/js/chat_manager.js:54
+#: code:addons/mail/static/src/js/window_manager.js:124
+#: code:addons/mail/static/src/xml/chatter.xml:67
+#: code:addons/mail/static/src/xml/client_action.xml:127
+#: code:addons/mail/static/src/xml/systray.xml:16
#, python-format
msgid "New message"
msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:140
+#, python-format
+msgid "New messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:25
+#, python-format
+msgid "New messages appear here."
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:81
#, python-format
msgid "New people"
@@ -1978,12 +2052,33 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:228
+#: code:addons/mail/static/src/js/chatter.js:216
#, python-format
msgid "No follower"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:16
+#, python-format
+msgid "No matches found"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:17
+#, python-format
+msgid "No message matches your search. Try to change your search filters."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:28
+#, python-format
+msgid "No starred message"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread
#: model:ir.model.fields,field_description:mail.field_mail_message_no_auto_thread
@@ -2050,6 +2145,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:11
+#, python-format
+msgid "Odoo needs your permission to"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Offline"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
msgid "Old Value Char"
msgstr ""
@@ -2081,12 +2190,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:230
+#: code:addons/mail/static/src/js/chatter.js:218
#, python-format
msgid "One follower"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:107
+#, python-format
+msgid "Online"
+msgstr ""
+
+#. module: mail
#: selection:mail.channel.partner,fold_state:0
msgid "Open"
msgstr ""
@@ -2103,7 +2219,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:36
+#: code:addons/mail/static/src/xml/client_action.xml:128
+#, python-format
+msgid "Open channel settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:46
#, python-format
msgid "Open chat"
msgstr ""
@@ -2250,6 +2373,13 @@ msgid "Partners that did not ask not to be included in mass mailing campaigns"
msgstr ""
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids
+#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids
+msgid "Partners with Need Action"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
#: model:ir.model.fields,help:mail.field_mail_mail_auto_delete
#: model:ir.model.fields,help:mail.field_mail_template_auto_delete
@@ -2301,7 +2431,7 @@ msgid ""
"Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
-"- followers: only followers of the related document\n"
+"- followers: only followers of the related document or members of following channels\n"
msgstr ""
#. module: mail
@@ -2342,24 +2472,12 @@ msgstr "Confidentialité"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:41
+#: code:addons/mail/static/src/xml/client_action.xml:44
#, python-format
msgid "Private Channels"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2445,7 +2563,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 ""
@@ -2573,12 +2694,24 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:72
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
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"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
#: model:ir.model.fields,help:mail.field_ir_act_server_email_from
#: model:ir.model.fields,help:mail.field_mail_template_email_from
@@ -2588,9 +2721,16 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:94
+#, python-format
+msgid "Sends messages by email"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
msgid "Sent"
-msgstr ""
+msgstr "Envoyé"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_sequence
@@ -2599,7 +2739,7 @@ msgstr "Séquence"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:159
+#: code:addons/mail/static/src/xml/client_action.xml:128
#, python-format
msgid "Settings"
msgstr ""
@@ -2705,12 +2845,15 @@ msgid "Sub-model"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:8
#: model:ir.model.fields,field_description:mail.field_email_template_preview_subject
#: model:ir.model.fields,field_description:mail.field_ir_act_server_subject
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_subject
#: model:ir.model.fields,field_description:mail.field_mail_mail_subject
#: model:ir.model.fields,field_description:mail.field_mail_message_subject
#: model:ir.model.fields,field_description:mail.field_mail_template_subject
+#, python-format
msgid "Subject"
msgstr "Objet"
@@ -2845,11 +2988,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br/>"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_image
msgid ""
"This field holds the image used as photo for the group, limited to "
@@ -2890,12 +3028,33 @@ msgstr ""
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/chat_window.xml:24
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:30
#, python-format
msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:117
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:122
+#, python-format
+msgid "Toggle Channels"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2954,8 +3113,15 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/models/mail_thread.py:606
-#: code:addons/mail/static/src/xml/chatter.xml:101
+#: code:addons/mail/static/src/xml/client_action.xml:98
+#, python-format
+msgid "Undo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/models/mail_thread.py:638
+#: code:addons/mail/static/src/xml/chatter.xml:96
#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
#, python-format
msgid "Unfollow"
@@ -2972,6 +3138,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_unread
#: model:ir.model.fields,field_description:mail.field_res_partner_message_unread
#: model:ir.model.fields,field_description:mail.field_res_users_message_unread
+#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Unread Messages"
msgstr "Messages non-lus"
@@ -2984,29 +3151,55 @@ msgid "Unread Messages Counter"
msgstr ""
#. module: mail
+#: model:ir.ui.view,arch_db:mail.view_message_search
+msgid "Unread messages"
+msgstr ""
+
+#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:126
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:126
+#, python-format
+msgid "Unstar all messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:127
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/xml/client_action.xml:127
+#, python-format
+msgid "Unsubscribe from channel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/client_action.js:425
#, python-format
msgid "Unsubscribed"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:113
+#: code:addons/mail/static/src/xml/thread.xml:178
#, python-format
msgid "Uploading"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/composer.js:252
+#: code:addons/mail/static/src/js/composer.js:583
#, python-format
msgid "Uploading error"
msgstr ""
@@ -3081,16 +3274,17 @@ msgid "Who can follow the group's activities?"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_all_employees
-msgid "Whole Company"
+#. openerp-web
+#: code:addons/mail/static/src/xml/composer.xml:7
+#, python-format
+msgid "Write something..."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:57
-#: code:addons/mail/static/src/xml/composer.xml:7
+#: code:addons/mail/static/src/js/thread.js:122
#, python-format
-msgid "Write something"
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3101,6 +3295,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:29
+#, python-format
+msgid ""
+"You can mark any message as 'starred', and it shows up in this channel."
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/res_users.py:47
#, python-format
msgid ""
@@ -3141,19 +3343,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:469
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr ""
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid ""
-"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.<br/>\n"
-" The \"Starred\" section contains all your favorite messages."
-msgstr ""
-
-#. module: mail
#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid ""
"Your template does not defined the email address of the sender. Please "
@@ -3172,31 +3367,41 @@ msgid "base.config.settings"
msgstr "base.config.settings"
#. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_form
msgid "by"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:29
+#: code:addons/mail/models/mail_thread.py:312
#, python-format
-msgid "dm"
+msgid "document"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:281
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:11
#, python-format
-msgid "document"
+msgid "enable desktop notifications"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chatter.js:232
+#: code:addons/mail/static/src/js/chatter.js:220
#, python-format
msgid "followers"
msgstr ""
#. module: mail
+#: model:mail.channel,name:mail.channel_all_employees
+msgid "general"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
msgid "ir.actions.server"
msgstr ""
@@ -3212,30 +3417,30 @@ msgid "members"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
-msgid "mycompany.odoo.com"
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#, python-format
-msgid "on"
+#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
+msgid "mycompany.odoo.com"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:39
+#: code:addons/mail/static/src/js/thread.js:142
#, python-format
-msgid "private"
+msgid "now"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:21
+#: code:addons/mail/static/src/xml/thread.xml:93
+#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
-msgid "public"
+msgid "on"
msgstr ""
#. module: mail
@@ -3244,21 +3449,23 @@ msgid "publisher_warranty.contract"
msgstr ""
#. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "record:"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:35
-#, python-format
-msgid "this document"
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:34
-#: code:addons/mail/static/src/xml/client_action.xml:35
+#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
-msgid "true"
+msgid "this document"
msgstr ""
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index bedb9c19ddd..209cf02686c 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/i18n/gl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Galician (http://www.transifex.com/odoo/odoo-9/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Bandexa de entrada"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensaxes"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po
index 3a1c35fd828..67bbd57b933 100644
--- a/addons/mail/i18n/he.po
+++ b/addons/mail/i18n/he.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-07 22:54+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 18:20+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Hebrew (http://www.transifex.com/odoo/odoo-9/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (העתק)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s נוצר"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -313,7 +294,7 @@ msgstr "קבוצות גישה"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
msgid "Action Needed"
-msgstr ""
+msgstr "נדרשת פעולה"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
@@ -809,10 +790,10 @@ msgstr "כתוב דוא\"ל"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "כתוב הודעה חדשה"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1047,7 +1014,7 @@ msgstr "דיונים"
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_display_name
#: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name
msgid "Display Name"
-msgstr ""
+msgstr "השם המוצג"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "דואר נכנס"
@@ -1540,7 +1504,7 @@ msgstr ""
#: code:addons/mail/static/src/js/chat_manager.js:514
#, python-format
msgid "Invitation"
-msgstr ""
+msgstr "הזמנה"
#. module: mail
#: code:addons/mail/wizard/invite.py:53
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "הודעות"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "התראה"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
@@ -2159,7 +2118,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter
#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter
msgid "Number of Actions"
-msgstr ""
+msgstr "מספר הפעולות"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter
@@ -2167,7 +2126,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter
#: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter
msgid "Number of messages which requires an action"
-msgstr ""
+msgstr "מספר ההודעות שדורשות פעולה"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter
@@ -2175,7 +2134,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter
#: model:ir.model.fields,help:mail.field_res_users_message_unread_counter
msgid "Number of unread messages"
-msgstr ""
+msgstr "מספר ההודעות שלא נקראו"
#. module: mail
#: model:ir.actions.act_window,help:mail.action_contacts
@@ -2197,7 +2156,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/client_action.xml:109
#, python-format
msgid "Offline"
-msgstr ""
+msgstr "לא מחובר"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
@@ -2241,7 +2200,7 @@ msgstr "עוקב אחד"
#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Online"
-msgstr ""
+msgstr "מחובר"
#. module: mail
#: selection:mail.channel.partner,fold_state:0
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 7d3a49ca3d5..7a74137f976 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-23 12:30+0000\n"
-"Last-Translator: Mario Jureša <mario.juresa@uvid.hr>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Croatian (http://www.transifex.com/odoo/odoo-9/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,14 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"Pogledajte ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Poslano sa</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>koristeći</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "od"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d poruka"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s kreiran"
@@ -277,20 +272,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Inbox"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Sastavi e-poštu"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Sastavi novu poruku"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Opis koji će biti dodan u objavljenoj poruci za ovaj podtip. Ako nedost
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Odvojiti"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Važne poruke"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Pristigla pošta"
@@ -1570,17 +1534,17 @@ msgstr "Pozovi pratitelja"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Pozovi osobe"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Pozovi osobe da %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr "Slušatelji"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "Id-poruke"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "Id-poruke"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Poruke"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Obavijest"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Obavijesti"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Obavijesti sljedbenike"
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 3b165be9de2..42e8f9fa7b9 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-06 19:55+0000\n"
-"Last-Translator: krnkris\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,14 +122,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Névjegy <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Elküldve</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>felhasználva az</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo rendszert</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "feladó"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -140,19 +135,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Üzenetek"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (másolat)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s létrehozva"
@@ -276,20 +271,6 @@ msgid ""
msgstr "<strong>Továbbá, ha szeretne egy csomó email-t küldeni, javasoljuk a tömeges email modul használatát</strong>. <br/>\n Ennek a varázslónak a jóváhagyása a böngészőjének több perces blokkolását eredményezheti."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Beérkezett üzenetek"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Bejövő"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Email írás"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Új üzenet létrehozása"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr "Leírás ami hozzá lesz adva az altípusnak elküldendő üzenethez. Ha
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Leválaszt"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Társalgás leválasztása"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr "Ha beállított egy domaint, mely minden Odoo rendszer irányába beérkező emailt megkap, akkor ide írja be ezt a domaint."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Fontos üzenet"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Nem aktív álnevek"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Beérkező levelek"
@@ -1569,17 +1533,17 @@ msgstr "Követő meghívása"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Személy meghívása"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Személy meghívása ide %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr "Hallgatók"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "Üzenet-ID azonosító"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "Üzenet-ID azonosító"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Üzenetek"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Értesítés"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Értesítések"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Kiértesített követők"
diff --git a/addons/mail/i18n/id.po b/addons/mail/i18n/id.po
index d6096c0147c..0ff86b74559 100644
--- a/addons/mail/i18n/id.po
+++ b/addons/mail/i18n/id.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-05 17:45+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s dibuat"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Buat Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr "Deskripsi yang akan ditambahkan dalam pesan yang dikirim untuk subtipe i
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr "Jika Anda memiliki setup domain catch-semua email yang dialihkan ke Odoo server, masukkan nama domain di sini."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr "Alias tidak aktif"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Kotak Pesan"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "Pesan-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "Pesan-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Pesan"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "Pemberitahuan"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Beritahu pengikut"
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 1f2f49bc0a2..c71d066fdc4 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-19 16:53+0000\n"
-"Last-Translator: Simone Bernini <simone@aperturelabs.it>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,14 +122,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Oggetto: <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Inviato da</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>utilizzando</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "da"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -140,19 +135,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Messaggi"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creato"
@@ -276,20 +271,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Posta in arrivo"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Componi Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Componi nuovo Messaggio"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr "Descrizione che verrà aggiunta al messaggio inviato per questo sottotip
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Separa"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Separa la conversazione in un box a parte"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr "Se un dominio catch-all è stato configurato per essere reindirizzato su Odoo, inserire il dominio qui."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Messaggi importanti"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Alias inattivo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Posta in arrivo"
@@ -1569,16 +1533,16 @@ msgstr "Invita Follower"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Invita persone"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "Message-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "Message-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Messaggi"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Notifica"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notifiche"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notifica followers"
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index dc67dc3785b..fb7ed305a67 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-14 11:36+0000\n"
-"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,13 +124,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -139,19 +134,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s(コピー)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s 登録"
@@ -275,20 +270,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -315,7 +296,7 @@ msgstr "アクセスグループ"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction
#: model:ir.model.fields,field_description:mail.field_res_users_message_needaction
msgid "Action Needed"
-msgstr ""
+msgstr "必要なアクション"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
@@ -743,7 +724,7 @@ msgstr ""
#: code:addons/mail/models/mail_thread.py:308
#, python-format
msgid "Click here to add new %(document)s or send an email to: %(email_link)s"
-msgstr ""
+msgstr "クリックして新しくドキュメント %(document)s を作成するか、\n%(email_link)s 宛にメールを送信する"
#. module: mail
#: code:addons/mail/models/mail_thread.py:324
@@ -811,10 +792,10 @@ msgstr "Eメール作成"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "新規メッセージ作成"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -998,20 +979,6 @@ msgstr "このサブタイプのために投稿したメッセージに追加さ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1492,11 +1459,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1504,7 +1466,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "受信箱"
@@ -1556,7 +1520,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/client_action.xml:75
#, python-format
msgid "Invite"
-msgstr ""
+msgstr "招待"
#. module: mail
#. openerp-web
@@ -1568,16 +1532,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1729,6 +1693,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1931,8 +1900,6 @@ msgid "Message-Id"
msgstr "メッセージID"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1940,7 +1907,6 @@ msgstr "メッセージID"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "メッセージ"
@@ -2139,13 +2105,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "フォロワーに通知"
@@ -2752,7 +2711,7 @@ msgstr "メール送信"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
msgid "Send messages by email"
-msgstr ""
+msgstr "Eメールでメッセージを送信"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_email_from
@@ -2768,7 +2727,7 @@ msgstr "送信者アドレス(プレースホルダはここで使用します)ã
#: code:addons/mail/static/src/xml/client_action.xml:94
#, python-format
msgid "Sends messages by email"
-msgstr ""
+msgstr "Eメールでメッセージを送信"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
diff --git a/addons/mail/i18n/ka.po b/addons/mail/i18n/ka.po
index 244d3a7278f..435f616e76a 100644
--- a/addons/mail/i18n/ka.po
+++ b/addons/mail/i18n/ka.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-27 15:58+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Georgian (http://www.transifex.com/odoo/odoo-9/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
-msgstr ""
+msgstr "%d შეტყობინებები"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (ასლი)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1289,7 +1256,7 @@ msgstr ""
#. module: mail
#: selection:mail.channel.partner,fold_state:0
msgid "Folded"
-msgstr ""
+msgstr "ჩაკეცილი"
#. module: mail
#. openerp-web
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "მესიჯები"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/kab.po b/addons/mail/i18n/kab.po
index 4f0df203384..2c599c0c0fb 100644
--- a/addons/mail/i18n/kab.po
+++ b/addons/mail/i18n/kab.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Kabyle (http://www.transifex.com/odoo/odoo-9/language/kab/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (Anɣel )"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s yerna"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Aru Imayl"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Tanaka n tirawt"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "Asulay n yizen"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "Asulay n yizen"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Iznan"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "Talɣut"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
index b4155f9b5b0..bce028fbe72 100644
--- a/addons/mail/i18n/ko.po
+++ b/addons/mail/i18n/ko.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Korean (http://www.transifex.com/odoo/odoo-9/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (사본)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s을(를) 작성함"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "메일 작성"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr "이 하위유형으로 게시된 메시지에 추가되는 설명입니ë
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr "Odoo 서버로 리디렉션되는 도메인에 모든 이메일을 수집하도록 설정한 경우 여기에 도메인 이름을 입력합니다."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr "미사용 별칭"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "받은 메시지"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "Message-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "Message-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "메시지"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "알림"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "팔로워에게 알림"
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index ffab87e447f..b801731426b 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s sukurta"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,10 +790,10 @@ msgstr "Rašyti el. laišką"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Rašyti žinutę"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Gauta"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Pranešimai"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index 74673f61a81..8910fe9268b 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Latvian (http://www.transifex.com/odoo/odoo-9/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopēt)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Rakstīt vēstuli"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Ienākošie"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Ziņojumi"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "Paziņojums"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/mk.po b/addons/mail/i18n/mk.po
index bd847d06b4b..3c64e40d907 100644
--- a/addons/mail/i18n/mk.po
+++ b/addons/mail/i18n/mk.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-08 16:00+0000\n"
-"Last-Translator: Aleksandar Vangelovski <aleksandarv@hbee.eu>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (копија)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s креирани"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Состави е-пошта"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Состави нова порака"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Опис што ќе биде додаден во пораката прÐ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Ако сте подесиле домен што ќе ги прима сите е-маил пораки пренасочен кон Odoo серверот, внесете го тука името на доменот."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr "Неактивен алијас"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Влезно Сандаче"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Поканете луѓе"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Идентификатор на порака"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Идентификатор на порака"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Пораки"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Известување"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Извести следбеници"
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index cd0cd0498df..b23a0f759b4 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Mongolian (http://www.transifex.com/odoo/odoo-9/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "хэнээс"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (хуулбар)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s үүсгэгдсэн"
@@ -274,20 +269,6 @@ msgid ""
msgstr "<strong>Цаашлаад, хэрэв маш олон имэйл илгээхийг хүсвэл масс мэйл модулийг хэрэглэхийг танд зөвлөе</strong>. <br/>\n Энэ харилцах цонхыг батласнаар хөтөчийг хэдэн минут блоклож магадагүй."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Inbox"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Имэйл Үүсгэх"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Шинэ зурвас үүсгэх"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Энэ дэд төрөлийн зурвасыг илгээхэд нэмÑ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Салгах"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Хэрэв Odoo серверрүү чиглүүлсэн бүх эмэйлийг барьж авахаар тохируулсан бол дөмэйн нэрийг энд оруулна уу."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Чухал зурвасууд"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr "Идэвхгүй хуурмаг нэр"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inbox"
@@ -1567,17 +1531,17 @@ msgstr "Дагагчийг Урих"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Хүмүүсийг урих"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Хүмүүсийг %s-д урих"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr "Сонсогчид"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Зурвас-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Зурвас-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Зурвасууд"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Мэдэгдэл"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Дагагчидад мэдэгдэх"
diff --git a/addons/mail/i18n/nb.po b/addons/mail/i18n/nb.po
index 44382d61c22..096cb812951 100644
--- a/addons/mail/i18n/nb.po
+++ b/addons/mail/i18n/nb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-30 18:51+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopi)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,9 +791,9 @@ msgstr "Skriv e-post"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Innboks"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Melding - ID"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Melding - ID"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Meldinger"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index a0dfab8c056..e41b472ea07 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -6,15 +6,15 @@
# Eric Geens <ericgeens@yahoo.com>, 2015
# Erwin van der Ploeg <erwin@odooexperts.nl>, 2015
# Erwin van der Ploeg <erwin@odooexperts.nl>, 2015-2016
-# Volluta <volluta@tutanota.com>, 2015
+# Volluta <volluta@tutanota.com>, 2015-2016
# Yenthe Van Ginneken <yenthespam@gmail.com>, 2015-2016
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-13 15:04+0000\n"
-"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 20:28+0000\n"
+"Last-Translator: Volluta <volluta@tutanota.com>\n"
"Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,8 +28,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -122,14 +124,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"Bekijk ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Over <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Verzonder door</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>gebruik makende van</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "van"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -142,19 +137,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Berichten"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s aangemaakt"
@@ -278,20 +273,6 @@ msgid ""
msgstr "<strong>Wanneer u bovendien heel veel emails wil verzenden, raden wij u aan de module voor bulkmailingen te gebruiken</strong>. <br/>\n Wanneer u deze optie bevestigd, zal uw browser waarschijnlijk een paar minuten geblokkeerd zijn."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Postvak in"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Inbox"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -814,10 +795,10 @@ msgstr "Email opstellen"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Maak een nieuw bericht"
+msgid "Compose a new message"
+msgstr "Nieuw bericht"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1001,20 +982,6 @@ msgstr "Omschrijving welke wordt toegevoegd aan het bericht voor dit subtype. In
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Ontkoppel"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Ontkoppel de conversatie"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1495,11 +1462,6 @@ msgid ""
msgstr "Als u een 'catch-all' e-mail adres heeft aangemaakt, welke verwijst naar de Odoo server, vul dan hier de domein naam in."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Belangrijke berichten"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1507,7 +1469,9 @@ msgstr "Inactieve alias"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Postvak in"
@@ -1571,17 +1535,17 @@ msgstr "Volger uitnodigen"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Mensen uitnodigen"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Mensen uitnodigen tot %s"
+msgid "Invite people to #%s"
+msgstr "Nodig mensen uit io #%s"
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1732,6 +1696,11 @@ msgid "Listeners"
msgstr "Luisteraars"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr "Live chat"
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1934,8 +1903,6 @@ msgid "Message-Id"
msgstr "Bericht-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1943,7 +1910,6 @@ msgstr "Bericht-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Berichten"
@@ -2142,13 +2108,6 @@ msgid "Notification"
msgstr "Melding"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificaties"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Meld volgers"
diff --git a/addons/mail/i18n/nl_BE.po b/addons/mail/i18n/nl_BE.po
index 5075df1b73f..4e7e4b6fe10 100644
--- a/addons/mail/i18n/nl_BE.po
+++ b/addons/mail/i18n/nl_BE.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/odoo/odoo-9/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "E-mail opstellen"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Berichten"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 56addadb15c..16eea5e825d 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-13 09:30+0000\n"
-"Last-Translator: Piotr Szlązak <szlazakpiotr@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,14 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n About <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Sent by</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>using</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "z"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Wiadomości"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s utworzono"
@@ -277,20 +272,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Przychodzące"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Inbox"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Utwórz wiadomość e-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Utwórz nową wiadomość"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Opis, który zostanie dodany do wiadomości umieszczonej dla tego podtyp
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Detach"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "ważne wiadomości"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr "Nieaktywny alias"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Skrzynka odbiorcza"
@@ -1570,16 +1534,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "Message-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "Message-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Wiadomosći"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Powiadomienie"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Powiadom obserwatorów"
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index a243300964b..f5c8c2ee6f1 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -124,13 +126,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensagens"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (cópia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s criado"
@@ -277,20 +272,6 @@ msgid ""
msgstr "<strong>Ademais, se quiser enviar uma quantidade grande de emails, recomendamos que use o módulo de envio em massa</strong>. <br/>\nA confirmação deste assistente irá bloquear o seu navegador durante alguns minutos."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Caixa de Entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Compor Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Compor Nova Mensagem"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Descrição que será adicionada na mensagem enviada para este subtipo.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Desanexar"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr "Se tem a configuração de um catch-all domínio de e-mail redirecionado para o servidor Odoo , digite o nome de domínio aqui."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Mensagens Importantes"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr "Apelidos Inactivos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inbox"
@@ -1570,17 +1534,17 @@ msgstr "Convidar Seguidor"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Convidar Pessoas"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Convidar pessoas a %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr "Ouvintes"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "Id mensagem"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "Id mensagem"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensagens"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Notificação"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar seguidores"
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index c516cf0caba..f2ccfbb7b33 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-15 20:46+0000\n"
-"Last-Translator: danimaribeiro <danimaribeiro@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,14 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Sobre <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Enviado por</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>usando</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "de"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Mensagens"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s criado"
@@ -277,20 +272,6 @@ msgid ""
msgstr "<strong>Além disso, se você quiser enviar um monte de e-mails, recomendamos que você use o módulo de envio em massa</strong>. <br/>\nConfirmando este assistente, provavelmente irá demorar alguns minutos, bloqueando seu navegador."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Caixa de Entrada"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Caixa de Entrada"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Escrever E-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Escrever nova Mensagem"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Descrição que será adicionada na mensagem enviada para este subtipo.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Separar"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Destacar a conversação"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr "Se você tiver uma configuração de e-mail 'catch-all' redirecionado para o servidor Odoo, digite o nome do domínio aqui."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Mensagens Importantes"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr "Apelido Inativo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Caixa de Entrada"
@@ -1570,17 +1534,17 @@ msgstr "Convidar Seguidor"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Seguir pessoa"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Convidar pessoas para %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr "Ouvintes"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "Cód da Mensagem"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "Cód da Mensagem"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mensagens"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Notificação"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notificações"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notificar seguidores"
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index 011ac792444..516e8241979 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Romanian (http://www.transifex.com/odoo/odoo-9/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (copie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s creat(ă)"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,10 +790,10 @@ msgstr "Compune e-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Compune un Mesaj nou"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr "Descriere care va fi adăugată în mesajul postat pentru acest subtip.
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inbox"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "Id-Mesaj"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "Id-Mesaj"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mesaje"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "Notificare"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notifică interesații"
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 2a49b312c94..2a12b5f7d1d 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-17 23:15+0000\n"
-"Last-Translator: Viktor Pogrebniak <vp@aifil.ru>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,8 +30,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -127,13 +129,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "от"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -144,19 +139,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Сообщения"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (копия)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s создан"
@@ -280,20 +275,6 @@ msgid ""
msgstr "<strong>Кроме того, если вы хотите отправлять много писем, мы рекомендуем использовать модуль массовой рассылки</strong>. <br/>\nИспользование этого визарда может на несколько минут затормозить Ваш браузер."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Входящие"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Входящие"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -816,10 +797,10 @@ msgstr "Написать письмо"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Написать новое сообщение"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1003,20 +984,6 @@ msgstr "Описание, которое будет добавлено в соо
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Отсоединить"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Беседа"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1497,11 +1464,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Важные сообщения"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1509,7 +1471,9 @@ msgstr "Неактивный Псевдоним"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Входящие"
@@ -1573,17 +1537,17 @@ msgstr "Пригласить подписчика"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Пригласить людей"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Пригласить людей в %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1734,6 +1698,11 @@ msgid "Listeners"
msgstr "Слушатели"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1936,8 +1905,6 @@ msgid "Message-Id"
msgstr "ID сообщения"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1945,7 +1912,6 @@ msgstr "ID сообщения"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Сообщения"
@@ -2144,13 +2110,6 @@ msgid "Notification"
msgstr "Уведомление"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Уведомления"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Уведомить подписчиков"
diff --git a/addons/mail/i18n/sk.po b/addons/mail/i18n/sk.po
index 89dd6d1a052..15b74d4fb0d 100644
--- a/addons/mail/i18n/sk.po
+++ b/addons/mail/i18n/sk.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-08 17:58+0000\n"
-"Last-Translator: Jaroslav Bosansky <jaro.bosansky@ekoenergo.sk>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,14 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n<div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n<link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n<link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n<meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n</div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n<table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n<tbody><tr>\n<td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n% if ctx.get('button_access'):\n<a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n% endif\n\n% if ctx.get('button_follow'):\n<a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n\n% elif ctx.get('button_unfollow'):\n<a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n% endif\n\n% if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n<p style=\"padding: 5px 10px; font-size: 12px;\">\nAbout <strong>${ctx['model_name']}\n% if ctx.get('record_name'):\n: ${ctx['record_name']}\n% endif\n</strong>\n</p>\n% endif\n</td>\n<td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n<p>\n% if ctx.get('actions'):\n% for action in ctx['actions']:\n<a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n%if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n|\n% endif\n% endfor\n% else:\n<strong>Sent by</strong>\n% if ctx.get('website_url'):\n<a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n% endif\n<strong>${ctx.get('company_name')}</strong>\n% if ctx.get('website_url'):\n</a>\n% endif\n<strong>using</strong>\n<a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n% endif\n</p>\n</td>\n</tr>\n</tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n<table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n<tbody><tr>\n<td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n<div>\n<hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n</div>\n</td>\n</tr></tbody>\n</table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n<tbody><tr>\n<td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n${object.body | safe}\n% if ctx.get('tracking'):\n<ul>\n% for tracking in ctx['tracking']\n<li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n% endfor\n</ul>\n% endif\n</td>\n</tr></tbody>\n</table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n<tbody><tr>\n<td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n${ctx['signature'] | safe}\n</td>\n</tr></tbody>\n</table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "od"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -141,19 +136,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d Správy"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kópia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s vytvorené"
@@ -277,20 +272,6 @@ msgid ""
msgstr "<strong>pokiaľ si želáte odoslať veľké množstvo emailov, odporúčame Vám použiť modul Emailová kampaň</strong>. <br/>\n Potvrdenie tohto dialógu môže spôsobiť blokovanie Vášho prehliadača na niekoľko minút."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Inbox"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Inbox"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -813,10 +794,10 @@ msgstr "Vytvoriť Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Vytvoriť novú správu"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1000,20 +981,6 @@ msgstr "Popis, ktorý bude pridaný do správy zverejnenej k tomuto podtypu. Ak
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Odpojiť"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Odpojiť konverzáciu"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1494,11 +1461,6 @@ msgid ""
msgstr "Ak máte nastavenú catch-all emailovú doménu presmerovanú na server Odoo, tu zadajte názov domény."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Dôležité správy"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1506,7 +1468,9 @@ msgstr "Neaktívny alias"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inbox"
@@ -1570,17 +1534,17 @@ msgstr "Pozvať sledujúceho"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Pozvať ľudí"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Pozvať ľudí do %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1731,6 +1695,11 @@ msgid "Listeners"
msgstr "Poslucháči"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1933,8 +1902,6 @@ msgid "Message-Id"
msgstr "ID správy"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1942,7 +1909,6 @@ msgstr "ID správy"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Správy"
@@ -2141,13 +2107,6 @@ msgid "Notification"
msgstr "Notifikácia"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Notifikácie"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Notifikovať sledujúcich"
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index 7b68bec38f2..ec938eac7df 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-23 06:08+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Slovenian (http://www.transifex.com/odoo/odoo-9/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -118,14 +120,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n O <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Poslano</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>z uporabo</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "od"
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d sporočil"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s kreirano"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Prejeto"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Prejeto"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Novo sporočilo"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Novo sporočilo"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Opis, ki se doda sporočilu knjiženemu na ta pod-tip. Če je prazno, se
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr "Če ste nastavili catch-all e-poštno domeno preusmerjeno na Odoo strežnik, vnesite naziv domene."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr "Neaktivni vzdevek"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Prejeto"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "ID sporočila"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "ID sporočila"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Sporočila"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Obvestilo"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Obvesti sledilce"
diff --git a/addons/mail/i18n/sr.po b/addons/mail/i18n/sr.po
index 3d58e4c1487..00aa98eae1b 100644
--- a/addons/mail/i18n/sr.po
+++ b/addons/mail/i18n/sr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Serbian (http://www.transifex.com/odoo/odoo-9/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Poruke"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index 613101f1cb1..28e57f7c5a4 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/i18n/sr@latin.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/odoo/odoo-9/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopiranje)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,9 +790,9 @@ msgstr "Sastavi e-mail"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
+msgid "Compose a new message"
msgstr ""
#. module: mail
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr ""
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Poruke"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 07a38d41a0f..63cdc121e9c 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-20 03:26+0000\n"
-"Last-Translator: Patrik Lermon <patrik.lermon@gmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Swedish (http://www.transifex.com/odoo/odoo-9/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s skapades"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "Skriv e-post"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Skriv nytt meddelande"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr "Description that will be added in the message posted for this subtype. I
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Inkorg"
@@ -1567,16 +1531,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr "Meddelande-id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr "Meddelande-id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Meddelanden"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "Avisering"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""
diff --git a/addons/mail/i18n/th.po b/addons/mail/i18n/th.po
index 73d6a2b035b..33b89ae5cce 100644
--- a/addons/mail/i18n/th.po
+++ b/addons/mail/i18n/th.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-08 03:12+0000\n"
-"Last-Translator: Khwunchai Jaengsawang <khwunchai.j@ku.th>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Thai (http://www.transifex.com/odoo/odoo-9/language/th/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -121,13 +123,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "จาก"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -138,19 +133,19 @@ msgstr "${object.subject or (object.record_name and 'ตอบ: %s' % object.rec
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d ข้อความ"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "(สำเนา) %s"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "สร้าง%sแล้ว"
@@ -274,20 +269,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ กล่องจดหมาย"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@กล่องจดหมาย"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -810,10 +791,10 @@ msgstr "เขียนอีเมล"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "เขียนข้อความใหม่"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -997,20 +978,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1491,11 +1458,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "ข้อความสำคัญ"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1503,7 +1465,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "กล่องจดหมาย"
@@ -1567,17 +1531,17 @@ msgstr "เชิญผู้ติดตาม"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "เชิญบุคคล"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "เชิญบุคคลเข้าสู่ %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1728,6 +1692,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1930,8 +1899,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1939,7 +1906,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "ข้อความ"
@@ -2138,13 +2104,6 @@ msgid "Notification"
msgstr "การแจ้งเตือน"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "การแจ้งเตือน"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "แจ้งเตือนผู้ติดตาม"
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 3abb943d3a1..3c05969f950 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-26 13:00+0000\n"
-"Last-Translator: AYHAN KIZILTAN <akiziltan76@hotmail.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -123,13 +125,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "kimden"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -140,19 +135,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (kopya)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s oluşturuldu"
@@ -276,20 +271,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Eposta Yaz"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Yeni Mesaj Yaz"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr "Bu alt tip için gönderilen mesaja eklenecek açıklama. Geçersizse, y
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr "Eğer alan adınıza gelen tüm emailleri catch-all tekniği ile Odoo'ya yönlendirmek istiyorsanız buraya bir alan adı girin."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Pasif E-Posta rumuzu"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Gelen Kutusu"
@@ -1569,16 +1533,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "Mesaj-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "Mesaj-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Mesajlar"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Bildirimler"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "İzleyicileri bilgilendir"
diff --git a/addons/mail/i18n/uk.po b/addons/mail/i18n/uk.po
index 4cf8464a396..59a262d5b29 100644
--- a/addons/mail/i18n/uk.po
+++ b/addons/mail/i18n/uk.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-05-28 14:55+0000\n"
-"Last-Translator: Bohdan Lisnenko\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\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"
@@ -26,8 +26,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,14 +122,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif\n"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n </div>\n</div>\n<div summary=\"o_mail_notification\" style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:5px 10px 5px 5px;font-size: 30px\">\n % if ctx.get('button_access'):\n <a href=\"${ctx['button_access']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_access']['title']}</a>\n % endif\n\n % if ctx.get('button_follow'):\n <a href=\"${ctx['button_follow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_follow']['title']}</a>\n \n % elif ctx.get('button_unfollow'):\n <a href=\"${ctx['button_unfollow']['url']}\" style=\"-webkit-user-select: none; padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px\" class=\"o_default_snippet_text\">${ctx['button_unfollow']['title']}</a>\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n <p style=\"padding: 5px 10px; font-size: 12px;\">\n Про <strong>${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n </strong>\n </p>\n % endif\n </td>\n <td valign=\"center\" align=\"right\" width=\"270\" style=\"padding:5px 15px 5px 10px; font-size: 12px;\">\n <p>\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n <a href=\"${action['url']}\" style=\"text-decoration:none; color: #a24689;\"><strong>${action['title']}</strong></a>\n %if cmp(len(ctx['actions']), 1) == 1 and cmp(len(ctx['actions']), loop.index) == 1:\n |\n % endif\n % endfor\n % else:\n <strong>Відправник</strong>\n % if ctx.get('website_url'):\n <a href=\"${ctx['website_url']}\" style=\"text-decoration:none; color: #a24689;\">\n % endif\n <strong>${ctx.get('company_name')}</strong>\n % if ctx.get('website_url'):\n </a>\n % endif\n <strong>за допомогою</strong>\n <a href=\"https://www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\n </p>\n </td>\n </tr>\n </tbody></table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" style=\"vertical-align:top; padding:0px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td valign=\"top\" style=\"width:600px; padding:5px 10px 5px 5px;\">\n <div>\n <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0\">\n </div>\n </td>\n </tr></tbody>\n </table>\n</div>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px;\">\n ${object.body | safe}\n % if ctx.get('tracking'):\n <ul>\n % for tracking in ctx['tracking']\n <li>${tracking[0]} : ${tracking[1]} -&gt; ${tracking[2]}</li>\n % endfor\n </ul>\n % endif\n </td>\n </tr></tbody>\n </table>\n</div>\n% if ctx.get('signature'):\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\">\n <table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\">\n <tbody><tr>\n <td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\">\n ${ctx['signature'] | safe}\n </td>\n </tr></tbody>\n </table>\n</div>\n% endif\n"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr " від "
+msgstr ""
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -140,19 +135,19 @@ msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_nam
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d повідомлень"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (копія)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s створено"
@@ -276,20 +271,6 @@ msgid ""
msgstr "<strong>Більше того, якщо ви хочете надіслати дуже багато листів, то ми вам рекомендуємо використовувати модуль масової розсилки</strong>. <br/>\n Підтвердження цього майстра скоріш за все займе декілька хвилин і заблокує вікно браузера."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@ Вхідні"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@Вхідні"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -812,10 +793,10 @@ msgstr "Створити лист"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Створити нове повідомлення"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -999,20 +980,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "Від'єднати"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "Від'єднати розмову"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1493,11 +1460,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "Важливі повідомлення"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1505,7 +1467,9 @@ msgstr "Неактивний псевдонім"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Вхідні"
@@ -1569,17 +1533,17 @@ msgstr "Запросити підписника"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "Запросити людей"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "Запросити людей до %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1730,6 +1694,11 @@ msgid "Listeners"
msgstr "Слухачі"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1932,8 +1901,6 @@ msgid "Message-Id"
msgstr "ІД-повідомлення"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1941,7 +1908,6 @@ msgstr "ІД-повідомлення"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Повідомлення"
@@ -2140,13 +2106,6 @@ msgid "Notification"
msgstr "Сповіщення"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "Сповіщення"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Сповістити підписників"
diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po
index 74cd67d4af6..087bf4d4d76 100644
--- a/addons/mail/i18n/vi.po
+++ b/addons/mail/i18n/vi.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-04-07 08:30+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
"Last-Translator: Martin Trigaux\n"
"Language-Team: Vietnamese (http://www.transifex.com/odoo/odoo-9/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (bản sao)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s đã được tạo"
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,10 +790,10 @@ msgstr "Soạn Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "Soạn tin nhắn mới"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1316,7 +1283,7 @@ msgstr "Người dõi theo"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids
msgid "Followers (Channels)"
-msgstr ""
+msgstr "Người theo dõi (Các kênh)"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids
@@ -1324,7 +1291,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids
#: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids
msgid "Followers (Partners)"
-msgstr ""
+msgstr "Người theo dõi (Các đối tác)"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_subscription_form
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "Hộp thư đến"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1594,7 +1558,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower
#: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower
msgid "Is Follower"
-msgstr ""
+msgstr "Trở thành người theo dõi"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail_notification
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "Thông điệp"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "Thông báo những Người dõi theo"
@@ -2532,7 +2491,7 @@ msgstr "Đã nhận"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_partner_id
msgid "Recipient"
-msgstr ""
+msgstr "Người nhận"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_partner_ids
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 15460b22498..b6fd4678da9 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -3,6 +3,7 @@
# * mail
#
# Translators:
+# Crazee ZHANG <15702414328@163.com>, 2016
# Eddie Lim <bhweelim@yahoo.com>, 2016
# Gary Wei <Gary.wei@elico-corp.com>, 2015-2016
# Jeffery Chenn <jeffery9@gmail.com>, 2015-2016
@@ -22,9 +23,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-07-07 14:36+0000\n"
-"Last-Translator: Eddie Lim <bhweelim@yahoo.com>\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+0000\n"
+"Last-Translator: Martin Trigaux\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"
@@ -38,8 +39,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -135,13 +138,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr "寄件者"
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -152,19 +148,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr "%d 条消息"
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (副本)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr "%s 创建"
@@ -288,20 +284,6 @@ msgid ""
msgstr "<strong>此外,如果你想发送大量的电子邮件,我们建议你使用群发邮件模块</strong>. <br/>\n确认该向导将可能需要几分钟的时间来锁定您的浏览器."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr "@收件箱"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr "@收件箱"
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -609,7 +591,7 @@ msgstr "可用于群发邮件"
#: code:addons/mail/static/src/xml/chatter.xml:162
#, python-format
msgid "Be careful with channels following internal notifications"
-msgstr ""
+msgstr "小心内部指示的渠道"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
@@ -824,10 +806,10 @@ msgstr "撰写Email"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "撰写新消息"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -1011,20 +993,6 @@ msgstr "将为该子模型的消息添加注解。如为空,则添加名称。
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr "分离"
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr "分离对话"
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1505,11 +1473,6 @@ msgid ""
msgstr "如果你设置了电子邮件域名重定向到这个Odoo服务器,请在这里输入域名。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr "重要消息"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1517,7 +1480,9 @@ msgstr "不活动的别名"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "收件箱"
@@ -1581,17 +1546,17 @@ msgstr "邀请关注者"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr "邀请人员"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
-msgstr "邀请人员 到 %s"
+msgid "Invite people to #%s"
+msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1742,6 +1707,11 @@ msgid "Listeners"
msgstr "侦听器"
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1944,8 +1914,6 @@ msgid "Message-Id"
msgstr "Message-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1953,7 +1921,6 @@ msgstr "Message-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "消息"
@@ -2152,13 +2119,6 @@ msgid "Notification"
msgstr "通知"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr "通知"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr "通知关注者"
diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po
index 34fa529e625..1da8e9f2610 100644
--- a/addons/mail/i18n/zh_TW.po
+++ b/addons/mail/i18n/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-13 14:27+0000\n"
-"PO-Revision-Date: 2016-06-13 10:08+0000\n"
+"POT-Creation-Date: 2016-07-22 13:00+0000\n"
+"PO-Revision-Date: 2016-07-23 09:04+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"
@@ -23,8 +23,10 @@ msgid ""
"\n"
"<div itemscope itemtype=\"http://schema.org/EmailMessage\">\n"
" <div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\">\n"
+" % if ctx.get('button_access'):\n"
" <link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/>\n"
" <link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/>\n"
+" % endif\n"
" <meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/>\n"
" </div>\n"
"</div>\n"
@@ -120,13 +122,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:53
-#, python-format
-msgid " from "
-msgstr ""
-
-#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
msgid ""
"${object.subject or (object.record_name and 'Re: %s' % object.record_name) "
@@ -137,19 +132,19 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:59
+#: code:addons/mail/static/src/js/chat_manager.js:83
#, python-format
msgid "%d Messages"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_template.py:216
+#: code:addons/mail/models/mail_template.py:230
#, python-format
msgid "%s (copy)"
msgstr "%s (副本)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:234
+#: code:addons/mail/models/mail_thread.py:238
#, python-format
msgid "%s created"
msgstr ""
@@ -273,20 +268,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:13
-#, python-format
-msgid "@ Inbox"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:20
-#, python-format
-msgid "@Inbox"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
#: model:ir.model.fields,help:mail.field_mail_channel_alias_defaults
#: model:ir.model.fields,help:mail.field_res_users_alias_defaults
@@ -809,10 +790,10 @@ msgstr "撰寫郵件"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:4
+#: code:addons/mail/static/src/xml/client_action.xml:135
#, python-format
-msgid "Compose new Message"
-msgstr "撰寫新訊息"
+msgid "Compose a new message"
+msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode
@@ -996,20 +977,6 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach"
-msgstr ""
-
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:124
-#, python-format
-msgid "Detach the conversation"
-msgstr ""
-
-#. module: mail
-#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:42
#, python-format
msgid "Direct Messages"
@@ -1490,11 +1457,6 @@ msgid ""
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
-msgid "Important messages"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1464,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:426
+#: code:addons/mail/static/src/js/chat_manager.js:1033
+#: code:addons/mail/static/src/xml/client_action.xml:22
+#: code:addons/mail/static/src/xml/systray.xml:6
#, python-format
msgid "Inbox"
msgstr "收件匣"
@@ -1566,16 +1530,16 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:30
-#: code:addons/mail/static/src/xml/client_action.xml:123
+#: code:addons/mail/static/src/xml/client_action.xml:132
#, python-format
msgid "Invite people"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:454
+#: code:addons/mail/static/src/js/client_action.js:626
#, python-format
-msgid "Invite people to %s"
+msgid "Invite people to #%s"
msgstr ""
#. module: mail
@@ -1727,6 +1691,11 @@ msgid "Listeners"
msgstr ""
#. module: mail
+#: selection:mail.channel,channel_type:0
+msgid "Livechat Conversation"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chatter.js:443
#, python-format
@@ -1929,8 +1898,6 @@ msgid "Message-Id"
msgstr "訊息-Id"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:6
#: model:ir.actions.act_window,name:mail.action_view_mail_message
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_ids
#: model:ir.model.fields,field_description:mail.field_mail_thread_message_ids
@@ -1938,7 +1905,6 @@ msgstr "訊息-Id"
#: model:ir.model.fields,field_description:mail.field_res_users_message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
#: model:ir.ui.view,arch_db:mail.view_message_tree
-#, python-format
msgid "Messages"
msgstr "訊息"
@@ -2137,13 +2103,6 @@ msgid "Notification"
msgstr "通知"
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:12
-#, python-format
-msgid "Notifications"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify
msgid "Notify followers"
msgstr ""