summaryrefslogtreecommitdiff
path: root/addons/mail
diff options
context:
space:
mode:
authorOdoo Translation Bot <c3p@odoo.com>2015-12-13 01:27:04 +0100
committerOdoo Translation Bot <c3p@odoo.com>2015-12-13 01:27:04 +0100
commit5254e31a465248ae73c5be67d5e4af45e22682b3 (patch)
tree74d3af3ce5ac913af457f6b1384bc3be9f73596d /addons/mail
parent2a89c926ecd7d60eaed65af9f7708780ea6982a8 (diff)
[I18N] Update translation terms from Transifex
Diffstat (limited to 'addons/mail')
-rw-r--r--addons/mail/i18n/af.po250
-rw-r--r--addons/mail/i18n/ar.po244
-rw-r--r--addons/mail/i18n/bg.po250
-rw-r--r--addons/mail/i18n/bs.po244
-rw-r--r--addons/mail/i18n/ca.po244
-rw-r--r--addons/mail/i18n/cs.po244
-rw-r--r--addons/mail/i18n/da.po244
-rw-r--r--addons/mail/i18n/de.po248
-rw-r--r--addons/mail/i18n/el.po256
-rw-r--r--addons/mail/i18n/en_GB.po244
-rw-r--r--addons/mail/i18n/es.po264
-rw-r--r--addons/mail/i18n/es_AR.po244
-rw-r--r--addons/mail/i18n/es_BO.po246
-rw-r--r--addons/mail/i18n/es_CL.po244
-rw-r--r--addons/mail/i18n/es_CO.po252
-rw-r--r--addons/mail/i18n/es_CR.po244
-rw-r--r--addons/mail/i18n/es_DO.po248
-rw-r--r--addons/mail/i18n/es_EC.po358
-rw-r--r--addons/mail/i18n/es_MX.po256
-rw-r--r--addons/mail/i18n/es_PY.po244
-rw-r--r--addons/mail/i18n/es_VE.po244
-rw-r--r--addons/mail/i18n/et.po244
-rw-r--r--addons/mail/i18n/fa.po244
-rw-r--r--addons/mail/i18n/fi.po250
-rw-r--r--addons/mail/i18n/fr.po256
-rw-r--r--addons/mail/i18n/gl.po244
-rw-r--r--addons/mail/i18n/he.po244
-rw-r--r--addons/mail/i18n/hr.po250
-rw-r--r--addons/mail/i18n/hu.po252
-rw-r--r--addons/mail/i18n/id.po246
-rw-r--r--addons/mail/i18n/it.po248
-rw-r--r--addons/mail/i18n/ja.po250
-rw-r--r--addons/mail/i18n/ka.po244
-rw-r--r--addons/mail/i18n/kab.po244
-rw-r--r--addons/mail/i18n/ko.po246
-rw-r--r--addons/mail/i18n/lt.po244
-rw-r--r--addons/mail/i18n/lv.po244
-rw-r--r--addons/mail/i18n/mk.po244
-rw-r--r--addons/mail/i18n/mn.po254
-rw-r--r--addons/mail/i18n/nb.po244
-rw-r--r--addons/mail/i18n/nl.po254
-rw-r--r--addons/mail/i18n/nl_BE.po244
-rw-r--r--addons/mail/i18n/pl.po244
-rw-r--r--addons/mail/i18n/pt.po252
-rw-r--r--addons/mail/i18n/pt_BR.po387
-rw-r--r--addons/mail/i18n/ro.po244
-rw-r--r--addons/mail/i18n/ru.po244
-rw-r--r--addons/mail/i18n/sk.po262
-rw-r--r--addons/mail/i18n/sl.po246
-rw-r--r--addons/mail/i18n/sr.po244
-rw-r--r--addons/mail/i18n/sr@latin.po244
-rw-r--r--addons/mail/i18n/sv.po244
-rw-r--r--addons/mail/i18n/th.po244
-rw-r--r--addons/mail/i18n/tr.po246
-rw-r--r--addons/mail/i18n/uk.po244
-rw-r--r--addons/mail/i18n/vi.po244
-rw-r--r--addons/mail/i18n/zh_CN.po281
-rw-r--r--addons/mail/i18n/zh_TW.po244
58 files changed, 9340 insertions, 5276 deletions
diff --git a/addons/mail/i18n/af.po b/addons/mail/i18n/af.po
index 32ad43a4b1b..83081bb1962 100644
--- a/addons/mail/i18n/af.po
+++ b/addons/mail/i18n/af.po
@@ -8,9 +8,9 @@ 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-11-16 19:31+0000\n"
-"Last-Translator: Andre de Kock <adekock11@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Afrikaans (http://www.transifex.com/odoo/odoo-9/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s geskep"
@@ -155,10 +162,10 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(in kanaal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -437,7 +444,7 @@ 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 ""
@@ -562,16 +569,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr "Direkte Boodskappe"
@@ -1460,14 +1457,6 @@ msgid "Important messages"
msgstr "Belangrike boodskappe"
#. 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nuwe boodskap"
#. 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"
@@ -1996,12 +2011,33 @@ msgstr "Nuwe mense"
#. 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 "Geen volgelinge"
#. 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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Privaatheid"
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr "Ongeleesde Boodskappe Teller"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,10 +3147,17 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Skryf iets"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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 "deur"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokument"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr "lidmate"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "rekord:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index fa927c3e1d3..53bd074e2bf 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.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-11-19 17:10+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (نسخة)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "تم إنشاء %s"
@@ -154,9 +161,9 @@ msgstr "انضم %s إلى شبكة %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr "اجتماعات مجلس الإدارة"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "صورة متوسطة الحجم"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "الخصوصية"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "عداد الرسائل الغير مقروءة"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "إلغاء الاشتراك"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "قد تلحق فايلات بهذا القالب، لإضافتها في
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "مستند"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 898709422f0..483f5885022 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -8,9 +8,9 @@ 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-11-18 17:26+0000\n"
-"Last-Translator: Kaloyan Naumov <kaloyan@lumnus.net>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -117,7 +117,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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:10px 15px 10px 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 |\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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\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]} -> ${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"
+msgstr ""
#. module: mail
#. openerp-web
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (копие)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s създадени"
@@ -155,10 +162,10 @@ msgstr "%s се пръсъедини към %s мрежа."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(в канал"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -437,7 +444,7 @@ 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 ""
@@ -562,16 +569,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Поверителност"
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po
index 7ffdc975dae..f308f96bf38 100644
--- a/addons/mail/i18n/bs.po
+++ b/addons/mail/i18n/bs.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s kreiran"
@@ -154,9 +161,9 @@ msgstr "%s se priključio %s mreži."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Dostupan za masovno slanje e-pošte"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Najbolja praksa u prodaji"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Sastanci članova uprave"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Mod sastavljanja"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Nevažeći izraz, to mora biti doslovna python definicija npr. \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Je obavijest"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Slika srednje veličine"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Članovi tih grupa će biti automatski dodani kao pratioci. Imajte na umu da će oni prema potrebi moći ručno upravljati svojom pretplatom."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privatnost"
#. 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 "Istraživanje i razvoj"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Teme raspravljane u grupi..."
@@ -2978,8 +3004,15 @@ msgstr "Nije moguće postali e-mail, molimo podesite pošiljateljevu e-mail adre
#. 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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Greška pri slanju"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Možete priložiti datoteke ovom predlošku, one će biti dodate svim e-
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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 "od"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index f25652e3bd3..30489e9a43b 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/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-12-05 23:18+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (còpia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privacitat"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "Comptador de missatges no llegits"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "per"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po
index cd19786498f..62c3e700ee6 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr "%s se připojil k %s síti."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 "Anonymní"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr ""
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Nejlepší obchodní postupy"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Schůze vedení"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Režim psaní"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Neplatný výraz - musí se jednat o definici ze slovníku Pythonu, např. \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Je upozornění"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Střední obrázek"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Členové těchto skupin budou automaticky přidáni jako odběratelé zpráv. Ti si pak budou moci sami spravovat své přihlášení k odběrům v případě potřeby."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Podmínky"
#. 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 "Oddělení inovací"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Témata diskutovaná v této skupině..."
@@ -2978,8 +3004,15 @@ msgstr "E-mail není možno odeslat. Nastavte prosím e-mailovou adresu nebo ali
#. 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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Chyba uploadu"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "K této šabloně můžete přiložit soubory, které budou přidány ke
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "od"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index de5d892ff67..d3d8234f71f 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopi)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s oprettet"
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Klar til masse - mailing"
#. 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Mellem størrelse foto"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privatliv"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index b908d2a8251..ddb8950a6af 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.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-11-13 14:59+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 15: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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s erstellt"
@@ -154,9 +161,9 @@ msgstr "%s ist dem %s Netzwerk beigetreten."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Alle Nachrichten"
#. 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 "Anonym"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Für Massenversand von Mails verfügbar"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Bewährte Verkaufspraxis"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Vorstandssitzungen"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Schreibmodus"
#. 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"
@@ -957,21 +961,14 @@ msgstr "Beschreibung, die zur versendeten Nachricht hinzugefügt wird. Falls es
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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 "Wussten Sie, dass Sie durch die Eingabe von '@someone' bei der Erfassung Ihrer Nachricht, Sie jemanden zitieren können und dies in seinem Posteingang erscheint?"
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ msgid "Important messages"
msgstr "Wichtige Nachrichten"
#. 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Ungültiger Ausdruck, es muss als literales Python Dictionary definiert werden, z.B. \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 "Folgen Sie %s: %s"
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Ist Benachrichtigung"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr "Mailing Opt-Out"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Bild mittlerer Größe"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Mitglieder dieser Gruppe werden automatisch als Follower hinzugefügt. Beachten Sie, dass diese Ihre Nachrichteneinstellungen auch selbständig bearbeiten können."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Erwähnung(en):"
-
-#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Neue Nachricht"
#. 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"
@@ -1995,12 +2010,33 @@ msgstr "Neue Personen"
#. 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 "Keine Follower"
#. 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
@@ -2325,8 +2361,8 @@ 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"
-msgstr "Regel für den Versand von Mitteilungen über das E-Mail-Gateways.\n- Alle Benutzer: Jeder kann uneingeschränkt Mails senden\n- Authentifizierte Partner: Nur angemeldete Partner\n- Nur Verfolger: Nur Verfolger dieses Dokuments\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2402,12 @@ msgstr "Privatsphäre"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,6 @@ msgid ""
msgstr "Die unten stehenden Werte werden zu Informationszwecken dargestellt. Beim Versand einer E-Mail, werden die\n Werte der E-Mailvorlage genommen."
#. 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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr "An: Follower von"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Diskussionsbeiträge dieser Gruppe"
@@ -2978,8 +3004,15 @@ msgstr "Die E-Mail konnte nicht versendet werden, bitte legen Sie eine Absendera
#. 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"
@@ -3009,28 +3042,35 @@ msgstr "Zähler der ungelelesen Nachrichten"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Abmelden"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Lade hoch"
#. 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 "Uploadfehler"
@@ -3106,10 +3146,17 @@ msgstr "Wer kann Ihren Gruppen-Aktivitäten folgen?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Schreiben Sie etwas"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3119,6 +3166,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Sie haben <b>%s</b> zur Konversation hinzugefügt."
#. 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 ""
@@ -3159,19 +3214,12 @@ msgstr "Sie können Anhänge zu dieser Vorlage hinzufügen, die mit allen E-Mail
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "durch"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "Dokument"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr "Mitglieder"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "Datensatz:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/el.po b/addons/mail/i18n/el.po
index b467f0341b7..7518abfe122 100644
--- a/addons/mail/i18n/el.po
+++ b/addons/mail/i18n/el.po
@@ -8,9 +8,9 @@ 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-12-05 23:38+0000\n"
-"Last-Translator: Goutoudis Kostas <goutoudis@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -117,7 +117,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-msgstr "\n<div itemscope itemtype=\"http://schema.org/EmailMessage\"><br/>\n<div itemprop=\"potentialAction\" itemscope itemtype=\"http://schema.org/ViewAction\"><br/>\n<link itemprop=\"target\" href=\"${ctx['button_access']['url']}\"/><br/>\n<link itemprop=\"url\" href=\"${ctx['button_access']['url']}\"/><br/>\n<meta itemprop=\"name\" content=\"View ${ctx['model_name']}\"/><br/>\n</div><br/>\n</div><br/>\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\"><br/>\n<table cellspacing=\"0\" cellpadding=\"0\" style=\"width:600px;border-collapse:collapse;background:inherit;color:inherit\"><br/>\n<tbody><tr><br/>\n<td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 5px;font-size: 30px\"><br/>\n% if ctx.get('button_access'):<br/>\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><br/>\n% endif<br/>\n<br/>\n% if ctx.get('button_follow'):<br/>\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:10px 15px 10px 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|\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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n% endif\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;\"><br/>\n<div><br/>\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\"><br/>\n</div><br/>\n</td><br/>\n</tr></tbody><br/>\n</table><br/>\n</div><br/>\n<div style=\"padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><br/>\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\"><br/>\n<tbody><tr><br/>\n<td style=\"padding:5px 10px 5px 5px;font-size: 14px;\"><br/>\n${object.body | safe}<br/>\n% if ctx.get('tracking'):<br/>\n<ul><br/>\n% for tracking in ctx['tracking']<br/>\n<li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li><br/>\n% endfor<br/>\n</ul><br/>\n% endif<br/>\n</td><br/>\n</tr></tbody><br/>\n</table><br/>\n</div><br/>\n% if ctx.get('signature'):<br/>\n<div style=\"padding:0px; width:600px;margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777\"><br/>\n<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" style=\"margin: 0 auto; width:600px; border-collapse:collapse; background:inherit; color:inherit\"><br/>\n<tbody><tr><br/>\n<td style=\"padding:5px 10px 5px 5px;font-size: 14px; text-align: left;\"><br/>\n${ctx['signature'] | safe}<br/>\n</td><br/>\n</tr></tbody><br/>\n</table><br/>\n</div><br/>\n% endif"
+msgstr ""
#. module: mail
#. openerp-web
@@ -136,13 +136,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (αντίγραφο)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s δημιουργήθηκε"
@@ -155,10 +162,10 @@ msgstr "%s έχει ενταχθεί το δίκτυο του %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(στο κανάλι"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -389,7 +396,7 @@ msgstr "Ψευδώνυμο"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_users_form_mail
msgid "Alias Accepts Emails From"
-msgstr "Ψευδώνυμο για την αποδοχή emails Από"
+msgstr "Ψευδώνυμο για την αποδοχή emails από"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact
@@ -437,7 +444,7 @@ 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 "Ανώνυμος"
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Διαθέσιμο για μαζική αποστολή mail"
#. 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"
-msgstr "Πίνακας Συναντήσεων"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr "Περιγραφή που θα προστεθεί στο δημοσιεÏ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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 "Το γνωρίζατε; Πληκτρολογήστε '@someone' στην σύνταξη του μηνύματος για να αναφέρετε κάποιον στο μήνυμά σας και να το κάνετε να εμφανιστεί στο δικό του φάκελο Εισερχομένων."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Άμεσα μηνύματα"
@@ -1460,14 +1457,6 @@ 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 "Στην ενότητα \"Κανάλια\", θα βρείτε τα δημόσια και τα περιορισμένα κανάλια. <br>\nΣτην ενότητα \"Άμεσα Μηνύματα\" μπορείτε να μιλήσετε απευθείας με ένα άτομο. <br>\nΗ ενότητα «Ιδιωτικά Κανάλια\" περιέχει τις ιδιωτικές συνομιλίες σας. Μπορείτε να συμμετέχετε σε ένα ιδιωτικό κανάλι, είτε δημιουργώντας το είτε εάν προσκληθείτε σε κάποιο άλλο. <br>"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Μη έγκυρη έκφραση, πρέπει να είναι μια σωστή έκφραση python όπως ορίζεται στο λεξικό ορισμών της python π.χ. \"{'field': 'value'}\""
#. 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 "
@@ -1509,7 +1498,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 "Πρόσκληση να ακολουθήσει %s: %s"
@@ -1567,6 +1563,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 "Είναι καρφιτσωμένο στη διασύνδεση"
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr "Ταχυδρομική Αποχώρηση"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Μεσαίου μεγέθους φωτογραφία"
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,8 +2362,8 @@ 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"
-msgstr "Πολιτική για να δημοσιεύσετε ένα μήνυμα σχετικά με το έγγραφο χρησιμοποιώντας το mailgateway.\n- Ο καθένας: ο καθένας μπορεί να δημοσιεύσει\n- Συνεργάτες: Μόνο πιστοποιημένοι συνεργάτες\n- Ακόλουθοι: μόνο οι ακόλουθοι του σχετικού εγγράφου\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,24 +2403,12 @@ msgstr "Απόρρητο"
#. 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 "Έρευνας και ανάπτυξης (R&D)"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,6 @@ msgid ""
msgstr "Οι τιμές που εμφανίζονται παρακάτω είναι απλά κατατοπιστικές. \nΌταν γίνεται αποστολή του email, οι τιμές θα λαμβάνονται από το πρότυπο email."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Δεν υπάρχουν μηνύματα προς εμφάνιση.<br>"
-
-#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr "Προς: Ακόλουθοι του"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Τα θέματα που συζητήθηκαν σε αυτή την ομάδα..."
@@ -2979,8 +3005,15 @@ msgstr "Δεν μπορεί να αποσταλεί το e-mail, παρακαλÏ
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "Μετρητής μη αναγνωσμένων μηνυμάτων"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Διαγραφή"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Σφάλμα κατά την μεταφόρτωση"
@@ -3107,10 +3147,17 @@ msgstr "Ποιος μπορεί να ακολουθήσει τις δραστηÏ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Γράψε κάτι"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3120,6 +3167,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Έχετε προστεθεί <b>%s</b> στη συνομιλία."
#. 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 ""
@@ -3160,19 +3215,12 @@ msgstr "Μπορείτε να επισυνάψετε αρχεία σε αυτό
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Έχετε διαγραφεί από <b>%s</b>."
#. 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 "Ο φάκελος \"Εισερχόμενα\" περιέχει όλα τα μηνύματα στα οποία έχετε αναφερθεί, και τα μηνύματα που λαμβάνετε ως ακόλουθος ενός εγγράφου. <br>\nΤο τμήμα \"Με αστέρι\" περιέχει όλα τα αγαπημένα σας μηνύματα."
-
-#. 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 "
@@ -3191,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "έγγραφο"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr "μέλη"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/en_GB.po b/addons/mail/i18n/en_GB.po
index 90eb9e4a660..f602440f592 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-22 02:05+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -155,9 +162,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ 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 ""
@@ -562,16 +569,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Medium-sized photo"
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr ""
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr "Unread Messages Counter"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 0eee546b709..c1313517324 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -3,13 +3,15 @@
# * mail
#
# Translators:
+# Ana Juaristi <ajuaristio@gmail.com>, 2015
# Pedro M. Baeza <pedro.baeza@gmail.com>, 2015
+# Rick Hunter <rick_hunter_ec@yahoo.com>, 2015
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-11-07 15:17+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +31,10 @@ msgid ""
" <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"
@@ -54,7 +56,7 @@ 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"
@@ -124,7 +126,7 @@ msgstr ""
#: code:addons/mail/static/src/js/chat_manager.js:50
#, python-format
msgid " from "
-msgstr ""
+msgstr "de"
#. module: mail
#: model:mail.template,subject:mail.mail_template_data_notification_email_default
@@ -133,6 +135,13 @@ msgid ""
"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
"object.parent_id.subject) or (object.parent_id and "
"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
+msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
msgstr ""
#. module: mail
@@ -142,7 +151,7 @@ msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -155,9 +164,9 @@ msgstr "%s se ha unido a la red %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -179,7 +188,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/thread.xml:147
#, python-format
msgid "-------- Show older messages --------"
-msgstr ""
+msgstr "-------- Mostrar mensajes antiguos--------"
#. module: mail
#: code:addons/mail/models/mail_channel.py:513
@@ -187,7 +196,7 @@ msgstr ""
msgid ""
"<div class=\"o_mail_notification\">created <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">creado <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/models/mail_channel.py:489
@@ -437,7 +446,7 @@ msgstr "Todos los mensajes"
#. 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 "Anónimo"
@@ -562,16 +571,6 @@ msgid "Available for mass mailing"
msgstr "Disponible para envío masivo de correo"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Buenas prácticas de ventas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Tablero de citas"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +791,13 @@ msgid "Composition mode"
msgstr "Modo de composición"
#. 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"
@@ -958,21 +964,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1459,6 @@ 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"
@@ -1501,7 +1492,7 @@ msgid ""
msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\""
#. 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 "
@@ -1509,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 "Invitación para seguir %s: %s"
@@ -1567,6 +1565,11 @@ msgid "Is Notification"
msgstr "Es una notificación"
#. 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 ""
@@ -1739,6 +1742,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto de tamaño medio"
@@ -1764,13 +1774,6 @@ msgid ""
msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario."
#. 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
@@ -1981,14 +1984,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2013,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
@@ -2326,8 +2364,8 @@ 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"
-msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- Todos: Todos pueden enviar.\n- Empresas: Sólo las empresas autenticadas.\n- Seguidores: Sólo los seguidores del documento relacionado.\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,24 +2405,12 @@ msgstr "Privacidad"
#. 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 "I+D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2896,6 @@ msgid ""
msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla."
#. 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 "
@@ -2921,6 +2942,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Temas discutidos en este grupo..."
@@ -2979,8 +3007,15 @@ msgstr "No se ha podido enviar el mensaje, por favor configure el correo electrÃ
#. 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"
@@ -3010,28 +3045,35 @@ msgstr "Contador de mensajes no leidos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Anular subscripción"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Error de subida"
@@ -3107,9 +3149,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
+#, python-format
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
#, python-format
-msgid "Write something"
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3169,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 ""
@@ -3160,19 +3217,12 @@ msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3241,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
-msgstr ""
+msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3218,7 +3273,7 @@ msgstr "seguidores"
#. module: mail
#: model:mail.channel,name:mail.channel_all_employees
msgid "general"
-msgstr ""
+msgstr "general"
#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
@@ -3228,11 +3283,18 @@ msgstr "ir.acciones.server"
#. module: mail
#: model:ir.model,name:mail.model_ir_autovacuum
msgid "ir.autovacuum"
-msgstr ""
+msgstr "ir.autovacuum"
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "members"
+msgstr "miembros"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
msgstr ""
#. module: mail
@@ -3242,7 +3304,7 @@ msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3253,14 +3315,14 @@ msgstr "en"
#: code:addons/mail/static/src/xml/client_action.xml:39
#, python-format
msgid "private"
-msgstr ""
+msgstr "privado"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/client_action.xml:21
#, python-format
msgid "public"
-msgstr ""
+msgstr "público"
#. module: mail
#: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -3268,11 +3330,21 @@ msgid "publisher_warranty.contract"
msgstr "Contrato de garantía del publicador"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_AR.po b/addons/mail/i18n/es_AR.po
index a77d45ea7a5..3f153ee8fce 100644
--- a/addons/mail/i18n/es_AR.po
+++ b/addons/mail/i18n/es_AR.po
@@ -8,8 +8,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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -155,9 +162,9 @@ msgstr "%s se ha unido a la red %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ msgstr "Todos los mensajes"
#. 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 ""
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Disponible para envío masivo de correo"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Buenas Prácticas de Ventas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Tablero de reuniones"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,13 @@ msgid "Composition mode"
msgstr "Modo de composición"
#. 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"
@@ -958,21 +962,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\""
#. 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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,11 @@ msgid "Is Notification"
msgstr "Es una Notificación"
#. 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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto de tamaño medio"
@@ -1764,13 +1772,6 @@ msgid ""
msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario."
#. 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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Privacidad"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,6 @@ msgid ""
msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla."
#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,15 @@ msgstr "No se ha podido enviar el email, por favor configure el correo electrón
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "Contador de Mensajes No Leídos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Desuscribirse"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Error de subida"
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_BO.po b/addons/mail/i18n/es_BO.po
index d603e93a158..e96de7813d9 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 15:32+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,10 +788,17 @@ 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"
-msgstr ""
+msgstr "Contactos"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_CL.po b/addons/mail/i18n/es_CL.po
index 18d4bc70fef..8b3cc9621e6 100644
--- a/addons/mail/i18n/es_CL.po
+++ b/addons/mail/i18n/es_CL.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-11-13 00:35+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copiar)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "Contador de mensajes no leídos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_CO.po b/addons/mail/i18n/es_CO.po
index c53673da25c..5108b440d96 100644
--- a/addons/mail/i18n/es_CO.po
+++ b/addons/mail/i18n/es_CO.po
@@ -8,9 +8,9 @@ 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-12-04 20:08+0000\n"
-"Last-Translator: Mateo Tibaquirá <nestormateo@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creado/a"
@@ -155,10 +162,10 @@ msgstr "%s se ha unido a la red %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(en el canal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -437,7 +444,7 @@ msgstr "Todos los Mensajes"
#. 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 "Anónimo"
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Disponible para envíos masivos"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Mejores Prácticas de Ventas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Tablero de citas"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,13 @@ msgid "Composition mode"
msgstr "Modo de redacción"
#. 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"
@@ -958,21 +962,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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 "Sabía que? Puede escribir '@alguien' para mencionar a alguien en su mensaje, y que se le notifique automáticamente en su inbox."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Mensajes Directos"
@@ -1460,14 +1457,6 @@ msgid "Important messages"
msgstr "Mensajes importantes"
#. 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 "Invitación a seguir %s: %s"
@@ -1567,6 +1563,11 @@ msgid "Is Notification"
msgstr "Es Notificación"
#. 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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto mediana"
@@ -1764,13 +1772,6 @@ msgid ""
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Mención(es):"
-
-#. 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
@@ -1981,14 +1982,28 @@ msgstr "Nuevo Texto"
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nuevo mensaje"
#. 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"
@@ -1996,12 +2011,33 @@ msgstr "Nuevas personas"
#. 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 "Sin seguidores"
#. 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
@@ -2326,8 +2362,8 @@ 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"
-msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- todos: todos pueden enviar\n- asociados: sólo asociados autenticados\n- seguidores: sólo los seguidores del documento relacionado\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,24 +2403,12 @@ msgstr "Privacidad"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Canal Privado"
-
-#. 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 "Canales Privados"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "I+D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,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 "No hay mensajes para mostrar.<br>"
-
-#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr "A: Seguidores de"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Temas charlados en este grupo..."
@@ -2979,8 +3005,15 @@ msgstr "No se ha podido enviar el correo, por favor configure el correo o el ali
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "Contador de Mensajes no Leídos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Anular Suscripción"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Dado de baja"
#. 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 "Subiendo"
#. 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 "Error de carga"
@@ -3107,10 +3147,17 @@ msgstr "Quien puede seguir las actividades del grupo?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Escribe algo"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3120,6 +3167,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Usted añadió a <b>%s</b> a la conversación."
#. 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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Usted se dió de baja de <b>%s</b>."
#. 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 "Su \"Inbox\" contiene todos los mensajes en los que usted ha sido mencionado/a, y los mensajes que ha recibido como seguidor/a de un documento.<br>\nLa sección \"Destacados\" contiene todos sus mensajes favoritos."
-
-#. 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 "
@@ -3191,19 +3239,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "md"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr "miembros"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "miempresa.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index a8465fca34f..8b8a5c87a02 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privacidad"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Puede adjuntar archivos a esta plantilla, que se añade a todos los corr
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_DO.po b/addons/mail/i18n/es_DO.po
index 8b1e431d9f6..6b54e387e39 100644
--- a/addons/mail/i18n/es_DO.po
+++ b/addons/mail/i18n/es_DO.po
@@ -8,9 +8,9 @@ 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-11-08 17:06+0000\n"
-"Last-Translator: Eneldo Serrata <eneldoserrata@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -155,9 +162,9 @@ msgstr "%s se ha unido a la red %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ msgstr "Todos los mensajes"
#. 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 "Anónimo"
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Disponible para envío masivo de correo"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Buenas prácticas de ventas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Tablero de citas"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,13 @@ msgid "Composition mode"
msgstr "Modo de composición"
#. 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"
@@ -958,21 +962,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\""
#. 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 "
@@ -1509,7 +1498,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 "Invitación para seguir %s: %s"
@@ -1567,6 +1563,11 @@ msgid "Is Notification"
msgstr "Es una notificación"
#. 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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto de tamaño medio"
@@ -1764,13 +1772,6 @@ msgid ""
msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario."
#. 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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,8 +2362,8 @@ 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"
-msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- Todos: Todos pueden enviar.\n- Empresas: Sólo las empresas autenticadas.\n- Seguidores: Sólo los seguidores del documento relacionado.\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,24 +2403,12 @@ msgstr "Privacidad"
#. 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 "I+D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,6 @@ msgid ""
msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla."
#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Temas discutidos en este grupo..."
@@ -2979,8 +3005,15 @@ msgstr "No se ha podido enviar el mensaje, por favor configure el correo electrÃ
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "Contador de mensajes no leidos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Anular subscripción"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Error de subida"
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "Contrato de garantía del publicador"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_EC.po b/addons/mail/i18n/es_EC.po
index 71cd53fc3ec..cd0e0a46bab 100644
--- a/addons/mail/i18n/es_EC.po
+++ b/addons/mail/i18n/es_EC.po
@@ -8,9 +8,9 @@ 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-12-01 20:29+0000\n"
-"Last-Translator: Rick Hunter <rick_hunter_ec@yahoo.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -117,7 +117,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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:10px 15px 10px 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 |\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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\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]} -> ${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"
+msgstr ""
#. module: mail
#. openerp-web
@@ -136,13 +136,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -155,10 +162,10 @@ msgstr "%s ha ingresado a la red %s "
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(en canal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -172,7 +179,7 @@ msgstr "(sin dirección de correo electrónico)"
msgid ""
"* Smiley are only used for HTML code to display an image * Text (default "
"value) is use to substitute text with another text"
-msgstr ""
+msgstr "* Emoticons son usados por el código HTML para mostrar una imagen. * Texto (valor predeterminado) es usado para sustituir texto con otro texto"
#. module: mail
#. openerp-web
@@ -187,7 +194,7 @@ msgstr "-------- Mostrar mensajes antiguos --------"
msgid ""
"<div class=\"o_mail_notification\">created <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">creado <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/models/mail_channel.py:489
@@ -195,7 +202,7 @@ msgstr ""
msgid ""
"<div class=\"o_mail_notification\">joined <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">ingresó <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/models/mail_channel.py:151
@@ -203,21 +210,21 @@ msgstr ""
msgid ""
"<div class=\"o_mail_notification\">left <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">izquierda <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. 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>"
-msgstr ""
+msgstr "<div><p>Saludos,</p><p>%s lo ha invitado a seguir el siguiente documento %s: %s.<p></div>"
#. module: mail
#: code:addons/mail/wizard/invite.py:25
#, python-format
msgid ""
"<div><p>Hello,</p><p>%s invited you to follow a new document.</p></div>"
-msgstr ""
+msgstr "<div><p>Saludos,</p><p>%s invitado a seguir un nuevo documento.</p></div>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -228,14 +235,14 @@ 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>Correo electrónico masivo</strong> on\n <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">los registros seleccionados</span>\n <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">el filtro actual</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
msgid ""
"<span class=\"o_stat_text\">Add</span>\n"
" <span class=\"o_stat_text\">Context Action</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Añadir</span>\n<span class=\"o_stat_text\">Acción de Contexto</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -247,7 +254,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "<span>failed emails</span>"
-msgstr ""
+msgstr "<span>email fallados</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -256,21 +263,21 @@ msgid ""
" not only the ids selected in the list view.</strong><br/>\n"
" If you want to work only with selected ids, please uncheck the\n"
" list header checkbox."
-msgstr ""
+msgstr "<strong> Todos los registros que coincidan con su filtro de búsqueda actual se enviarán \npor correo, no sólo los registros seleccionados en el listado. </ strong> <br/>\nSi quieres trabajar sólo con los registros seleccionados, por favor desmarque la\nselección correspondiente."
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid ""
"<strong>Moreover, if you want to send a lot of emails, we recommend you to use the mass mailing module</strong>. <br/>\n"
" Confirming this wizard will probably take a few minutes blocking your browser."
-msgstr ""
+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 ""
+msgstr "@ Bandeja de entrada"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
@@ -304,7 +311,7 @@ msgstr "Acción Requerida"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
msgid "Activated by default when subscribing."
-msgstr ""
+msgstr "Activado de manera predeterminada cuando se suscriben."
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
@@ -328,7 +335,7 @@ msgstr "Actividad"
#: code:addons/mail/static/src/xml/chatter.xml:144
#, python-format
msgid "Add Channels"
-msgstr ""
+msgstr "Añadir Canales"
#. module: mail
#. openerp-web
@@ -336,13 +343,13 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#, python-format
msgid "Add Followers"
-msgstr ""
+msgstr "Añadir Seguidores"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature
#: model:ir.model.fields,field_description:mail.field_mail_template_user_signature
msgid "Add Signature"
-msgstr ""
+msgstr "Añadir Firma"
#. module: mail
#. openerp-web
@@ -350,23 +357,23 @@ msgstr ""
#: code:addons/mail/static/src/xml/client_action.xml:44
#, python-format
msgid "Add a channel"
-msgstr ""
+msgstr "Añade un canal"
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
msgid "Add channels to notify..."
-msgstr ""
+msgstr "Añadir canales para notificación..."
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
msgid "Add contacts to notify..."
-msgstr ""
+msgstr "Añadir contactos para notificar..."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids
msgid "Additional Contacts"
-msgstr ""
+msgstr "Contactos adicionales"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_form
@@ -384,63 +391,63 @@ msgstr "Configuraciones Avanzadas"
#: model:ir.ui.view,arch_db:mail.view_mail_alias_form
#: model:ir.ui.view,arch_db:mail.view_mail_alias_tree
msgid "Alias"
-msgstr ""
+msgstr "Alías"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_users_form_mail
msgid "Alias Accepts Emails From"
-msgstr ""
+msgstr "Aceptar correos electrónicos desde el Alías"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_contact
#: model:ir.model.fields,field_description:mail.field_res_users_alias_contact
msgid "Alias Contact Security"
-msgstr ""
+msgstr "Alías del Contacto de Seguridad"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_base_config_settings_alias_domain
msgid "Alias Domain"
-msgstr ""
+msgstr "Alías del Dominio"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_name
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_name
#: model:ir.model.fields,field_description:mail.field_res_users_alias_name
msgid "Alias Name"
-msgstr ""
+msgstr "Nombre del Alías"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_domain
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_domain
#: model:ir.model.fields,field_description:mail.field_res_users_alias_domain
msgid "Alias domain"
-msgstr ""
+msgstr "Alías del Dominio"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_model_id
#: model:ir.model.fields,field_description:mail.field_mail_channel_alias_model_id
#: model:ir.model.fields,field_description:mail.field_res_users_alias_model_id
msgid "Aliased Model"
-msgstr ""
+msgstr "Alías del Modelo"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_alias
#: model:ir.ui.menu,name:mail.mail_alias_menu
msgid "Aliases"
-msgstr ""
+msgstr "Alías"
#. module: mail
#: selection:res.partner,notify_email:0
msgid "All Messages"
-msgstr ""
+msgstr "Todos los mensajes"
#. 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 ""
+msgstr "Anónimo"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread
@@ -562,16 +569,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -648,12 +645,12 @@ msgstr "Canal"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type
msgid "Channel Type"
-msgstr ""
+msgstr "Tipo de Canal"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
msgid "Channel message ids"
-msgstr ""
+msgstr "IDS de mensajes del canal"
#. module: mail
#. openerp-web
@@ -669,45 +666,45 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
#, python-format
msgid "Channels"
-msgstr ""
+msgstr "Canales"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_channel_partner_action
#: model:ir.ui.menu,name:mail.mail_channel_partner_menu
msgid "Channels/Partner"
-msgstr ""
+msgstr "Canales/Empresas"
#. module: mail
#: model:ir.actions.client,name:mail.mail_channel_action_client_chat
msgid "Chat"
-msgstr ""
+msgstr "Chat"
#. module: mail
#: selection:mail.channel,channel_type:0
msgid "Chat Discussion"
-msgstr ""
+msgstr "Chat de Discusión"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_shortcode_action
msgid "Chat Shortcode"
-msgstr ""
+msgstr "Código del Chat"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_child_ids
msgid "Child Messages"
-msgstr ""
+msgstr "Mensajes relacionados"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid "Choose a template to display its values."
-msgstr ""
+msgstr "Elija una plantilla para mostrar sus valores"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "Choose an example"
-msgstr ""
+msgstr "Elija un ejemplo"
#. module: mail
#: code:addons/mail/models/mail_thread.py:308
@@ -792,6 +789,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"
@@ -866,7 +870,7 @@ msgstr "Creado"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Creation Month"
-msgstr ""
+msgstr "Mes de Creación"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message_starred
@@ -958,21 +962,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -980,17 +977,17 @@ msgstr ""
#. module: mail
#: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat
msgid "Discuss"
-msgstr ""
+msgstr "Mensajes"
#. module: mail
#: model:ir.model,name:mail.model_mail_channel
msgid "Discussion channel"
-msgstr ""
+msgstr "Canal de Mensajes"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_comment
msgid "Discussions"
-msgstr ""
+msgstr "Mensajes"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_display_name
@@ -1021,7 +1018,7 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
-msgstr ""
+msgstr "Seguidores de Documento"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -1053,12 +1050,12 @@ msgstr "Email"
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Email Alias"
-msgstr ""
+msgstr "Alías del Correo electrónico"
#. module: mail
#: model:ir.model,name:mail.model_mail_alias
msgid "Email Aliases"
-msgstr ""
+msgstr "Alías del Correo Electrónico"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
@@ -1069,32 +1066,32 @@ msgstr "ConfigurarEmail"
#: model:ir.model.fields,field_description:mail.field_res_partner_notify_email
#: model:ir.model.fields,field_description:mail.field_res_users_notify_email
msgid "Email Messages and Notifications"
-msgstr ""
+msgstr "Mensajes de Correo Electrónico y Notificaciones"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "Email Preview"
-msgstr ""
+msgstr "Previsualizar Correo Electrónico"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
msgid "Email Search"
-msgstr ""
+msgstr "Búsqueda de Correo Electrónico"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_email_send
msgid "Email Sent"
-msgstr ""
+msgstr "Correo electrónico enviado"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id
msgid "Email Template"
-msgstr ""
+msgstr "Plantilla de Correo Electrónico"
#. module: mail
#: model:ir.model,name:mail.model_email_template_preview
msgid "Email Template Preview"
-msgstr ""
+msgstr "Previsualizar Plantilla de Correo Electrónico"
#. module: mail
#: model:ir.model,name:mail.model_mail_template
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1721,7 +1722,7 @@ msgstr ""
#: code:addons/mail/models/mail_mail.py:306
#, python-format
msgid "Mail Delivery Failed"
-msgstr ""
+msgstr "Falló el envío de Correo"
#. module: mail
#: model:ir.model,name:mail.model_mail_tracking_value
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr ""
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr "Contador de Mensajes no Leídos"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
+#, python-format
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
#, python-format
-msgid "Write something"
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ msgid "base.config.settings"
msgstr "Configuración Básica"
#. 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr "miembros"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po
index c53071b09c8..836b58baa59 100644
--- a/addons/mail/i18n/es_MX.po
+++ b/addons/mail/i18n/es_MX.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-11-14 19:47+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creado"
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -893,7 +897,7 @@ msgstr "Fecha"
#: 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 "Fecha de último trabajo realizado en esta cuenta"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1290,7 +1287,7 @@ msgstr "Seguidores"
#: 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 "Seguidores (Socios)"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_subscription_form
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1592,7 +1593,7 @@ msgstr "Idioma"
#: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post
#: model:ir.model.fields,field_description:mail.field_res_users_message_last_post
msgid "Last Message Date"
-msgstr ""
+msgstr "Fecha de último mensaje"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview___last_update
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2040,7 +2076,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 "Número de acciones"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter
@@ -2048,7 +2084,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 "Número de mensajes que requieren una acción"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter
@@ -2056,7 +2092,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 "Número de mensajes sin leer"
#. module: mail
#: model:ir.actions.act_window,help:mail.action_contacts
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3005,32 +3038,39 @@ msgstr "Mensajes sin leer"
#: 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 "Contador de mensajes sin leer"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index bec65634a91..23f5cf15a8d 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privacidad"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po
index 3d8fd51afe8..d98ad60f3ea 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privacidad"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po
index 1ed19290b72..3b17a2b5761 100644
--- a/addons/mail/i18n/et.po
+++ b/addons/mail/i18n/et.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (koopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privaatsus"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/fa.po b/addons/mail/i18n/fa.po
index 35364eb907e..3774b4bc3ce 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s ایجاد شد"
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "حریم‌خصوصی"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "شمارنده پیام‌های خوانده‌نشده"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "خطا در آپلود"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "سند"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index a416763f2d7..047dffbdb1d 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -8,8 +8,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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopio)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s luotu"
@@ -155,9 +162,9 @@ msgstr "%s on liittynyt %s verkkoon."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -299,7 +306,7 @@ msgstr "Käyttöoikeusryhmät"
#: 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 "Huomiota vaadittu"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_message_subtype_default
@@ -437,7 +444,7 @@ msgstr "Kaikki viestit"
#. 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 "Anonyymi"
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Käytettävissä joukkopostitukseen"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Parhaat myyntikäytännöt"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Johtoryhmän tapaamiset"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,13 @@ msgid "Composition mode"
msgstr "Kirjoitustila"
#. 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"
@@ -958,21 +962,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1416,7 +1413,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi."
#: model:ir.model.fields,help:mail.field_res_partner_message_needaction
#: model:ir.model.fields,help:mail.field_res_users_message_needaction
msgid "If checked, new messages require your attention."
-msgstr ""
+msgstr "Jos valittu, uudet viestit vaativat huomiosi."
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Virheellinen lauseke. Lausekkeen täytyy olla oikeanmuotoinen python-dictionary, esim. \"{'kentta': 'arvo'}\""
#. 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 "
@@ -1509,7 +1498,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 "Kutsu seurata %s:n dokumenttia %s"
@@ -1567,6 +1563,11 @@ msgid "Is Notification"
msgstr "On ilmoitus"
#. 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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Keskikokoinen kuva"
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2057,7 +2093,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 "Lukemattomien viestien määrä"
#. module: mail
#: model:ir.actions.act_window,help:mail.action_contacts
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Yksityisyys"
#. 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 "T&K"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Aiheet tämän ryhmän keskusteltavaksi..."
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Tuontilatauksessa virhe"
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr "Voit liittää tähän mallipohjaan liitetiedostoja, jotka lähetetään
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "omayritys.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 04e712db78c..2e844bd90ec 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -14,9 +14,9 @@ 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-11-24 23:03+0000\n"
-"Last-Translator: Maxime Chambreuil <maxime.chambreuil@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -35,10 +35,10 @@ msgid ""
" <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"
@@ -60,7 +60,7 @@ 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"
@@ -123,7 +123,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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:10px 15px 10px 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 |\n % endif\n % endfor\n % else:\n <strong>Envoyé par</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>avec</strong>\n <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\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]} -> ${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"
+msgstr ""
#. module: mail
#. openerp-web
@@ -142,13 +142,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, 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:234
#, python-format
msgid "%s created"
msgstr "%s créé(e)"
@@ -161,10 +168,10 @@ msgstr "%s a rejoint le réseau %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(dans le canal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -395,7 +402,7 @@ msgstr "Alias"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_users_form_mail
msgid "Alias Accepts Emails From"
-msgstr "Accepter les courriel de"
+msgstr "Accepter les courriels de"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact
@@ -443,7 +450,7 @@ msgstr "Tous les messages"
#. 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 "Anonyme"
@@ -568,16 +575,6 @@ msgid "Available for mass mailing"
msgstr "Disponible pour diffusion de masse"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Bonnes pratiques de vente"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Réunions"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -798,6 +795,13 @@ msgid "Composition mode"
msgstr "Mode de composition"
#. 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"
@@ -964,21 +968,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Detach"
msgstr "Détacher"
#. 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 "Le saviez-vous? Taper \"@quelqu'un\" dans le compositeur pour citer quelqu'un dans votre message, et faites le apparaître dans votre propre boîte de réception. "
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Messages direct"
@@ -1466,14 +1463,6 @@ msgid "Important messages"
msgstr "Messages importants"
#. 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 "Dans la section \"Chaine\" vous trouverez les chaines publiques et privées. <br>\nLa section \"Message Direct\" vous permet de parler directement à une personne. <br>\nLa section \"Groupe privé\" contient vos conversations privées. Vous pouvez rejoindre une chaine pricée soit en la créant vous-même, ou en étant invité par quelqu'un d'autre. <br>"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1507,7 +1496,7 @@ msgid ""
msgstr "Expression invalide : une définition litérale d'un dictionnaire Python est attendue, par exemple \"{'field': 'value'}\""
#. 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 "
@@ -1515,7 +1504,14 @@ msgid ""
msgstr "Ensemble d'enregistrements invalide: doit être appellé en tant que modèle (sans enregistrements) ou sur une seule fiche d'enregistrement"
#. 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 "Invitation à suivre %s : %s"
@@ -1573,6 +1569,11 @@ msgid "Is Notification"
msgstr "Est une notification"
#. 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 "Est épinglé sur l'interface"
@@ -1745,6 +1746,13 @@ msgid "Mailing Opt-Out"
msgstr "Mailing Opt-Out"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Photo (taille moyenne)"
@@ -1770,13 +1778,6 @@ msgid ""
msgstr "Les membres de ces groupes seront automatiquement abonnés. Ils pourront cependant gérer leur abonnement manuellement si nécessaire."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Mention(s):"
-
-#. 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
@@ -1987,14 +1988,28 @@ msgstr "Nouvelle valeur de texte"
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nouveau Message"
#. 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"
@@ -2002,12 +2017,33 @@ msgstr "Nouvelles personnes"
#. 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 "Pas de suiveur"
#. 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
@@ -2332,8 +2368,8 @@ 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"
-msgstr "Politique pour poster un message sur le document via la passerelle email.\n- tout le monde: tout le monde peut poster\n- partenaires: seulement les partenaires authentifiés\n- suiveurs: seulement les personnes qui suivent le document lié\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2373,24 +2409,12 @@ msgstr "Confidentialité"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Chaine privée"
-
-#. 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 "Chaines privées"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2876,11 +2900,6 @@ msgid ""
msgstr "Les valeurs affichées ci-dessous sont informatives. Lors de l'envoi du mail, les valeurs seront puisées dans le modèle d'email."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Il n'y a pas de messages à afficher.<br>"
-
-#. 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 "
@@ -2927,6 +2946,13 @@ msgid "To: Followers of"
msgstr "A: Followers de"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Sujets discutés dans ce groupe..."
@@ -2985,8 +3011,15 @@ msgstr "Impossible d'envoyer le courriel, veuillez configurer l'adresse de l'exp
#. 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"
@@ -3016,28 +3049,35 @@ msgstr "Compteur de messages non lus"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Se désabonner"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Désinscrit "
#. 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 "Téléchargement en cours..."
#. 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 "Erreur de transmission"
@@ -3113,10 +3153,17 @@ msgstr "Qui peut suivre les activités du groupe? "
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Écrivez quelque chose ..."
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3126,6 +3173,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Vous avez rajouté <b>%s</b> à la conversation "
#. 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 ""
@@ -3166,19 +3221,12 @@ msgstr "Vous pouvez joindre des fichiers à ce modèle, à ajouter à tous les c
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Vous vous êtes désinscrits de <b>%s</b>."
#. 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 "Votre \"Boite de réception\" contient tous les messages dans lesquels vous avez été mentionné, et les messages reçus en tant que follower d'un document. <br>\nLa section \"étoilée\" contient tous vos messages favoris."
-
-#. 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 "
@@ -3197,19 +3245,24 @@ 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 "par"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "document"
@@ -3242,13 +3295,20 @@ msgid "members"
msgstr "membres"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "masociete.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3274,11 +3334,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "enregistrement:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index 2e857c176cb..31382daa35a 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Intimidade"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po
index 236e30c380b..dcaf90a9d85 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (העתק)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s נוצר"
@@ -154,9 +161,9 @@ msgstr "%s הצטרף לרשת %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 "אנונימי"
@@ -561,16 +568,6 @@ 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"
-msgstr "פגישות הנהלה"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "תצלום בינוני"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "פרטיות"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "שגיאת העלאה"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 618e99a3c1c..17596558c01 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -10,9 +10,9 @@ 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-11-21 15:09+0000\n"
-"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -31,10 +31,10 @@ msgid ""
" <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"
@@ -56,7 +56,7 @@ 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"
@@ -138,13 +138,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s kreiran"
@@ -157,9 +164,9 @@ msgstr "%s se priključio %s mreži."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -439,7 +446,7 @@ msgstr "Sve poruke"
#. 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 "Anoniman"
@@ -564,16 +571,6 @@ msgid "Available for mass mailing"
msgstr "Dostupan za masovno slanje e-pošte"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Najbolja praksa u prodaji"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Sastanci članova uprave"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -794,6 +791,13 @@ msgid "Composition mode"
msgstr "Mod sastavljanja"
#. 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"
@@ -960,21 +964,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Detach"
msgstr "Odvojiti"
#. 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:35
#, python-format
msgid "Direct Messages"
msgstr "Izravne poruke"
@@ -1462,14 +1459,6 @@ msgid "Important messages"
msgstr "Važne poruke"
#. 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"
@@ -1503,7 +1492,7 @@ msgid ""
msgstr "Nevažeći izraz, to mora biti doslovna python definicija npr. \"{'field': 'Vrijednost'}\""
#. 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 "
@@ -1511,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 "Poziv za praćenje %s: %s"
@@ -1569,6 +1565,11 @@ msgid "Is Notification"
msgstr "Je obavijest"
#. 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 ""
@@ -1741,6 +1742,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Fotografija srednje veličine"
@@ -1766,13 +1774,6 @@ msgid ""
msgstr "Članovi tih grupa će biti automatski dodani kao sljedbenici. Imajte na umu da će oni prema potrebi moći ručno upravljati svojom pretplatom."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Spomenut(i):"
-
-#. 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
@@ -1983,14 +1984,28 @@ msgstr "Tekst nove vrijednosti: "
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nova poruka"
#. 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"
@@ -1998,12 +2013,33 @@ msgstr "Nove osobe"
#. 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 "Nije sljedbenik"
#. 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
@@ -2328,8 +2364,8 @@ 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"
-msgstr "Politika ostavljanja poruka na dokumentu koristeći mailgateway.\n-svatko:svatko može objaviti poruku\n-partneri: samo autentificirani partner\n-pratitelji: samo pratitelji srodne dokumentacije\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2369,24 +2405,12 @@ msgstr "Privatnost"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Privatni kanal"
-
-#. 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 "Privatni kanali"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "Istraživanje i razvoj"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2872,11 +2896,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 "
@@ -2923,6 +2942,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Teme raspravljane u grupi..."
@@ -2981,8 +3007,15 @@ msgstr "Nije moguće postali e-mail, molimo podesite pošiljateljevu e-mail adre
#. 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"
@@ -3012,28 +3045,35 @@ msgstr "Brojač nepročitanih poruka"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Odjava"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Odjavljen"
#. 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 "Greška pri preuzimanju"
@@ -3109,10 +3149,17 @@ msgstr "Tko može pratiti aktivnost grupe?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Napiši nešto"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3122,6 +3169,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Dodali ste <b>%s</b> u razgovor."
#. 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 ""
@@ -3162,19 +3217,12 @@ msgstr "Možete priložiti datoteke ovom predlošku, one će biti dodate svim e-
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3193,19 +3241,24 @@ 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 "od"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokument"
@@ -3238,13 +3291,20 @@ msgid "members"
msgstr "članovi"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3270,11 +3330,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "zapis:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 4bb3d578a7b..e6a0ebbfc27 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -9,8 +9,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-11-07 16:49+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-12 22:37+0000\n"
"Last-Translator: Kris Krnacs\n"
"Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -30,10 +30,10 @@ msgid ""
" <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"
@@ -55,7 +55,7 @@ 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"
@@ -118,7 +118,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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 Részletek <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:10px 15px 10px 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 |\n % endif\n % endfor\n % else:\n <strong>Küldte</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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo rendszert</strong></a>\n % endif\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]} -> ${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"
+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 len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n <strong>Feladó</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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo rendszert</strong></a>\n % endif\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]} -> ${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"
#. module: mail
#. openerp-web
@@ -137,13 +137,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr "%d Üzenetek"
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (másolat)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s létrehozva"
@@ -156,10 +163,10 @@ msgstr "%s csatlakozott a %s hálózathoz."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(csatornában"
+msgid "(from"
+msgstr "(feladó"
#. module: mail
#. openerp-web
@@ -438,7 +445,7 @@ msgstr "Összes üzenet"
#. 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 "Névtelenül"
@@ -563,16 +570,6 @@ msgid "Available for mass mailing"
msgstr "Elérhető tömeges levelezéshez"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Legjobb Értékesítési Praktikák"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Tanácskozás"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -793,6 +790,13 @@ msgid "Composition mode"
msgstr "Összeállítási mód"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:24
+#, python-format
+msgid "Congratulations, your inbox is empty"
+msgstr "Gratulálok, a postaládája üres"
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_contacts
#: model:ir.ui.menu,name:mail.menu_contacts
msgid "Contacts"
@@ -959,21 +963,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Detach"
msgstr "Leválaszt"
#. 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 "Tudtad? Valakinek az oldalán írja be ezt: '@valaki' az összeállítóba az üzenetébe, és hagyja, hogy megjelenjen a saját bejövő levelei között."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Közvetlen üzenet"
@@ -1461,14 +1458,6 @@ msgid "Important messages"
msgstr "Fontos üzenet"
#. 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 "A \"Csatornák\" szakaszon, megtalálhatja a nyilvános és a tiltott csatornákat.<br>\n A \"Közvetlen üzenet\" szakaszon lehetősége van közvetlenül egy emberrel beszélnie.<br>\n A \"Privát csoport\" szakaszon a privát beszélgetései vannak. Csatlakozhat privát csatornához is, úgy hogy létrehoz egy újat, vagy meghívást kap egy másikhoz.<br>"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1502,7 +1491,7 @@ msgid ""
msgstr "Nem érvényes kifejezés, ennek python szótár kifejezésnek kell lennie pl.: \"{'field': 'value'}\""
#. 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 "
@@ -1510,7 +1499,14 @@ msgid ""
msgstr "Nem érvényes feljegyzés beállítás: modellnek kell hívni (feljegyzések nélkül) vagy egyedi-feljegyzés feljegyzésbeállító"
#. 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 "Meghívó"
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:53
#, python-format
msgid "Invitation to follow %s: %s"
msgstr "Meghívás a követésre %s: %s"
@@ -1568,6 +1564,11 @@ msgid "Is Notification"
msgstr "Ez egy üzenet"
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+msgid "Is a member"
+msgstr "Ő tagja"
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
msgid "Is pinned on the interface"
msgstr "Csatolón rögzítve"
@@ -1740,6 +1741,13 @@ msgid "Mailing Opt-Out"
msgstr "Levelezésből kilépés"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr "Összeset elolvasottnak jelöl"
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Közepes méretű fotó"
@@ -1765,13 +1773,6 @@ msgid ""
msgstr "Ezeknek a csoportoknak a tagjai automatikusan hozzá lesznek adva a követőkhöz. Megjegyezve, hogy ha szükséges szerkeszteni tudják a feliratkozásukat."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Megemlítés(ek):"
-
-#. 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
@@ -1982,14 +1983,28 @@ msgstr "Szöveg új értéke"
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Új üzenet"
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:140
+#, python-format
+msgid "New messages"
+msgstr "Új üzenetek"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:25
+#, python-format
+msgid "New messages appear here."
+msgstr "Új üzenetek itt láthatóak."
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:81
#, python-format
msgid "New people"
@@ -1997,12 +2012,33 @@ msgstr "Új személy"
#. 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 "Nincs követő"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:16
+#, python-format
+msgid "No matches found"
+msgstr "Nem talált egyezőt"
+
+#. 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 "Kereséséhez nem talált megegyezőt. Próbálja megváltoztatni a keresési szűrőket."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:28
+#, python-format
+msgid "No starred message"
+msgstr "Nincs kedvenc üzenete"
+
+#. 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
@@ -2327,8 +2363,8 @@ 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"
-msgstr "Az üzenetátjáró használatának alapvető irányvonalai a dokumentumra vonatkozó üzenetek kiküldéséhez.\n- mindenki: mindenki tud üzenni\n- ügyfelek: csak a hitelesített partnerek\n- követők: csak az idevonatkozó dokumentum követői\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr "Az üzenetátjáró használatának alapvető irányvonalai a dokumentumra vonatkozó üzenetek kiküldéséhez.\n- mindenki: mindenki tud üzenni\n- ügyfelek: csak a hitelesített partnerek\n- követők: csak az idevonatkozó dokumentum követői vagy a következő csatornák tagjai\n"
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2368,24 +2404,12 @@ msgstr "Adatvédelem"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Privát csatorna"
-
-#. 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 "Privát csatornák"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2871,11 +2895,6 @@ msgid ""
msgstr "Az it feltüntetett értékek csak információként szolgálnak. Ha emailt küld, az értékek\n az email sablonból lesznek kiküldve."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Nincsenek megjelenítendő üzenetek.<br>"
-
-#. 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 "
@@ -2922,6 +2941,13 @@ msgid "To: Followers of"
msgstr "Címzett: Követők ehhez"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr "Ma"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "A csoport által megbeszélt témák..."
@@ -2980,8 +3006,15 @@ msgstr "Nem tud e-mailt küldeni, kérem állítsa be a küldő e-mail címét v
#. 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 "Visszavon"
+
+#. 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"
@@ -3011,28 +3044,35 @@ msgstr "Olvasatlan üzenetek számlálója"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr "Összes eltávolítása a kedvencekből"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Leiratkozás"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Leiratkozva"
#. 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 "Feltöltés"
#. 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 "Feltöltési hiba"
@@ -3108,10 +3148,17 @@ msgstr "Ki követheti a csoport tevékenységét?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Írj valamit"
+msgid "Write something..."
+msgstr "Írj valamit..."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr "Tegnap"
#. module: mail
#. openerp-web
@@ -3121,6 +3168,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Hozzáadta a <b>%s</b> ehhez a beszélgetéshez."
#. 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 "Bármely üzenetet 'csillaggal' kedvencnek jelölheti, és ez feltűnik ebben a csatornában."
+
+#. module: mail
#: code:addons/mail/models/res_users.py:47
#, python-format
msgid ""
@@ -3161,19 +3216,12 @@ msgstr "Hozzáadhat fájl mellékletet ehez a sablonhoz, ami minden ezzel a sabl
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Leiratkozott erről <b>%s</b>."
#. 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 "A \"Beérkezett üzenetek\" tartalmazzák az összes üzenetet, melyben szerepel, és azokat, melyeket mint egy dokumentum követő kap.<br>\n A \"Csillagozott\" szakasz tartalmazza az összes kedvenc üzenetét."
-
-#. 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 "
@@ -3192,19 +3240,24 @@ msgid "base.config.settings"
msgstr "base.config.settings"
#. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "igazgatósági-ülés"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_form
msgid "by"
msgstr "által"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokumentum"
@@ -3237,13 +3290,20 @@ msgid "members"
msgstr "tagok"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr "megemlítés(ek) elolvasottként jelölve."
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "envallalatom.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3269,11 +3329,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "olvasott"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "record:"
msgstr "feljegyzés:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "értékesítés"
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/id.po b/addons/mail/i18n/id.po
index 9adbb0dd8be..d6640af05c4 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-12-03 00:43+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copy)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s dibuat"
@@ -154,9 +161,9 @@ msgstr "%s telah bergabung jaringan %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Semua Pesan"
#. 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Tersedia untuk surat massal"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Praktek penjualan"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Rapat Dewan"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Mode Kompisisi"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Perintahnya salah, harus sesuai dengan definisi pada kamus python misalnya. \"{'kolom':'nilai'}\""
#. 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 "
@@ -1508,7 +1497,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 "Undangan untuk mengikuti %s: %s"
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Notifikasi"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto berukuran sedang"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Anggota yang kelompok akan secara otomatis ditambahkan sebagai pengikut. Perhatikan bahwa mereka akan mampu mengelola langganan mereka secara manual jika diperlukan."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,8 +2361,8 @@ 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"
-msgstr "Kebijakan untuk mengirimkan sebuah pesan di dokumen menggunakan mailgateway.\n-Semua orang: setiap orang dapat memposting\n - mitra: hanya dikonfirmasi mitra \n - pengikut: hanya pengikut dokumen terkait\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2402,12 @@ msgstr "Privasi"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Topik yang dibahas dalam kelompok ini..."
@@ -2978,8 +3004,15 @@ msgstr "Tidak dapat mengirim email, harap mengkonfigurasi alamat email pengirim
#. 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"
@@ -3009,28 +3042,35 @@ msgstr "Pesan yang belum dibaca Counter"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Berhenti Berlangganan"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Meng-upload kesalahan"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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 "oleh"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokumen"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index ef89362781d..cc33ebcedc4 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.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-11-12 16:52+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s creato"
@@ -154,9 +161,9 @@ msgstr "%s si è unito alla rete %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Tutti i Messaggi"
#. 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Disponibile per mass mailing"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Best Sales Practices"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Appuntamenti CdA"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Modo composizione"
#. 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"
@@ -957,21 +961,14 @@ msgstr "Descrizione che verrà aggiunta al messaggio inviato per questo sottotip
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1451,7 +1448,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Important Messages"
-msgstr ""
+msgstr "Messaggi importanti"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_search
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Espressione non valida, deve essere un dizionario python, es: \"{'field':'value'}\""
#. 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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "E' una notifica"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto grandezza media"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "I membri di questi gruppi verranno automaticamente aggiunti ai followers. Ricorda che saranno in grado di gestire le loro sottoscrizioni manualmente se necessario."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2056,7 +2092,7 @@ msgstr "Numero di messaggi che richiedono un'azione"
#: 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 "Numero di messaggi non letti"
#. module: mail
#: model:ir.actions.act_window,help:mail.action_contacts
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privacy"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Argomenti disccussi in questo gruppo..."
@@ -2978,8 +3004,15 @@ msgstr "Impossibile inviare email, si prega di configuare l'indirizzo email del
#. 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"
@@ -3005,32 +3038,39 @@ msgstr "Messaggi Non Letti"
#: 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 "Contatore di messsaggi non letti"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Annulla la sottoscrizione"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Errore caricamento"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Dovresti allegare file al template, così che vengano allegati a tutte l
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "da"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "record:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 2bf63c97391..ffa846d3aac 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -8,9 +8,9 @@ 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-12-05 03:28+0000\n"
-"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s(コピー)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s 登録"
@@ -155,9 +162,9 @@ msgstr "%s が %s ネットワークに參加しました。"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ 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 "匿名"
@@ -562,16 +569,6 @@ 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"
-msgstr "役員会"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -619,14 +616,14 @@ msgstr "CCメッセージの宛先"
#: model:ir.model.fields,help:mail.field_email_template_preview_email_cc
#: model:ir.model.fields,help:mail.field_mail_template_email_cc
msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr "写しの宛先名"
+msgstr "CC宛先"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc
#: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc
#: model:ir.model.fields,field_description:mail.field_mail_template_email_cc
msgid "Cc"
-msgstr "写し(CC)"
+msgstr "CC"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr "このサブタイプのために投稿したメッセージに追加さ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "プライバシー"
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "このグループで議論される話題…"
@@ -2979,8 +3005,15 @@ msgstr "Eメールが送信できません。送信者のEメールアドレスã
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "未読メッセージカウンター"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "購読解除"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr "このテンプレートにファイルを添付できます。(この
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ka.po b/addons/mail/i18n/ka.po
index ec1d787285a..0ab36d8b05c 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-25 12:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (ასლი)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/kab.po b/addons/mail/i18n/kab.po
index 3b5d5504fd0..a2730b67ee0 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (Anɣel )"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s yerna"
@@ -154,9 +161,9 @@ msgstr "%s yernad ɣer uẓeṭṭa %s ."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Iznan Imaṛṛa"
#. 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 "Anaɛruḍ ɣer uḍfaṛ %s:%s"
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Tusligt"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Tucḍa n usali "
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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 "s"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "arrat"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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 "akalas"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
index 6cd237e2f96..24555f6a77b 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (사본)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s을(를) 작성함"
@@ -154,9 +161,9 @@ msgstr "%s이(가) %s 네트워크에 참여했습니다."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr "임원 회의"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr "이 하위유형으로 게시된 메시지에 추가되는 설명입니ë
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "잘못된 표현. 문자 그대로 파이썬 사전에 정의되어야 합니다. 예. \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 "%s을(를) 팔로우할 수 있도록 초대 : %s"
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "중간 크기 사진"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,8 +2361,8 @@ 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"
-msgstr "메일 게이트웨이를 이용해서 문서에 메시지를 게시하는 보안정책.\n- 모두 : 모두다 메시지 게시 가능\n- 파트너 : 인증된 파트너만 가능\n- 팔로워 : 관련 문서의 팔로워만 가능\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2402,12 @@ msgstr "개인 정보 보호"
#. 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:"
@@ -2869,11 +2893,6 @@ msgid ""
msgstr "값은 본 계약의 정보로 표시됩니다. 이메일을 보낼 때\n 해당 값은 이메일 서식에서 가져옵니다."
#. 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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "이 그룹에서 논의할 주제 ..."
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "구독 취소"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "업로드 작업 오류"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "이 서식에 파일을 첨부할 수 있습니다. 이 서식으로 작
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "문서"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 4f10dd48de6..e4add6d0560 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-22 16:11+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s sukurta"
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Galimas masiniams siuntimams"
#. 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Vidutinio dydžio nuotrauka"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Šių grupių nariai automatiškai taps prenumeratoriais. Tačiau jie galės valdyti savo prenumeratą savarankišai."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Slaptumas"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Temos, kurios bus diskutuojamos šioje grupėje..."
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index 2e1e974f283..6f8dc1585d5 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopēt)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Vidēja izmēra bilde"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privātums"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Atrakstīties"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Jums jāpievieno pielikumā šai sagatavei failus, kuri tiks pievienoti
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/mk.po b/addons/mail/i18n/mk.po
index a900052f062..29e5ae42b30 100644
--- a/addons/mail/i18n/mk.po
+++ b/addons/mail/i18n/mk.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (копија)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s креирани"
@@ -154,9 +161,9 @@ msgstr "%s се приклучи на %s мрежата."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 "Анонимен"
@@ -561,16 +568,6 @@ 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"
-msgstr "Состаноци на одборот"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr "Опис што ќе биде додаден во пораката прÐ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Невалиден израз, мора да биде буквална дефиниција од python речникот пример \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 "Покана за следење %s: %s"
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Слика со средна големина"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Приватност"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,6 @@ msgid ""
msgstr "Вредностите прикажани овде се од информативен карактер. Кога праќате е-маил, вредностите\n ќе се земат од урнекот за е-маил."
#. 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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Теми дискутирани во оваа група..."
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Отпиши се"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Грешка при качување"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Можете да додатете фајлови на овој урне
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "документ"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index c2776575cbf..09df927c772 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -8,9 +8,9 @@ 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-11-18 13:53+0000\n"
-"Last-Translator: Otgonbayar Agvaan <gobi.mn@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -117,7 +117,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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:10px 15px 10px 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 |\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=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\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]} -> ${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"
+msgstr ""
#. module: mail
#. openerp-web
@@ -136,13 +136,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (хуулбар)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s үүсгэгдсэн"
@@ -155,10 +162,10 @@ msgstr "%s нь %s сүлжээрүү нэгдлээ."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(сувагт"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -437,7 +444,7 @@ 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 "Зочин"
@@ -562,16 +569,6 @@ 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"
-msgstr "Захиралуудын уулзалтууд"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr "Энэ дэд төрөлийн зурвасыг илгээхэд нэмÑ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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 "Та мэдэх үү ? '@someone' зурвасдаа хэн нэгийг зурвас үүсгэхдээ дурьдсанаар тэр хүний inbox-д таны зурвас харагдана."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Шууд Зурвасууд"
@@ -1460,14 +1457,6 @@ 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 "\"Сувгууд\" хэсэгт, нийтийн болон хязгаарлагдсан сувагууд байна.<br>\n \"Шууд Зурвас\" хэсэгт тухайлсан нэг хүнтэй шууд ярилцах боломжийг олгоно.<br>\n \"Хувийн бүлгэм\" хэсэгт таны хувийн ярилцлагуудыг агуулна. Хувийн сувагт холбогдохдоо нэг бол та өөрөө үүсгэж болно эсвэл өөр хэн нэгний урьсан сувагт холбогдоно.<br>"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Буруу илэрхийлэл, энэ нь үсгэн python dictionary тодорхойлолт байх ёстой тухайлбал \"{'field': 'value'}\""
#. 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 "
@@ -1509,7 +1498,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 "Дагах урилга %s: %s"
@@ -1567,6 +1563,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 "Интерфейс дээр зоосон эсэх"
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr "Мэйлдэхээс Хасах"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Дунд хэмжээт фото"
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,8 +2362,8 @@ 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"
-msgstr "mailgateway ашиглан баримтанд зурвас илгээх бодлого.\n- бүгд: бигд илгээж болно\n- харилцагчид: зөвхөн баталгаажсан харилцагчид\n- дагагчид: баримтын зөвхөн дагагчид\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,24 +2403,12 @@ msgstr "Хувийн нууц"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,6 @@ msgid ""
msgstr "Энд харуулж байгаа утга нь мэдээллийн чанартай. Эмэйл илгээх үед \n үлгэрээс утга нь авагдана."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Харуулах зурвас алга байна.<br>"
-
-#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr "Хэнд: Дараахийн дагагчидад"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Энэ бүлгэмд хөөрөлдөх сэдэвүүд..."
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr "Уншаагүй зурвасын тоолуур"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Захиалга цуцлах"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Хуулалтын алдаа"
@@ -3107,10 +3147,17 @@ msgstr "Группийн үйл ажиллагааг хэн дагаж чадаÑ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Ямар нэг зүйл бичнэ үү"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3120,6 +3167,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Та <b>%s</b>-г хөөрөлдөөнд нэмлээ."
#. 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 ""
@@ -3160,19 +3215,12 @@ msgstr "Энэ имэйл үлгэрээр үүсгэгдэх бүх имэйлÒ
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Та <b>%s</b>-с бүртгэл чинь хасагдлаа."
#. 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 "Таны \"Inbox\"-д таныг дурссан бүх зурвасууд харагдана, мөн дагаж байгаа баримтын зурвасууд харагдана.<br>\n \"Одоор тэмдэглэсэн\" хэсэгт таны эрхэмлэсэн бүх зурвас харагдана."
-
-#. 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 "
@@ -3191,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "баримт"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr "гишүүд"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/nb.po b/addons/mail/i18n/nb.po
index 4dcca7ba293..d440ffa36aa 100644
--- a/addons/mail/i18n/nb.po
+++ b/addons/mail/i18n/nb.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-11-13 21:40+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopi)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privat."
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Avslutt abonnement."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Du kan legge til filer til denne malen, som skal legges til all e-post s
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr "Base.Konfigurasjon.Innstillinger."
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 6172d519e64..e6ddd59dea2 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -11,9 +11,9 @@ 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-11-22 13:58+0000\n"
-"Last-Translator: Erwin van der Ploeg <erwin@bas-solutions.nl>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 09:13+0000\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.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"
@@ -32,10 +32,10 @@ msgid ""
" <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"
@@ -57,7 +57,7 @@ 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"
@@ -120,7 +120,7 @@ msgid ""
" </table>\n"
"</div>\n"
"% endif"
-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 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 <tbody><tr>\n <td valign=\"center\" width=\"270\" style=\"padding:10px 10px 10px 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:10px 15px 10px 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 |\n % endif\n % endfor\n % else:\n <strong>Verzonden 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>gebruikt</strong>\n <a href=\"www.odoo.com\" style=\"text-decoration:none; color: #a24689;\"><strong>Odoo</strong></a>\n % endif\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]} -> ${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"
+msgstr ""
#. module: mail
#. openerp-web
@@ -139,13 +139,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr "%d Berichten"
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s aangemaakt"
@@ -158,10 +165,10 @@ msgstr "%s heeft zich aangesloten bij het %s netwerk."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(in kanaal"
+msgid "(from"
+msgstr "(van"
#. module: mail
#. openerp-web
@@ -440,7 +447,7 @@ msgstr "Alle berichten"
#. 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 "Anoniem"
@@ -565,16 +572,6 @@ msgid "Available for mass mailing"
msgstr "Beschikbaar voor bulk-mailing"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Beste verkoop technieken"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Bestuursvergaderingen"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -795,6 +792,13 @@ msgid "Composition mode"
msgstr "Bewerkmodus"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:24
+#, python-format
+msgid "Congratulations, your inbox is empty"
+msgstr "Proficiat, uw inbox is leeg"
+
+#. module: mail
#: model:ir.actions.act_window,name:mail.action_contacts
#: model:ir.ui.menu,name:mail.menu_contacts
msgid "Contacts"
@@ -961,21 +965,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Detach"
msgstr "Ontkoppel"
#. 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 "Wist u dit? Type '@iemand' in de composer om iemand te citeren in uw bericht en laat het voorkomen in uw inbox."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Directe berichten"
@@ -1463,14 +1460,6 @@ msgid "Important messages"
msgstr "Belangrijke berichten"
#. 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 "In de \"Kanalen\" sectie vind u de publieke en beperkte kanalen.<br>\nDe *Directe berichten\" sectie staat u toe om direct tegen eender wie te spreken.<br>\nDe \"Privégroep\" sectie bevat privé conversaties. U kan lid worden van een privékanaal door het kanaal zelf aan te maken of door uitgenodigd te worden door iemand anders.<br>"
-
-#. module: mail
#: code:addons/mail/models/mail_alias.py:141
#, python-format
msgid "Inactive Alias"
@@ -1504,7 +1493,7 @@ msgid ""
msgstr "Ongeldige expressie, het moet een letterlijke python dictionary definition zijn, bijvoorbeeld: \"{'field': 'value'}\""
#. 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 "
@@ -1512,7 +1501,14 @@ msgid ""
msgstr "Foutieve record set: moet als model aangesproken worden (zonder records) of op één recordset"
#. 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 "Uitnodiging"
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:53
#, python-format
msgid "Invitation to follow %s: %s"
msgstr "Uitnodiging om te volgen %s: %s"
@@ -1570,6 +1566,11 @@ msgid "Is Notification"
msgstr "Is melding"
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member
+msgid "Is a member"
+msgstr "Is een lid"
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned
msgid "Is pinned on the interface"
msgstr "Is gespeld op de interface"
@@ -1742,6 +1743,13 @@ msgid "Mailing Opt-Out"
msgstr "Mailing opt-out"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr "Markeer alles als gelezen"
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto van gemiddelde grootte"
@@ -1767,13 +1775,6 @@ msgid ""
msgstr "Leden van die groepen worden automatisch toegevoegd als volger. Zij kunnen zelfstandig hun lidmaatschap beheren als dat nodig is."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Vermelding(en):"
-
-#. 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
@@ -1984,14 +1985,28 @@ msgstr "Nieuwe waarde tekst"
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nieuw bericht"
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:140
+#, python-format
+msgid "New messages"
+msgstr "Nieuwe berichten"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:25
+#, python-format
+msgid "New messages appear here."
+msgstr "Nieuwe berichten verschijnen hier."
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:81
#, python-format
msgid "New people"
@@ -1999,12 +2014,33 @@ msgstr "Nieuwe persoon"
#. 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 "Geen volger"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:16
+#, python-format
+msgid "No matches found"
+msgstr "Geen overeenkomsten gevonden"
+
+#. 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 "Geen berichten komen overeen met uw zoekopdracht. Probeer uw zoekfilters te wijzigen."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:28
+#, python-format
+msgid "No starred message"
+msgstr "Geen berichten met ster."
+
+#. 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
@@ -2329,8 +2365,8 @@ 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"
-msgstr "Beleid om een bericht te versturen bij een document door gebruik te maken van de mail gateway.\n-iedereen: iedereen mag versturen\n-relaties: alleen geautoriseerde relaties\n-volgers: allen volgers van een bijbehorend document\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr "Beleid om een bericht te versturen bij een document door gebruik te maken van de mail gateway.\n-iedereen: iedereen mag versturen\n-relaties: alleen geautoriseerde relaties\n-volgers: allen volgers van een bijbehorend document of volgers van gevolgde kanalen\n"
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2370,24 +2406,12 @@ msgstr "Privacy"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Privé-kanaal"
-
-#. 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 "Privé kanalen"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2873,11 +2897,6 @@ msgid ""
msgstr "De waardes hieronder weergegeven zijn informatief. Bij het versturen van een e-mail, worden deze waardes\n overgenomen van het e-mailsjabloon."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Er zijn geen berichten om te tonen.<br>"
-
-#. 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 "
@@ -2924,6 +2943,13 @@ msgid "To: Followers of"
msgstr "Aan: volgers van"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr "Vandaag"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Onderwerpen welke worden besproken in deze groep..."
@@ -2982,8 +3008,15 @@ msgstr "Niet mogelijk om e-mail te versturen. Stel het e-mail adres of alias van
#. 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 "Ongedaan maken"
+
+#. 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"
@@ -3013,28 +3046,35 @@ msgstr "Teller ongelezen berichten"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr "Alle sterren verwijderen"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Uitschrijven"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Uitgeschreven"
#. 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 "Uploaden"
#. 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 "Fout bij uploaden"
@@ -3110,10 +3150,17 @@ msgstr "Wie kan de groepsactiviteiten volgen?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Schrijf iets"
+msgid "Write something..."
+msgstr "Schrijf iets..."
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr "Gisteren"
#. module: mail
#. openerp-web
@@ -3123,6 +3170,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "U heeft <b>%s</b> toegevoegd aan de conversatie."
#. 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 ""
@@ -3163,19 +3218,12 @@ msgstr "U kunt bestanden toevoegen aan dit sjabloon. Deze worden vervolgens toeg
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "U heeft zich uitgeschreven van <b>%s</b>."
#. 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 "Uw \"inbox\" bevat alle berichten waarin u bent vermeld en alle berichten die u heeft ontvangen als een volger van een document.<br>\nDe \"Met ster\" sectie bevat al uw favorieten berichten."
-
-#. 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 "
@@ -3194,19 +3242,24 @@ msgid "base.config.settings"
msgstr "base.config.settings"
#. module: mail
+#: model:mail.channel,name:mail.channel_2
+msgid "board-meetings"
+msgstr "Bestuursvergaderingen"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_form
msgid "by"
msgstr "door"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "document"
@@ -3239,13 +3292,20 @@ msgid "members"
msgstr "leden"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mijnbedrijf.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3271,11 +3331,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. module: mail
+#: model:mail.channel,name:mail.channel_3
+msgid "rd"
+msgstr "rd"
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "record:"
msgstr "regel:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr "verkoop"
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/nl_BE.po b/addons/mail/i18n/nl_BE.po
index 9285ea12b87..2b3c5e5ddc2 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopie)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Beschikbaar voor mass mailing"
#. 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "Teller ongelezen berichten"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 5bc29d8a382..6b88addc45c 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -8,8 +8,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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s utworzono"
@@ -155,9 +162,9 @@ msgstr "%s dołączył do sieci %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ msgstr "Wszystkie wiadomości"
#. 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 "Anonimowo"
@@ -562,16 +569,6 @@ msgid "Available for mass mailing"
msgstr "Dostępne dla poczty masowej"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Najlepsze praktyki sprzedaży"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Spotkania"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,13 @@ msgid "Composition mode"
msgstr "Tryb pisania"
#. 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"
@@ -958,21 +962,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,7 @@ msgid ""
msgstr "Niedozwolone wyrażenie, to musi być python dictionary np. \"{'field': 'value'}\""
#. 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 "
@@ -1509,7 +1498,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 "Zaproszenie do obserwacji %s: %s"
@@ -1567,6 +1563,11 @@ msgid "Is Notification"
msgstr "Jest powiadomieniem"
#. 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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Zdjęcie średniej wielkości"
@@ -1764,13 +1772,6 @@ msgid ""
msgstr "Członkowie tych grup będą automatycznie dodani jako obserwatorzy. Zwróć uwagę, że oni sami mogą zmieniać swoje ustawienia do subskrypcji."
#. 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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Prywatność"
#. 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 "B + R"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2870,11 +2894,6 @@ msgid ""
msgstr "Wyświetlone wartości mają charakter przykładowy. Przy wysyłaniu wiadomości, wartości\n zostaną wzięte z szablonu e-mail."
#. 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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Temat dyskutowany w grupach..."
@@ -2979,8 +3005,15 @@ msgstr "Nie można wysłać maila. Skonfiguruj adres nadawcy lub alias."
#. 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"
@@ -3010,28 +3043,35 @@ msgstr "Licznik nieprzeczytanych wiadomości"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Zrezygnuj z subskrypcji"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Błąd uploadu"
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr "Możesz załączać pliki do tego szablonu, które mają być dodane do
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ 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 "przez"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokument"
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ 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 "rekord:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index ead15807b70..a3fe48fb9e9 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -9,9 +9,9 @@ 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-11-25 19:39+0000\n"
-"Last-Translator: Ricardo Correia <rcorreiavv@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-12 13:18+0000\n"
+"Last-Translator: Martin Trigaux\n"
"Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,10 +30,10 @@ msgid ""
" <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"
@@ -55,7 +55,7 @@ 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"
@@ -137,13 +137,20 @@ msgid ""
msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (cópia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s criado"
@@ -156,10 +163,10 @@ msgstr "%s conectou-se à rede de %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(no canal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -438,7 +445,7 @@ msgstr "Todas as Mensagens"
#. 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 "Anónimo"
@@ -563,16 +570,6 @@ msgid "Available for mass mailing"
msgstr "Disponível para Emails em Massa"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Melhores Práticas de Vendas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Reuniões"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -793,6 +790,13 @@ msgid "Composition mode"
msgstr "Modo de composição"
#. 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"
@@ -959,21 +963,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, python-format
msgid "Detach"
msgstr "Desanexar"
#. 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 "Sabia que? Escreva '@CCCCC' na composição para citar CCCCC na sua mensagem e ela aparecerá na sua própria caixa de entrada."
-
-#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Mensagens diretas"
@@ -1461,14 +1458,6 @@ msgid "Important messages"
msgstr "Mensagens Importantes"
#. 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"
@@ -1502,7 +1491,7 @@ msgid ""
msgstr "Expressão inválida, deve ser uma definição literal de dicionário estilo python como \"{'field': 'value'}\""
#. 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 "
@@ -1510,7 +1499,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 "Convite para seguir %s: %s"
@@ -1568,6 +1564,11 @@ msgid "Is Notification"
msgstr "É notificação"
#. 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 "está ligado à interface"
@@ -1740,6 +1741,13 @@ msgid "Mailing Opt-Out"
msgstr "Excluir Emails"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto de tamanho médio"
@@ -1765,13 +1773,6 @@ msgid ""
msgstr "Membros destes grupos serão adicionados automaticamente como seguidores. Observe que eles poderão gerenciar sua inscrição manualmente se necessário."
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:51
-#, python-format
-msgid "Mention(s):"
-msgstr "Menção(s):"
-
-#. 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
@@ -1982,14 +1983,28 @@ msgstr "Novo Valor de Texto: "
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nova Mensagem"
#. 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"
@@ -1997,12 +2012,33 @@ msgstr "Novas pessoas"
#. 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 "Sem seguidor"
#. 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
@@ -2327,8 +2363,8 @@ 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"
-msgstr "Política para enviar uma mensagem sobre o documento usando o MailGateway .\n- Todos : todos podem postar\n- Parceiros: parceiros apenas autenticados\n- Seguidores: apenas os seguidores do documento relacionado\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2368,24 +2404,12 @@ msgstr "Privacidade"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/chat_manager.js:478
-#, python-format
-msgid "Private Channel"
-msgstr "Canal privado"
-
-#. 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 "Canais privados"
#. module: mail
-#: model:mail.channel,name:mail.channel_3
-msgid "R&D"
-msgstr "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2871,11 +2895,6 @@ msgid ""
msgstr "Os valores exibidos abaixo são de caráter informativo. Ao enviar o e-mail, os valores \n                                 serão tomadas a partir do modelo de e-mail."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Não existem mensagem a mostrar.<br>"
-
-#. 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 "
@@ -2922,6 +2941,13 @@ msgid "To: Followers of"
msgstr "Para: Seguidores de"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Tópicos discutidos neste grupo..."
@@ -2980,8 +3006,15 @@ msgstr "Não foi possível enviar o e-mail, por favor configure o endereço de e
#. 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"
@@ -3011,28 +3044,35 @@ msgstr "Contador de Mensagens por Ler"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Cancelar Subscrição"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Subscrição cancelada"
#. 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 "Uploading"
#. 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 "Erro de carregamento"
@@ -3108,10 +3148,17 @@ msgstr "Quem pode seguir as actividades do grupo?"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
-msgstr "Escreva algo"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
@@ -3121,6 +3168,14 @@ msgid "You added <b>%s</b> to the conversation."
msgstr "Adicionou <b>%s</b> à conversa."
#. 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 ""
@@ -3161,19 +3216,12 @@ msgstr "Pode anexar ficheiros a este template, para ser adicionado a todos os e-
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: code:addons/mail/static/src/js/client_action.js:401
#, python-format
msgid "You unsubscribed from <b>%s</b>."
msgstr "Cancelou a subscrição de <b>%s</b>."
#. 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 "A sua Caixa de Entrada contém todas as mensagem em que foi mencionado e todas as mensagens que recebeu como um seguidor de um documento.<br>\nA seção \"Favoritos\" contem todas as suas mensagens favoritas."
-
-#. 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 "
@@ -3192,19 +3240,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr "dm"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3237,13 +3290,20 @@ msgid "members"
msgstr "membros"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3269,11 +3329,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "record:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index 551d99b42d3..fe9cfcfb151 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -3,14 +3,15 @@
# * mail
#
# Translators:
+# Grazziano Duarte <g.negocios@outlook.com.br>, 2015
# Mateus Cerqueira Lopes <mateus1@gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Odoo 9.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-13 15:34+0000\n"
-"Last-Translator: Mateus Cerqueira Lopes <mateus1@gmail.com>\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +30,10 @@ msgid ""
" <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"
@@ -54,7 +55,7 @@ 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"
@@ -133,6 +134,13 @@ msgid ""
"or (object.parent_id and object.parent_id.subject and 'Re: %s' % "
"object.parent_id.subject) or (object.parent_id and "
"object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
+msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
msgstr ""
#. module: mail
@@ -142,7 +150,7 @@ msgid "%s (copy)"
msgstr "%s (copia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s created"
@@ -155,10 +163,10 @@ msgstr "%s conectou-se à rede de %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
-msgstr "(no canal"
+msgid "(from"
+msgstr ""
#. module: mail
#. openerp-web
@@ -172,7 +180,7 @@ msgstr "(Sem endereço de email)"
msgid ""
"* Smiley are only used for HTML code to display an image * Text (default "
"value) is use to substitute text with another text"
-msgstr ""
+msgstr "* Smiley são utilizados apenas para o código HTML para exibir uma imagem * Texto (valor padrão) é usado para substituir o texto por outro texto"
#. module: mail
#. openerp-web
@@ -187,7 +195,7 @@ msgstr "-------- Mostrar mensagens antigas --------"
msgid ""
"<div class=\"o_mail_notification\">created <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">criado <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/models/mail_channel.py:489
@@ -195,7 +203,7 @@ msgstr ""
msgid ""
"<div class=\"o_mail_notification\">joined <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">entrou <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/models/mail_channel.py:151
@@ -203,7 +211,7 @@ msgstr ""
msgid ""
"<div class=\"o_mail_notification\">left <a href=\"#\" "
"class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
-msgstr ""
+msgstr "<div class=\"o_mail_notification\">deixou <a href=\"#\" class=\"o_channel_redirect\" data-oe-id=\"%s\">#%s</a></div>"
#. module: mail
#: code:addons/mail/wizard/invite.py:22
@@ -228,21 +236,21 @@ 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>Envio em massa de e-mail</strong> on\n <span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">os registros selecionados</span>\n <span attrs=\"{'invisible': [('use_active_domain', '=', False)]}\">o filtro de pesquisa atual</span>.\n </span>\n <span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">Seguidores do documento e</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid ""
"<span class=\"o_stat_text\">Add</span>\n"
" <span class=\"o_stat_text\">Context Action</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Adicionar</span>\n<span class=\"o_stat_text\">Ação de Contexto</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_form
msgid ""
"<span class=\"o_stat_text\">Remove</span>\n"
" <span class=\"o_stat_text\">Context Action</span>"
-msgstr ""
+msgstr "<span class=\"o_stat_text\">Remover</span>\n<span class=\"o_stat_text\">Ação de Contexto</span>"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
@@ -263,7 +271,7 @@ msgstr "<strong>Todos os registros que correspondem ao seu filtro de pesquisa at
msgid ""
"<strong>Moreover, if you want to send a lot of emails, we recommend you to use the mass mailing module</strong>. <br/>\n"
" Confirming this wizard will probably take a few minutes blocking your browser."
-msgstr ""
+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
@@ -286,7 +294,7 @@ msgstr "Um dicionário python que será avaliado para gerar valores padrão quan
msgid ""
"A shortcode is a keyboard shortcut. For instance, you type #gm and it will "
"be transformed into \"Good Morning\"."
-msgstr ""
+msgstr "Um código abreviado é um atalho de teclado. Por exemplo, você digita #bd e será transformado em \"Bom Dia\"."
#. module: mail
#: model:ir.model,name:mail.model_res_groups
@@ -437,7 +445,7 @@ msgstr "Todas as mensagens"
#. 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 "Anônimo"
@@ -486,7 +494,7 @@ msgstr "Anexos"
msgid ""
"Attachments are linked to a document through model / res_id and to the "
"messagethrough this field."
-msgstr ""
+msgstr "Anexos estão ligados a um documento através de modelo / res_id e à mensagem através deste campo."
#. module: mail
#: selection:mail.alias,alias_contact:0
@@ -554,7 +562,7 @@ msgstr "Conteúdos HTML limpos automaticamente"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_users_chatter_needaction_auto
msgid "Automatically set needaction as Read"
-msgstr ""
+msgstr "Definir automaticamente necessita de ação como lido"
#. module: mail
#: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search
@@ -562,16 +570,6 @@ msgid "Available for mass mailing"
msgstr "Disponivel para envio los massa"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Melhores Práticas de Vendas"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Reuniões"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -636,7 +634,7 @@ msgstr "Alterar"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field
msgid "Changed Field"
-msgstr ""
+msgstr "Campo Alterado"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id
@@ -653,7 +651,7 @@ msgstr "Tipo de Canal"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids
msgid "Channel message ids"
-msgstr ""
+msgstr "IDs de canal da mensagem"
#. module: mail
#. openerp-web
@@ -675,7 +673,7 @@ msgstr "Canais"
#: model:ir.actions.act_window,name:mail.mail_channel_partner_action
#: model:ir.ui.menu,name:mail.mail_channel_partner_menu
msgid "Channels/Partner"
-msgstr ""
+msgstr "Canais/Parceiro"
#. module: mail
#: model:ir.actions.client,name:mail.mail_channel_action_client_chat
@@ -713,7 +711,7 @@ msgstr "Escolha um exemplo"
#: 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 "Clique aqui para adicionar novo %(document)s ou envie um e-mail para: %(email_link)s"
#. module: mail
#: code:addons/mail/models/mail_thread.py:324
@@ -729,7 +727,7 @@ msgstr "Clique para adicionar um contato no catálogo de endereços."
#. module: mail
#: model:ir.actions.act_window,help:mail.mail_shortcode_action
msgid "Click to define a new chat shortcode."
-msgstr ""
+msgstr "Clique para definir um novo código abreviado de chat."
#. module: mail
#: selection:mail.channel.partner,fold_state:0
@@ -792,6 +790,13 @@ msgid "Composition mode"
msgstr "Modo de composição"
#. 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"
@@ -958,21 +963,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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 ""
+msgstr "Separar"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:31
+#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "Direct Messages"
msgstr "Mensagens Diretas"
@@ -1069,7 +1067,7 @@ msgstr "Configuração de Email"
#: model:ir.model.fields,field_description:mail.field_res_partner_notify_email
#: model:ir.model.fields,field_description:mail.field_res_users_notify_email
msgid "Email Messages and Notifications"
-msgstr ""
+msgstr "Mensagens de E-mail e Notificações"
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_template_preview_form
@@ -1120,7 +1118,7 @@ msgstr "Endereço de e-mail associado internamente a este usuário. Mensagens re
msgid ""
"Email address of the sender. This field is set when no matching partner is "
"found and replaces the author_id field in the chatter."
-msgstr ""
+msgstr "Endereço de e-mail do remetente. Este campo é definido quando nenhum sócio correspondente for encontrado e substitui o campo author_id no chat."
#. module: mail
#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
@@ -1157,7 +1155,7 @@ msgstr "Erro durante a comunicação com o servidor de garantia."
msgid ""
"Error without exception. Probably due do sending an email without computed "
"recipients."
-msgstr ""
+msgstr "Erro sem exceção. Provavelmente devido ao envio de um e-mail sem destinatários."
#. module: mail
#: sql_constraint:mail.followers:0
@@ -1199,7 +1197,7 @@ msgstr "Falhou"
#: code:addons/mail/models/mail_template.py:352
#, python-format
msgid "Failed to render template %r using values %r"
-msgstr ""
+msgstr "Falha ao renderizar modelo %r usando valores %r"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason
@@ -1212,14 +1210,14 @@ msgstr "Motivo da Falha"
msgid ""
"Failure reason. This is usually the exception thrown by the email server, "
"stored to ease the debugging of mailing issues."
-msgstr ""
+msgstr "Motivo da falha. Geralmente a exceção lançada pelo servidor de e-mail, armazenada para facilitar a depuração de problemas."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids
msgid "Favorited By"
-msgstr ""
+msgstr "Adotado como favorito por"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field
@@ -1323,7 +1321,7 @@ msgstr "De"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_form
msgid "Gateway"
-msgstr ""
+msgstr "Gateway"
#. module: mail
#: code:addons/mail/models/res_users.py:48
@@ -1460,14 +1458,6 @@ msgid "Important messages"
msgstr "Mensagens Importantes"
#. 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"
@@ -1490,7 +1480,7 @@ msgstr "Mensagem inicial do tópico."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal
msgid "Internal Only"
-msgstr ""
+msgstr "Apenas Interno"
#. module: mail
#: code:addons/mail/models/mail_alias.py:99
@@ -1501,15 +1491,22 @@ msgid ""
msgstr "Expressão inválida, deve ser uma definição literal de dicionário estilo python como \"{'field': 'value'}\""
#. 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 "
"single-record recordset"
+msgstr "Conjunto de registro inválido: deve ser chamado como modelo (sem registros) ou no conjunto de registros de um único registro"
+
+#. module: mail
+#. 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:52
+#: code:addons/mail/wizard/invite.py:53
#, python-format
msgid "Invitation to follow %s: %s"
msgstr "Convite para seguir %s: %s"
@@ -1527,7 +1524,7 @@ msgstr "Convidar"
#: code:addons/mail/static/src/js/chatter.js:144
#, python-format
msgid "Invite Follower"
-msgstr ""
+msgstr "Convidar Seguidor"
#. module: mail
#. openerp-web
@@ -1541,7 +1538,7 @@ msgstr "Seguir pessoa"
#: code:addons/mail/static/src/js/client_action.js:454
#, python-format
msgid "Invite people to %s"
-msgstr ""
+msgstr "Convidar pessoas para %s"
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -1551,7 +1548,7 @@ msgstr "Assistente de Convite"
#. module: mail
#: selection:mail.channel,public:0
msgid "Invited people only"
-msgstr ""
+msgstr "Somente pessoas convidadas"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_message_is_follower
@@ -1567,6 +1564,11 @@ msgid "Is Notification"
msgstr "É Notificação"
#. 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 "É fixado na interface"
@@ -1618,12 +1620,12 @@ msgstr "Última modificação em"
#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id
msgid "Last Seen"
-msgstr ""
+msgstr "Visto pela ultima vez"
#. module: mail
#: model:ir.model,name:mail.model_mail_channel_partner
msgid "Last Seen Many2many"
-msgstr ""
+msgstr "Visto pela ultima vez Many2many"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_write_uid
@@ -1661,7 +1663,7 @@ msgstr "Última atualização em"
#: 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."
-msgstr ""
+msgstr "Lista de canais que serão adicionados como ouvintes do documento atual.q"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids
@@ -1672,12 +1674,12 @@ msgstr "Lista de pessoas que foram incluídas como seguidores deste documento"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id
msgid "Listener"
-msgstr ""
+msgstr "Ouvinte"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids
msgid "Listeners"
-msgstr ""
+msgstr "Ouvintes"
#. module: mail
#: selection:mail.channel,channel_type:0
@@ -1689,7 +1691,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/chatter.xml:75
#, python-format
msgid "Log a note. Followers will not be notified."
-msgstr ""
+msgstr "Registrar uma nota. Seguidores não serão notificados."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_is_log
@@ -1710,7 +1712,7 @@ msgstr "Registra uma nota interna"
msgid ""
"Log an internal note which will not be sent to followers, but which can be read\n"
" by users accessing this document."
-msgstr ""
+msgstr "Registrar uma nota interna que não será enviada para seguidores, mas que pode ser lida\npor usuários que acessam este documento."
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -1739,6 +1741,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Foto de tamanho médio"
@@ -1764,13 +1773,6 @@ msgid ""
msgstr "Membros destes grupos serão adicionados automaticamente como seguidores. Observe que eles poderão gerenciar sua inscrição manualmente se necessário."
#. 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
@@ -1879,7 +1881,7 @@ msgstr "Histórico de mensagens e comunicação"
msgid ""
"Messages with internal subtypes will be visible only by employees, aka "
"members of base_user group"
-msgstr ""
+msgstr "Mensagens com subtipos internos serão visíveis somente por funcionários, conhecidos como membros do grupo base_user"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_users_form_mail
@@ -1952,22 +1954,22 @@ msgstr "Nunca"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
msgid "New Value Char"
-msgstr ""
+msgstr "Novo Valor Char"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
msgid "New Value Datetime"
-msgstr ""
+msgstr "Novo Valor Datetime"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
msgid "New Value Float"
-msgstr ""
+msgstr "Novo Valor Float"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
msgid "New Value Integer"
-msgstr ""
+msgstr "Novo Valor Integer"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
@@ -1981,27 +1983,62 @@ msgstr "Texto do Novo Valor"
#. 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, python-format
msgid "New message"
msgstr "Nova Mensagem"
#. 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"
-msgstr ""
+msgstr "Novas pessoas"
#. 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 "Sem seguidor"
#. 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
@@ -2018,7 +2055,7 @@ msgstr "Observação"
#: code:addons/mail/static/src/xml/thread.xml:48
#, python-format
msgid "Note by"
-msgstr ""
+msgstr "Nota por"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
@@ -2065,37 +2102,37 @@ msgid ""
"Odoo helps you easily track all activities related to\n"
" a customer; discussions, history of business opportunities,\n"
" documents, etc."
-msgstr ""
+msgstr "Odoo ajuda você a controlar facilmente todas as atividades relacionadas a\num cliente; discussões, histórico de oportunidades de negócio,\ndocumentos, etc."
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
msgid "Old Value Char"
-msgstr ""
+msgstr "Antigo Valor Char"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
msgid "Old Value DateTime"
-msgstr ""
+msgstr "Antigo Valor DateTime"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
msgid "Old Value Float"
-msgstr ""
+msgstr "Antigo Valor Float"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
msgid "Old Value Integer"
-msgstr ""
+msgstr "Antigo Valor Integer"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
msgid "Old Value Monetary"
-msgstr ""
+msgstr "Antigo Valor Monetary"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
msgid "Old Value Text"
-msgstr ""
+msgstr "Antigo Valor Text"
#. module: mail
#. openerp-web
@@ -2124,7 +2161,7 @@ msgstr "Abrir documento principal"
#: code:addons/mail/static/src/xml/client_action.xml:36
#, python-format
msgid "Open chat"
-msgstr ""
+msgstr "Abrir chat"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_partner_opt_out
@@ -2249,7 +2286,7 @@ msgid ""
"Parent subtype, used for automatic subscription. This field is not correctly"
" named. For example on a project, the parent_id of project subtypes refers "
"to task-related subtypes."
-msgstr ""
+msgstr "Subtipo pai, usado para a subscrição automática. Este campo não está corretamente identificado. Por exemplo, em um projeto, o parent_id dos subtipos do projeto refere-se a subtipos relacionados a tarefas."
#. module: mail
#: model:ir.model,name:mail.model_res_partner
@@ -2272,7 +2309,7 @@ msgstr "Parceiros que não pediram para não ser incluído em campanhas de envio
#: 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 ""
+msgstr "Parceiros com a Necessidade de Ação"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete
@@ -2326,8 +2363,8 @@ 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"
-msgstr "Política para enviar uma mensagem sobre o documento usando o MailGateway.\n- todos: todos podem postar\n- parceiros: parceiros única autenticados\n- seguidores: apenas seguidores do documento relacionado\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2367,22 +2404,10 @@ msgstr "Privacidade"
#. 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 "R&D"
+msgstr "Canais Privados"
#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
@@ -2546,7 +2571,7 @@ msgstr "Salvar como novo modelo"
#: code:addons/mail/static/src/js/chat_window.js:23
#, python-format
msgid "Say something"
-msgstr ""
+msgstr "Dizer algo"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
@@ -2638,7 +2663,7 @@ msgstr ""
#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form
#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_tree
msgid "Shortcodes"
-msgstr ""
+msgstr "Códigos Curtos"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_shortcode_source
@@ -2697,7 +2722,7 @@ msgstr "Imagem em tamanho reduzido do grupo. Ela será automaticamente redimensi
#. module: mail
#: selection:mail.shortcode,shortcode_type:0
msgid "Smiley"
-msgstr ""
+msgstr "Smiley"
#. module: mail
#. openerp-web
@@ -2762,7 +2787,7 @@ msgstr "Assunto:"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
msgid "Substitution"
-msgstr ""
+msgstr "Substituição"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id
@@ -2870,11 +2895,6 @@ msgid ""
msgstr "Os valores apresentados a seguir são informativos. Ao enviar o e-mail, os valores\nserá usados a partir do modelo de e-mail."
#. module: mail
-#: model:ir.actions.client,help:mail.mail_channel_action_client_chat
-msgid "There are no messages to display.<br>"
-msgstr "Não há mensagens para mostrar.<br/>"
-
-#. 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 "
@@ -2886,7 +2906,7 @@ msgstr "Este campo armazena a imagem utilizada como foto para o grupo, limitada
msgid ""
"This group is visible by non members. Invisible groups can add members "
"through the invite button."
-msgstr ""
+msgstr "Este grupo é visível por não membros. Grupos invisíveis podem adicionar membros através do botão convidar."
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_mail_search
@@ -2918,6 +2938,13 @@ msgstr "Para (Parceiros)"
#: code:addons/mail/static/src/xml/chatter.xml:30
#, python-format
msgid "To: Followers of"
+msgstr "Para: Seguidores de"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
msgstr ""
#. module: mail
@@ -2932,7 +2959,7 @@ msgstr "Tópicos discutidos neste grupo..."
msgid ""
"Tracked values are stored in a separate model. This field allow to "
"reconstructthe tracking and to generate statistics on the model."
-msgstr ""
+msgstr "Valores rastreados são armazenados em um modelo separado. Este campo permite reconstruir o rastreamento e gerar estatísticas sobre o modelo."
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_form
@@ -2956,7 +2983,7 @@ msgstr ""
#: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids
#: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids
msgid "Tracking values"
-msgstr ""
+msgstr "Valores de Rastreamento"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type
@@ -2979,8 +3006,15 @@ msgstr "Não foi possível enviar o e-mail, por favor configure o endereço de e
#. 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"
@@ -3010,28 +3044,35 @@ msgstr "Contador de Mensagens Não Lidas."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Cancelar a inscrição"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, python-format
msgid "Unsubscribed"
msgstr "Cancelar a inscrição"
#. 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 "Enviando"
#. 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 "Erro no upload"
@@ -3077,7 +3118,7 @@ msgstr "Visualizar"
msgid ""
"Warning! \n"
" If you remove a follower, he won't be notified of any email or discussion on this document. Do you really want to remove this follower ?"
-msgstr ""
+msgstr "Aviso!\nSe você remover um seguidor, ele não será notificado de qualquer e-mail ou discussão sobre este documento. Você realmente deseja remover este seguidor?"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field
@@ -3103,20 +3144,35 @@ msgstr "Se a mensagem é uma nota interna(somente modo comentário)"
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Who can follow the group's activities?"
+msgstr "Quem pode acompanhar as atividades do grupo?"
+
+#. module: mail
+#. 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/composer.xml:6
+#: code:addons/mail/static/src/js/thread.js:122
#, python-format
-msgid "Write something"
-msgstr "Escreva alguma coisa"
+msgid "Yesterday"
+msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/client_action.js:80
#, python-format
msgid "You added <b>%s</b> to the conversation."
+msgstr "Você adicionou <b>%s</b> para a conversa."
+
+#. 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
@@ -3141,14 +3197,14 @@ msgstr "Você não pode excluir estes grupos. Eles são necessários à outros m
msgid ""
"You could also add a new %(document)s by sending an email to: "
"%(email_link)s."
-msgstr ""
+msgstr "Você pode adicionar um novo %(document)s enviando um e-mail para: %(email_link)s."
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/chat_manager.js:478
#, python-format
msgid "You have been invited to: "
-msgstr ""
+msgstr "Você foi convidado para:"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids
@@ -3160,30 +3216,23 @@ msgstr "Você pode anexar arquivos a este modelo, para ser adicionado a todos os
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 ""
+msgstr "Você foi descadastrado de <b>%s</b>."
#. 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 "
"update your template."
-msgstr ""
+msgstr "Seu modelo não definiu o endereço de e-mail do remetente. Por favor, atualize seu modelo."
#. module: mail
#: code:addons/mail/models/ir_actions.py:32
#, python-format
msgid "Your template should define email_from"
-msgstr ""
+msgstr "Seu modelo deve definir email_from"
#. module: mail
#: model:ir.model,name:mail.model_base_config_settings
@@ -3191,19 +3240,24 @@ 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 "por"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "documento"
@@ -3218,7 +3272,7 @@ msgstr "seguidores"
#. module: mail
#: model:mail.channel,name:mail.channel_all_employees
msgid "general"
-msgstr ""
+msgstr "geral"
#. module: mail
#: model:ir.model,name:mail.model_ir_actions_server
@@ -3236,13 +3290,20 @@ msgid "members"
msgstr "membros"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "minhaempresa.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3329,21 @@ msgid "publisher_warranty.contract"
msgstr "Contrato de Serviço"
#. 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 "registro:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index c7ab3eab8ab..9f5ea7ffc94 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-06 08:18+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, 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:234
#, python-format
msgid "%s created"
msgstr "%s creat(ă)"
@@ -154,9 +161,9 @@ msgstr "%s s-a alăturat rețelei %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Toate mesajele"
#. 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 "Anonim"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Disponibil pentru corespondență în masă"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Cele mai Bune Practici de Vânzări"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Sedințele consiliului"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Modul de compunere"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Expresie nevalidă, trebuie să fie o definiție literală din dicționarul python, de exemplu \"{'camp': 'valoare'}\""
#. 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 "
@@ -1508,7 +1497,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 "Invitație de a urmări %s: %s"
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Este o înștiințare"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Fotografie de dimensiune medie"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Membrii acelor grupuri vor fi adaugați automat ca persoane interesate. Observați că ei vor putea să își gestioneze manual abonamentul dacă este nevoie."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Confidentialitate"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Subiecte discutate în acest grup..."
@@ -2978,8 +3004,15 @@ msgstr "Email-ul nu a putut fi trimis, configurați adresa de email a expeditoru
#. 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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Dezabonare"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Eroare încărcare"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Puteti atasa fisiere la acest sablon, pentru a fi anexate tuturor e-mail
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr "base.config.settings (setari.config.de_baza)"
#. 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 "de câtre"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "document"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract (contract. garantie_editor)"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 33e62e70e8f..47e07142b18 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -10,8 +10,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-11-13 19:44+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -31,10 +31,10 @@ msgid ""
" <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"
@@ -56,7 +56,7 @@ 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"
@@ -138,13 +138,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (копия)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s создан"
@@ -157,9 +164,9 @@ msgstr "%s присоединился к сети %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -439,7 +446,7 @@ 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 "Анонимно"
@@ -564,16 +571,6 @@ 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"
-msgstr "Совещания"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -794,6 +791,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"
@@ -960,21 +964,14 @@ msgstr "Описание, которое будет добавлено в соо
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1462,14 +1459,6 @@ 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"
@@ -1503,7 +1492,7 @@ msgid ""
msgstr "Неправильное выражение, здесь должен быть объявление словаря python например \"{'field': 'value'}\""
#. 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 "
@@ -1511,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 ""
@@ -1569,6 +1565,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 ""
@@ -1741,6 +1742,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Фото среднего размера"
@@ -1766,13 +1774,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
@@ -1983,14 +1984,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1998,12 +2013,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
@@ -2328,7 +2364,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
@@ -2369,24 +2405,12 @@ msgstr "Конфиденциальность"
#. 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:"
@@ -2872,11 +2896,6 @@ msgid ""
msgstr "Значения, показанные здесь, информативные. При отправке письма на электронную почту, значения\n будут взяты из шаблона электронной почты."
#. 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 "
@@ -2923,6 +2942,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Темы, обсуждаемые в этой группе"
@@ -2981,8 +3007,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"
@@ -3012,28 +3045,35 @@ msgstr "Счетчик непрочтённых сообщений"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Отписаться"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Ошибка выгрузки"
@@ -3109,9 +3149,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3122,6 +3169,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 ""
@@ -3162,19 +3217,12 @@ msgstr "Вы можете прикрепить файлы к этому шабл
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3193,19 +3241,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3238,13 +3291,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3270,11 +3330,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/sk.po b/addons/mail/i18n/sk.po
index a318ebad8ff..a0338fb5a44 100644
--- a/addons/mail/i18n/sk.po
+++ b/addons/mail/i18n/sk.po
@@ -11,8 +11,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-12-01 10:12+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 21:14+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"
@@ -32,10 +32,10 @@ msgid ""
" <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"
@@ -57,7 +57,7 @@ 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"
@@ -139,13 +139,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kópia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s vytvorené"
@@ -158,9 +165,9 @@ msgstr "%s sa pridal do %s siete."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -440,7 +447,7 @@ msgstr "Všetky správy"
#. 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 ""
@@ -565,16 +572,6 @@ msgid "Available for mass mailing"
msgstr "Dostupné pre emailovú kampaň"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Prax najlepšieho predaja"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Zasadnutie správnej rady"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -795,6 +792,13 @@ msgid "Composition mode"
msgstr "Režim vytvárania"
#. 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"
@@ -961,21 +965,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1455,7 +1452,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Important Messages"
-msgstr ""
+msgstr "Dôležité správy"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_search
@@ -1463,14 +1460,6 @@ 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"
@@ -1504,7 +1493,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 "
@@ -1512,7 +1501,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 ""
@@ -1570,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 ""
@@ -1742,9 +1743,16 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
-msgstr ""
+msgstr "Stredne veľká fotografia"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_image_medium
@@ -1767,13 +1775,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
@@ -1984,14 +1985,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1999,12 +2014,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
@@ -2287,7 +2323,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image
msgid "Photo"
-msgstr ""
+msgstr "Fotografia"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue
@@ -2329,7 +2365,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
@@ -2370,24 +2406,12 @@ msgstr "Súkromný"
#. 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:"
@@ -2687,7 +2711,7 @@ msgstr "Malý obrázok tohto kontaktu. Veľkosť je automaticky zmenená na 64x6
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_small
msgid "Small-sized photo"
-msgstr ""
+msgstr "Malá fotografia"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel_image_small
@@ -2858,7 +2882,7 @@ msgid ""
"The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
"\n"
"(Document type: %s, Operation: %s)"
-msgstr ""
+msgstr "Vyžiadaná operácia nemôže byť dokončená kôli bezpečnostným opatreniam. Prosím konaktujte vášho systémového administrátora.\n\n(Typ dokumentu: %s, operácia: %s)"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_shortcode_source
@@ -2873,11 +2897,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 "
@@ -2924,6 +2943,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2982,8 +3008,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"
@@ -3013,28 +3046,35 @@ msgstr "Počítadlo neprečítaných správ"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3088,7 +3128,7 @@ msgstr ""
msgid ""
"When a relationship field is selected as first field, this field lets you "
"select the target field within the destination document model (sub-model)."
-msgstr ""
+msgstr "Keď je pole vzťah vybrané ako prvé pole, toto pole umožňuje vybrať cieľove pole vnútri modelu cieľového dokumentu (podmodel)."
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview_sub_object
@@ -3096,7 +3136,7 @@ msgstr ""
msgid ""
"When a relationship field is selected as first field, this field shows the "
"document model the relationship goes to."
-msgstr ""
+msgstr "Keď je vzťahové pole vybrané ako prvé pole, toto pole zobrazuje model dokumentu ku ktorému sa vzťahuje."
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message_is_log
@@ -3110,9 +3150,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3123,6 +3170,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 ""
@@ -3163,19 +3218,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3194,19 +3242,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3231,7 +3284,7 @@ msgstr "ir.actions.server"
#. module: mail
#: model:ir.model,name:mail.model_ir_autovacuum
msgid "ir.autovacuum"
-msgstr ""
+msgstr "ir.autovacuum"
#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
@@ -3239,13 +3292,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3271,11 +3331,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
@@ -3288,4 +3358,4 @@ msgstr ""
#: code:addons/mail/static/src/xml/client_action.xml:35
#, python-format
msgid "true"
-msgstr ""
+msgstr "pravda"
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index 29805321577..17d57ac3331 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s kreirano"
@@ -154,9 +161,9 @@ msgstr "%s se je pridružil omrežju %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Vsa sporočila"
#. 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 "Anonimen"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Masovno pošiljanje elektronske pošte na voljo"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Dobre prakse prodaje"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Sestanki vodstva"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Način za sestavo"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Napačen izraz, mora biti skladen z definicijo python slovarja, npr. \"{'field':'value'}\""
#. 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 "
@@ -1508,7 +1497,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 "Vabilo na spremljanje %s: %s"
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Je obvestilo"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Srednje velika slika"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Člani te skupine bodo avtomatično dodani kot sledilci. Lahko bodo upravljali svojo prijavo tudi ročno, če bo treba."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,8 +2361,8 @@ 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"
-msgstr "Pravila vpisa sporočil na dokument preko mailgateway.\n- vsi: vsi lahko vpisujejo\n- partnerji: le overjeni partnerji\n- sledilci: le sledilci povezanega dokumenta\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2402,12 @@ msgstr "Zasebnost"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,6 @@ msgid ""
msgstr "Tu prikazane vrednosti so informativne. Pri pošiljanju e-pošte se privzamejo\n vrednosti iz e-poštne predloge."
#. 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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Teme razprav v tej skupini..."
@@ -2978,8 +3004,15 @@ msgstr "E-pošte ni bilo mogoče poslati. Nastavite e-pošto pošiljatelja ali v
#. 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"
@@ -3009,28 +3042,35 @@ msgstr "Števec neprebranih sporočil"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Odjavi se"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Napaka pri nalaganju"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "K predlogi lahko pripnete datoteke, da bodo dodane elektronskemu sporoč
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "po"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "dokument"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "druzba.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "zapis:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/sr.po b/addons/mail/i18n/sr.po
index 45cb5f2113c..b5a79c916ce 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopija)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privatnost"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index fe1c1c2eaa6..08e817bf44e 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-11 08:22+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopiranje)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Privatnost"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr "Brojač nepročitanih poruka"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 2c99417117f..77e25ec2637 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.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-11-23 23:02+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopia)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s skapad"
@@ -154,9 +161,9 @@ msgstr "%s har gått med i %s nätverket."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 "Anonym"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Tillgänglig för mass-e-post"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "Marknadsföringspraxis"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Styrelsemöten"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Författarmod"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Felaktigt uttryck, det måste vara en python dict-definition eg {'fält':'värde'}"
#. 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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Är en avisering"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Medelstort foto"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "Medlemmarna i dessa grupper kommer automatiskt att läggas till som följare. Observera att de kommer att kunna hantera sin prenumeration för hand om det behövs."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "Integritet"
#. 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 "FoU"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Ämnen under diskussion i denna grupp..."
@@ -2978,8 +3004,15 @@ msgstr "Kunde inte skicka e-post, vänligen konfigurera avsändarens e-postadres
#. 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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Avsluta prenumeration"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Uppladdningsfel"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Du kan bilägga filer till denna mall, dessa läggs då till all e-post
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "av"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/th.po b/addons/mail/i18n/th.po
index 44dc3d597f0..7c122df3f44 100644
--- a/addons/mail/i18n/th.po
+++ b/addons/mail/i18n/th.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (สำเนา)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s สร้างแล้ว"
@@ -154,9 +161,9 @@ msgstr "%s ได้เข้าร่วมเครือค่าย %s"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 "ผู้ใช้นิรนาม"
@@ -561,16 +568,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "ภาพขนาดกลาง"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "ความเป็นส่วนตัว"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "เอกสาร"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index f7893358af9..e7d6c4f3793 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.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-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (kopya)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s oluşturuldu"
@@ -154,9 +161,9 @@ msgstr "%s katılıdı %s ağa"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ msgstr "Tüm İletiler"
#. 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 "İsimsiz"
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Toplu posta için kullanılabilir"
#. module: mail
-#: model:mail.channel,name:mail.channel_1
-msgid "Best Sales Practices"
-msgstr "En İyi Satış Uygulamaları"
-
-#. module: mail
-#: model:mail.channel,name:mail.channel_2
-msgid "Board meetings"
-msgstr "Yönetim Kurulu Toplantıları"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,13 @@ msgid "Composition mode"
msgstr "Kompozisyon modu"
#. 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"
@@ -957,21 +961,14 @@ 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:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,7 @@ msgid ""
msgstr "Geçersiz ifade, bu tam bir python sözlük tanımı gibi olmalı \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1497,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 "Şunu takip etmek için davet : %s: %s"
@@ -1566,6 +1562,11 @@ msgid "Is Notification"
msgstr "Bildirim mi"
#. 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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Orta boy fotoğraf"
@@ -1763,13 +1771,6 @@ msgid ""
msgstr "O grubun üyeleri otomatik olarak izleyenler olarak eklenecektir. Gerek duydulduğunda aboneliklerini elle değiştirebileceklerini unutmayın."
#. 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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,8 +2361,8 @@ 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"
-msgstr "Mail gateway'i kullanarak gönderilecek mesajların kurallarını belirleyin:\n Herkes : Herkes eposta alır.\n İş Ortakları : Sadece yetkili iş ortakları. \nTakipçiler : Sadece ilgili doküman veya konunun takipçileri\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2402,12 @@ msgstr "Özel"
#. 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 "R&D"
-
-#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:176
#, python-format
msgid "Re:"
@@ -2869,11 +2893,6 @@ msgid ""
msgstr "Burada gösterilen değerler bilgi amaçlıdır. Eposta gönderirken, değerle\n eposta şablonundan alınacaktır."
#. 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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "Bu grupta tartışılan başlıklar..."
@@ -2978,8 +3004,15 @@ msgstr "Eposta gönderilemiyor, lütfen alıcının eposta adresini ya da rumuzu
#. 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"
@@ -3009,28 +3042,35 @@ msgstr "Okunmamış Mesaj Sayacı"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Üyelikten Çık"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Yükleme hatası"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "Bu şablona dosya eleyebilirsiniz, bu şablonda oluşturulan tüm eposta
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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 "tarafından"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "belge"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.Odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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 "kayıt:"
#. module: mail
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/uk.po b/addons/mail/i18n/uk.po
index 60c6ed38b1a..3f57e738e0b 100644
--- a/addons/mail/i18n/uk.po
+++ b/addons/mail/i18n/uk.po
@@ -8,8 +8,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-12-02 14:50+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -29,10 +29,10 @@ msgid ""
" <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"
@@ -54,7 +54,7 @@ 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"
@@ -136,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (копія)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -155,9 +162,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -437,7 +444,7 @@ 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 ""
@@ -562,16 +569,6 @@ 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -792,6 +789,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"
@@ -958,21 +962,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1460,14 +1457,6 @@ 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"
@@ -1501,7 +1490,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 "
@@ -1509,7 +1498,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 ""
@@ -1567,6 +1563,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 ""
@@ -1739,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr ""
@@ -1764,13 +1772,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
@@ -1981,14 +1982,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1996,12 +2011,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
@@ -2326,7 +2362,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
@@ -2367,24 +2403,12 @@ msgstr "Приватність"
#. 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:"
@@ -2870,11 +2894,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 "
@@ -2921,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2979,8 +3005,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"
@@ -3010,28 +3043,35 @@ msgstr "Кількість непрочитаних повідомлень"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "Відписатися"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 ""
@@ -3107,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3120,6 +3167,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 ""
@@ -3160,19 +3215,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3191,19 +3239,24 @@ msgid "base.config.settings"
msgstr ""
#. 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3236,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3268,11 +3328,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po
index 5f8c90c6a59..65ff206b338 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-11-05 08:48+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (bản sao)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s đã được tạo"
@@ -154,9 +161,9 @@ msgstr "%s đã tham gia %s."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ msgid "Available for mass mailing"
msgstr "Có khả năng gửi thư hàng loạt"
#. 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"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "Ảnh cỡ trung"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr ""
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,15 @@ msgstr "Không thể gửi email, vui lòng cấu hình địa chỉ email ngưá
#. 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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "Lỗi tải lên"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "tài liệu"
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index b8ef14548ea..69a50b7d827 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -3,12 +3,13 @@
# * mail
#
# Translators:
+# mrshelly <mrshelly@hotmail.com>, 2015
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-12-02 07:35+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +29,10 @@ msgid ""
" <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"
@@ -53,7 +54,7 @@ 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"
@@ -135,13 +136,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (副本)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr "%s 创建"
@@ -154,9 +162,9 @@ msgstr "%s 加入到 %s 网络."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -269,7 +277,7 @@ msgstr ""
#: code:addons/mail/static/src/xml/client_action.xml:13
#, python-format
msgid "@ Inbox"
-msgstr ""
+msgstr "@收件箱"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults
@@ -436,7 +444,7 @@ 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 "匿名"
@@ -561,16 +569,6 @@ 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"
-msgstr "董事会议"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -718,7 +716,7 @@ msgstr ""
#: code:addons/mail/models/mail_thread.py:324
#, python-format
msgid "Click here to add new %s"
-msgstr ""
+msgstr "点击创建 %s"
#. module: mail
#: model:ir.actions.act_window,help:mail.action_contacts
@@ -791,6 +789,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"
@@ -824,12 +829,12 @@ msgstr ""
#: code:addons/mail/static/src/js/client_action.js:217
#, python-format
msgid "Create %s"
-msgstr ""
+msgstr "创建 %s"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_create_date
msgid "Create Date"
-msgstr ""
+msgstr "创建时间"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_create_uid
@@ -957,21 +962,14 @@ msgstr "将为该子模型的消息添加注解。如为空,则添加名称。
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1322,7 +1320,7 @@ msgstr "从"
#. module: mail
#: model:ir.ui.view,arch_db:mail.view_message_form
msgid "Gateway"
-msgstr ""
+msgstr "网关"
#. module: mail
#: code:addons/mail/models/res_users.py:48
@@ -1459,14 +1457,6 @@ 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"
@@ -1500,7 +1490,7 @@ msgid ""
msgstr "错误的表达式,必须是 python 字典定义,例如: \"{'field': 'value'}\""
#. 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 "
@@ -1508,7 +1498,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 "邀请关注 %s: %s"
@@ -1566,6 +1563,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 ""
@@ -1738,6 +1740,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "中等尺寸照片"
@@ -1763,13 +1772,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
@@ -1780,7 +1782,7 @@ msgstr "消息"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id
msgid "Message ID"
-msgstr ""
+msgstr "邮件消息ID"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message_record_name
@@ -1951,22 +1953,22 @@ msgstr "不接收"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char
msgid "New Value Char"
-msgstr ""
+msgstr "字符值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime
msgid "New Value Datetime"
-msgstr ""
+msgstr "时间值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float
msgid "New Value Float"
-msgstr ""
+msgstr "数值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer
msgid "New Value Integer"
-msgstr ""
+msgstr "整数值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary
@@ -1976,18 +1978,32 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text
msgid "New Value Text"
-msgstr ""
+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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2011,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
@@ -2069,22 +2106,22 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char
msgid "Old Value Char"
-msgstr ""
+msgstr "旧字符值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime
msgid "Old Value DateTime"
-msgstr ""
+msgstr "旧时间值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float
msgid "Old Value Float"
-msgstr ""
+msgstr "旧数值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer
msgid "Old Value Integer"
-msgstr ""
+msgstr "旧整数值"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary
@@ -2094,7 +2131,7 @@ msgstr ""
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text
msgid "Old Value Text"
-msgstr ""
+msgstr "旧文本值"
#. module: mail
#. openerp-web
@@ -2325,8 +2362,8 @@ 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"
-msgstr "文档信息发送使用邮件服务器规则。\n- 所有人:所有人都允许\n- 业务伙伴:仅认证的业务伙伴\n- 关注者:仅关注相关文档者\n"
+"- followers: only followers of the related document or members of following channels\n"
+msgstr ""
#. module: mail
#: model:ir.model.fields,help:mail.field_res_partner_notify_email
@@ -2366,24 +2403,12 @@ msgstr "隐私"
#. 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:"
@@ -2756,7 +2781,7 @@ msgstr "主题..."
#: code:addons/mail/static/src/xml/thread.xml:68
#, python-format
msgid "Subject:"
-msgstr ""
+msgstr "主题:"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution
@@ -2869,11 +2894,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 "
@@ -2920,6 +2940,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "在该群组中的主题讨论 ..."
@@ -2978,8 +3005,15 @@ msgstr "不能发送email,请配置发件人的email地址或者别名。"
#. 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"
@@ -3009,28 +3043,35 @@ msgstr "未读消息计数器"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr "退订"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "上传错误"
@@ -3106,9 +3147,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
+#, python-format
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
#, python-format
-msgid "Write something"
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3167,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 ""
@@ -3159,19 +3215,12 @@ msgstr "你可以对这个模版附加文件,可以附加到所有基于此模
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3239,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr "文档"
@@ -3235,13 +3289,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3328,21 @@ msgid "publisher_warranty.contract"
msgstr "publisher_warranty.contract"
#. 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format
diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po
index c54c59c1a3e..308d98933ba 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: 2015-10-09 09:18+0000\n"
-"PO-Revision-Date: 2015-12-04 06:06+0000\n"
+"POT-Creation-Date: 2015-12-10 13:38+0000\n"
+"PO-Revision-Date: 2015-12-11 08:46+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"
@@ -28,10 +28,10 @@ msgid ""
" <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"
@@ -53,7 +53,7 @@ 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"
@@ -135,13 +135,20 @@ msgid ""
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/chat_manager.js:59
+#, python-format
+msgid "%d Messages"
+msgstr ""
+
+#. module: mail
#: code:addons/mail/models/mail_template.py:216
#, python-format
msgid "%s (copy)"
msgstr "%s (副本)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:202
+#: code:addons/mail/models/mail_thread.py:234
#, python-format
msgid "%s created"
msgstr ""
@@ -154,9 +161,9 @@ msgstr "%s 已加入 %s 網路."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:86
+#: code:addons/mail/static/src/xml/thread.xml:96
#, python-format
-msgid "(in channel"
+msgid "(from"
msgstr ""
#. module: mail
@@ -436,7 +443,7 @@ 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 ""
@@ -561,16 +568,6 @@ 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"
-msgstr "董事會會議"
-
-#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html
#: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html
#: model:ir.model.fields,field_description:mail.field_mail_template_body_html
@@ -791,6 +788,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"
@@ -957,21 +961,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/client_action.xml:76
+#: code:addons/mail/static/src/xml/client_action.xml:107
#, 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:35
#, python-format
msgid "Direct Messages"
msgstr ""
@@ -1459,14 +1456,6 @@ 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"
@@ -1500,7 +1489,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 "
@@ -1508,7 +1497,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 ""
@@ -1566,6 +1562,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 ""
@@ -1738,6 +1739,13 @@ msgid "Mailing Opt-Out"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:108
+#, python-format
+msgid "Mark all read"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium
msgid "Medium-sized photo"
msgstr "中型尺寸的照片"
@@ -1763,13 +1771,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
@@ -1980,14 +1981,28 @@ 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:99
+#: code:addons/mail/static/src/xml/chatter.xml:67
#, 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"
@@ -1995,12 +2010,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
@@ -2325,7 +2361,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
@@ -2366,24 +2402,12 @@ msgstr "隱私"
#. 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:"
@@ -2869,11 +2893,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 "
@@ -2920,6 +2939,13 @@ msgid "To: Followers of"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:119
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: mail
#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr ""
@@ -2978,8 +3004,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"
@@ -3009,28 +3042,35 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:158
+#: code:addons/mail/static/src/xml/client_action.xml:109
+#, python-format
+msgid "Unstar all"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:110
#, python-format
msgid "Unsubscribe"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:470
+#: code:addons/mail/static/src/js/client_action.js:402
#, 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 "上傳錯誤"
@@ -3106,9 +3146,16 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/composer.xml:6
+#: code:addons/mail/static/src/xml/composer.xml:7
#, python-format
-msgid "Write something"
+msgid "Write something..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/thread.js:122
+#, python-format
+msgid "Yesterday"
msgstr ""
#. module: mail
@@ -3119,6 +3166,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 ""
@@ -3159,19 +3214,12 @@ msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/client_action.js:346
+#: 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 "
@@ -3190,19 +3238,24 @@ 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:30
+#: code:addons/mail/static/src/xml/client_action.xml:33
#, python-format
msgid "dm"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:314
+#: code:addons/mail/models/mail_thread.py:313
#, python-format
msgid "document"
msgstr ""
@@ -3235,13 +3288,20 @@ msgid "members"
msgstr ""
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/client_action.xml:97
+#, python-format
+msgid "mention(s) marked as read."
+msgstr ""
+
+#. module: mail
#: 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/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:93
#: model:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
@@ -3267,11 +3327,21 @@ 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
+#: model:mail.channel,name:mail.channel_1
+msgid "sales"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/chatter.xml:35
#, python-format