summaryrefslogtreecommitdiff
path: root/addons/mail/i18n/zh_CN.po
diff options
context:
space:
mode:
authorOdoo Translation Bot <c3p@odoo.com>2018-09-18 17:48:28 +0200
committerOdoo Translation Bot <c3p@odoo.com>2018-09-18 18:08:33 +0200
commit53908da50c2b10fb521ac090e7c2a93018e75ff6 (patch)
treedce607841c72e1f92837ac92dd1c50f651263c6e /addons/mail/i18n/zh_CN.po
parent49cc76797c2649f02d5eaa730bd66c277a62e334 (diff)
[I18N] Update translation terms from Transifex
Diffstat (limited to 'addons/mail/i18n/zh_CN.po')
-rw-r--r--addons/mail/i18n/zh_CN.po1073
1 files changed, 584 insertions, 489 deletions
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 9c38bc9f928..1efc13a30f1 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -8,6 +8,7 @@
# Emily JIA <eji@odoo.com>, 2018
# 卓忆科技 <zhanghao@jointd.com>, 2018
# Talway <9010446@qq.com>, 2018
+# Henry Zhou <zhouhenry@live.com>, 2018
# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
# 远鼎-Maker <liuct@chinamaker.net>, 2018
# 老窦 北京 <2662059195@qq.com>, 2018
@@ -17,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server saas~11.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-05 08:39+0000\n"
-"PO-Revision-Date: 2018-09-05 08:39+0000\n"
+"POT-Creation-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-09-18 09:49+0000\n"
"Last-Translator: gary chk <garychk@163.com>, 2018\n"
"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -61,7 +62,7 @@ msgid "%s and %s are typing..."
msgstr "%s 和%s 在打字..."
#. module: mail
-#: code:addons/mail/models/mail_thread.py:265
+#: code:addons/mail/models/mail_thread.py:278
#, python-format
msgid "%s created"
msgstr "%s 创建"
@@ -87,10 +88,10 @@ msgid "%s: %s assigned to you"
msgstr "%s: %s 被指派给你"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "&amp;nbsp;"
-msgstr "&"
+msgstr "&amp;nbsp;"
#. module: mail
#. openerp-web
@@ -101,7 +102,7 @@ msgstr "&nbsp;("
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:309
+#: code:addons/mail/static/src/xml/thread.xml:326
#, python-format
msgid "(from"
msgstr "(从"
@@ -115,28 +116,28 @@ msgstr ",应提交"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:529
+#: code:addons/mail/static/src/xml/thread.xml:547
#, python-format
msgid "-------- Show older messages --------"
msgstr "-------- 显示更多消息 --------"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:88
+#: code:addons/mail/static/src/xml/systray.xml:99
#, python-format
msgid "0 Future"
msgstr "0 未来"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:84
+#: code:addons/mail/static/src/xml/systray.xml:95
#, python-format
msgid "0 Late"
msgstr "0 过往"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:86
+#: code:addons/mail/static/src/xml/systray.xml:97
#, python-format
msgid "0 Today"
msgstr "0 今天"
@@ -278,7 +279,7 @@ msgid "<p>Creating a new record...</p>"
msgstr "创建新纪录"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid ""
"<span attrs=\"{'invisible': [('composition_mode', '!=', 'mass_mail')]}\">\n"
" <strong>Email mass mailing</strong> on\n"
@@ -295,7 +296,7 @@ msgstr ""
"<span attrs=\"{'invisible':['|', ('model', '=', False), ('composition_mode', '=', 'mass_mail')]}\">文档的关注者和</span>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid ""
"<span attrs=\"{'invisible': [('use_active_domain', '=', True)]}\">\n"
" If you want to send it for all the records matching your search criterion, check this box :\n"
@@ -312,19 +313,19 @@ msgstr ""
"</span>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid ""
"<span class=\"fa fa-info-circle\"/> Caution: It won't be possible to send "
"this mail again to the recipients you did not select."
msgstr "<span class=\"fa fa-info-circle\"/> 提示:这不会将邮件再次发送给未选中的收件者。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "<span class=\"o_form_label\">Activities</span>"
msgstr "<span class=\"o_form_label\">活动</span>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms: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>"
@@ -333,7 +334,7 @@ msgstr ""
"<span class=\"o_stat_text\">上下文动作</span>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms: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>"
@@ -342,7 +343,7 @@ msgstr ""
"<span class=\"o_stat_text\">上下文动作</span>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid ""
"<strong>\n"
" All records matching your current search filter will be mailed,\n"
@@ -359,19 +360,19 @@ msgstr ""
" 确认该向导可能需要几分钟阻止您的浏览器。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_activity_done
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_done
msgid "<strong> Feedback</strong>"
msgstr "<strong> 反馈</strong>"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_notification_email
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
msgid ""
"<strong>Internal communication</strong>: Replying will post an internal "
"note. Followers won't receive any email notification."
msgstr "<strong>内部沟通</strong>: 回复会发布内部留言, 关注者不会收到邮件通知"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid ""
"<strong>Only records checked in list view will be used.</strong><br/>\n"
" The email will be sent for all the records selected in the list."
@@ -380,7 +381,7 @@ msgstr ""
" 在列表中选中的所有记录都将发送电子邮件。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
msgid "<strong>Recommended Activities</strong>"
msgstr "<strong>推荐的活动</strong>"
@@ -400,7 +401,7 @@ msgid "A next activity can only be planned on models that use the chatter"
msgstr "安排新的活动只可以基于使用聊天的模型"
#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+#: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
msgid ""
"A shortcode is a keyboard shortcut. For instance, you type #gm and it will "
"be transformed into \"Good Morning\"."
@@ -409,7 +410,7 @@ msgstr "短码是一种输入快捷方式。例如,键入 #gm,它将变成\"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/discuss.xml:185
-#: code:addons/mail/static/src/xml/thread.xml:394
+#: code:addons/mail/static/src/xml/thread.xml:412
#, python-format
msgid "Accept"
msgstr "接受"
@@ -423,7 +424,7 @@ msgstr "接受选中的信息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:394
+#: code:addons/mail/static/src/xml/thread.xml:412
#, python-format
msgid "Accept |"
msgstr "同意 |"
@@ -461,7 +462,7 @@ msgstr "订阅时默认激活"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__active
#: model:ir.model.fields,field_description:mail.field_mail_blacklist__active
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Active"
msgstr "有效"
@@ -472,13 +473,13 @@ msgstr "有效域"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:97
+#: code:addons/mail/static/src/xml/systray.xml:108
#: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_ids
#: model:ir.model.fields,field_description:mail.field_res_partner__activity_ids
#: model:ir.model.fields,field_description:mail.field_res_users__activity_ids
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
#: model:mail.message.subtype,name:mail.mt_activities
#, python-format
msgid "Activities"
@@ -487,16 +488,16 @@ msgstr "活动"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/views/activity/activity_view.js:15
-#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/chatter.xml:93
#: code:addons/mail/static/src/xml/systray.xml:74
#: selection:ir.actions.act_window.view,view_mode:0
#: model:ir.model,name:mail.model_mail_activity
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_type_id
#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_type_id
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_calendar
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_calendar
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
#: selection:ir.ui.view,type:0
#, python-format
msgid "Activity"
@@ -516,14 +517,14 @@ msgstr "活动状态"
#. module: mail
#: model:ir.model,name:mail.model_mail_activity_type
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
msgid "Activity Type"
msgstr "活动类型"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_activity_type_action
#: model:ir.ui.menu,name:mail.menu_mail_activity_type
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Activity Types"
msgstr "活动类型"
@@ -555,7 +556,7 @@ msgid "Add Channels"
msgstr "添加频道"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
msgid "Add Email Blacklist"
msgstr "添加 Email 黑名单"
@@ -564,7 +565,7 @@ msgstr "添加 Email 黑名单"
#: code:addons/mail/static/src/xml/followers.xml:62
#: selection:ir.actions.server,state:0
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__partner_ids
-#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
#, python-format
msgid "Add Followers"
msgstr "添加关注者"
@@ -597,7 +598,7 @@ msgid "Add a channel"
msgstr "添加频道"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:370
+#: code:addons/mail/models/mail_thread.py:383
#, python-format
msgid "Add a new %(document)s or send an email to %(email_link)s"
msgstr "新增 %(document)s 或发送邮件至%(email_link)s"
@@ -610,7 +611,7 @@ msgid "Add a private channel"
msgstr "添加私人频道"
#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_blacklist_action
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
msgid "Add an email address in the blacklist"
msgstr "在黑名单里新增邮箱地址"
@@ -622,19 +623,19 @@ msgid "Add attachment"
msgstr "添加附件"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
msgid "Add channels to notify..."
msgstr "添加频道到通知中 ..."
#. 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
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
msgid "Add contacts to notify..."
msgstr "添加联系人到通知中 ..."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:400
+#: code:addons/mail/static/src/xml/thread.xml:418
#, python-format
msgid "Add this email address to white list of people"
msgstr "把邮箱地址增加至白名单"
@@ -645,12 +646,12 @@ msgid "Additional Contacts"
msgstr "额外的联系人"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
msgid "Advanced"
msgstr "高级"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Advanced Settings"
msgstr "高级设置"
@@ -675,8 +676,8 @@ msgstr "警告"
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__alias_id
#: model:ir.model.fields,field_description:mail.field_mail_channel__alias_id
#: model:ir.model.fields,field_description:mail.field_res_users__alias_id
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_form
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_tree
msgid "Alias"
msgstr "别名"
@@ -729,7 +730,14 @@ msgid "All"
msgstr "所有"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:46
+#, python-format
+msgid "All pages:&nbsp;"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
msgid "Allowed Emails"
msgstr "允许的邮件"
@@ -745,7 +753,7 @@ msgstr "总是允许"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:400
+#: code:addons/mail/static/src/xml/thread.xml:418
#, python-format
msgid "Always Allow |"
msgstr "总是允许 |"
@@ -788,13 +796,13 @@ msgid "Apply"
msgstr "应用"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_search
-#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_search
msgid "Archived"
msgstr "已归档"
#. module: mail
-#: code:addons/mail/wizard/mail_resend_message.py:118
+#: code:addons/mail/wizard/mail_resend_message.py:122
#, python-format
msgid ""
"Are you sure you want to discard %s mail delivery failures. You won't be "
@@ -819,17 +827,29 @@ msgid ""
msgstr "指定用户 %s 对文档无权限,无法处理这个活动 。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Attach a file"
msgstr "附加一个文件"
#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_attachment_count
+#: model:ir.model.fields,field_description:mail.field_res_users__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/chatter.xml:11
#: model:ir.model.fields,field_description:mail.field_email_template_preview__attachment_ids
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__attachment_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__attachment_ids
#: model:ir.model.fields,field_description:mail.field_mail_message__attachment_ids
#: model:ir.model.fields,field_description:mail.field_mail_template__attachment_ids
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#, python-format
msgid "Attachments"
msgstr "附件"
@@ -856,12 +876,12 @@ msgstr "身份验证过的业务伙伴"
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__author_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__author_id
#: model:ir.model.fields,field_description:mail.field_mail_message__author_id
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Author"
msgstr "作者"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Author Signature (mass mail only)"
msgstr "作者签名(仅限群发邮件)"
@@ -894,12 +914,17 @@ msgid "Auto Delete"
msgstr "自动删除"
#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+msgid "Auto Subscribe Groups"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids
msgid "Auto Subscription"
msgstr "自动订阅"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
msgid "Auto subscription"
msgstr "自动订阅"
@@ -923,25 +948,25 @@ msgstr "头像"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:402
+#: code:addons/mail/static/src/xml/thread.xml:420
#, python-format
msgid "Ban"
msgstr "禁止"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Ban List"
msgstr "禁止清单"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:402
+#: code:addons/mail/static/src/xml/thread.xml:420
#, python-format
msgid "Ban this email address"
msgstr "禁止此Email地址"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
msgid "Banned Emails"
msgstr "禁止的Email"
@@ -953,7 +978,7 @@ msgid "Be careful with channels following internal notifications"
msgstr "小心内部指示的渠道"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "Best regards,"
msgstr "致以最诚挚的问候,"
@@ -967,15 +992,15 @@ msgid "Blacklist"
msgstr "黑名单"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
msgid "Blacklist Date"
msgstr "黑名单日期"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__body_html
#: model:ir.model.fields,field_description:mail.field_mail_template__body_html
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_message_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_form
msgid "Body"
msgstr "正文"
@@ -987,7 +1012,7 @@ msgstr "退回"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:380
+#: code:addons/mail/static/src/xml/thread.xml:398
#: selection:mail.notification,email_status:0
#, python-format
msgid "Bounced"
@@ -1008,28 +1033,28 @@ msgstr "电话"
#. openerp-web
#: code:addons/mail/static/src/js/followers.js:354
#: code:addons/mail/static/src/xml/activity.xml:85
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
-#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
-#: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "Cancel"
msgstr "取消"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
msgid "Cancel Email"
msgstr "取消电子邮件"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
msgid "Cancel notification in failure"
msgstr "取消失败通知"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:383
+#: code:addons/mail/static/src/xml/thread.xml:401
#: selection:mail.notification,email_status:0
#, python-format
msgid "Canceled"
@@ -1081,7 +1106,7 @@ msgid "Cc"
msgstr "抄送"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
msgid "Change"
msgstr "更改"
@@ -1093,7 +1118,7 @@ msgstr "修改此类相关活动的背景色"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:425
+#: code:addons/mail/static/src/xml/thread.xml:443
#, python-format
msgid "Changed"
msgstr "已修改"
@@ -1108,8 +1133,8 @@ msgstr "更改的字段"
#: code:addons/mail/static/src/xml/discuss.xml:108
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__channel_id
#: model:ir.model.fields,field_description:mail.field_mail_moderation__channel_id
-#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
#: selection:mail.channel,channel_type:0
#, python-format
msgid "Channel"
@@ -1155,7 +1180,7 @@ msgstr "频道设置"
#: model:ir.model.fields,field_description:mail.field_res_partner__channel_ids
#: model:ir.model.fields,field_description:mail.field_res_users__channel_ids
#: model:ir.ui.menu,name:mail.mail_channel_menu_settings
-#: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree
#, python-format
msgid "Channels"
msgstr "频道"
@@ -1193,13 +1218,13 @@ msgid "Child Messages"
msgstr "下级信息"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "Choose an example"
msgstr "选择一个示例"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:36
+#: code:addons/mail/static/src/xml/thread.xml:50
#, python-format
msgid "Close"
msgstr "关闭"
@@ -1217,12 +1242,12 @@ msgid "Closed"
msgstr "已关闭"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Comma-separated carbon copy recipients addresses"
msgstr "逗号分隔的抄送收件人地址"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Comma-separated ids of recipient partners"
msgstr "逗号分隔的收件人合作伙伴的ID"
@@ -1234,7 +1259,7 @@ msgid ""
msgstr "逗号分隔的收件人合作伙伴的ID(可以使用占位符)"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Comma-separated recipient addresses"
msgstr "逗号分隔的收件人地址"
@@ -1245,7 +1270,7 @@ msgid "Comma-separated recipient addresses (placeholders may be used here)"
msgstr "逗号分隔的收件人地址(可以在这里使用占位符)"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
msgid "Comment"
@@ -1258,9 +1283,9 @@ msgstr "公司"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:308
+#: code:addons/mail/static/src/js/activity.js:322
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Compose Email"
msgstr "撰写邮件"
@@ -1271,32 +1296,37 @@ msgid "Composition mode"
msgstr "写作模式"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Configure your activity types"
msgstr "配置你的活动类型"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:114
+#: code:addons/mail/static/src/xml/thread.xml:130
#, python-format
msgid "Congratulations, your inbox is empty"
msgstr "恭喜,您的收件箱中暂时没有要处理的邮件。"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:942
+#: code:addons/mail/static/src/js/discuss.js:944
#, python-format
msgid "Congratulations, your inbox is empty!"
msgstr "恭喜,你的收件箱是空的!"
#. module: mail
+#: selection:mail.notification,failure_type:0
+msgid "Connection failed (outgoing mail server problem)"
+msgstr ""
+
+#. module: mail
#: model:ir.model,name:mail.model_res_partner
msgid "Contact"
msgstr "联系人"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
msgid "Content"
msgstr "内容"
@@ -1332,29 +1362,24 @@ msgstr "此联系人退回邮件数量计数器"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:563
+#: code:addons/mail/static/src/js/discuss.js:565
#, python-format
msgid "Create %s"
msgstr "创建 %s"
#. module: mail
-#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
-msgid "Create Date"
-msgstr "创建日期"
-
-#. module: mail
#: selection:ir.actions.server,state:0
msgid "Create Next Activity"
msgstr "创建新的活动"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:385
+#: code:addons/mail/models/mail_thread.py:400
#, python-format
msgid "Create a new %(document)s"
msgstr "创建一个新文档"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:377
+#: code:addons/mail/models/mail_thread.py:392
#, python-format
msgid "Create a new %(document)s by sending an email to %(email_link)s"
msgstr "新建%(document)s通过发送邮件至%(email_link)s"
@@ -1365,7 +1390,7 @@ msgid "Create a new Record"
msgstr "创建一条新记录"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
msgid "Created By"
msgstr "创建人"
@@ -1402,6 +1427,7 @@ msgstr "创建人"
#: model:ir.model.fields,field_description:mail.field_mail_alias__create_date
#: model:ir.model.fields,field_description:mail.field_mail_alias_mixin__create_date
#: model:ir.model.fields,field_description:mail.field_mail_blacklist__create_date
+#: model:ir.model.fields,field_description:mail.field_mail_channel__create_date
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__create_date
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__create_date
#: model:ir.model.fields,field_description:mail.field_mail_mail__create_date
@@ -1420,8 +1446,8 @@ msgid "Created on"
msgstr "创建时间"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_form
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Creation Date"
msgstr "创建日期"
@@ -1440,19 +1466,19 @@ msgstr "当前用户用 星号 提醒关联到这条消息"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__is_moderator
msgid "Current user is a moderator of the channel"
-msgstr ""
+msgstr "当前用户为频道管理人"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__date
#: model:ir.model.fields,field_description:mail.field_mail_mail__date
#: model:ir.model.fields,field_description:mail.field_mail_message__date
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Date"
msgstr "日期"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/chatter.xml:93
#, python-format
msgid "Dates"
msgstr "日期"
@@ -1465,13 +1491,13 @@ msgstr "天"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:39
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
#, python-format
msgid "Deadline"
msgstr "截止日期"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
+#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
msgid "Dear"
msgstr "亲爱的"
@@ -1479,7 +1505,7 @@ msgstr "亲爱的"
#: model:ir.model.fields,field_description:mail.field_mail_activity__activity_decoration
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
msgid "Decoration Type"
-msgstr ""
+msgstr "排版类型"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
@@ -1489,7 +1515,7 @@ msgstr "默认"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__default_next_type_id
msgid "Default Next Activity"
-msgstr ""
+msgstr "设置默认下一个活动"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value
@@ -1523,9 +1549,9 @@ msgstr ""
"- 电子邮件(使用发件人或email字段)"
#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_shortcode_action
+#: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action
msgid "Define a new chat shortcode"
-msgstr ""
+msgstr "定义新的聊天简码"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_from
@@ -1535,12 +1561,12 @@ msgstr "延迟类型"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_unit
msgid "Delay units"
-msgstr ""
+msgstr "延迟单位"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/composer.xml:87
-#: code:addons/mail/static/src/xml/thread.xml:514
+#: code:addons/mail/static/src/xml/thread.xml:532
#, python-format
msgid "Delete"
msgstr "刪除"
@@ -1569,7 +1595,7 @@ msgstr "投递失败"
#: model:ir.model.fields,field_description:mail.field_mail_channel__description
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__description
#: model:ir.model.fields,field_description:mail.field_mail_shortcode__description
-#: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
msgid "Description"
msgstr "说明"
@@ -1597,40 +1623,40 @@ msgstr "私信"
#: code:addons/mail/static/src/js/discuss.js:348
#: code:addons/mail/static/src/xml/activity.xml:101
#: code:addons/mail/static/src/xml/discuss.xml:187
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#, python-format
msgid "Discard"
msgstr "放弃"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
msgid "Discard delivery failures"
-msgstr ""
+msgstr "忽略发送失败"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_resend_cancel_action
msgid "Discard mail delivery failures"
-msgstr ""
+msgstr "放弃发送失败的邮件"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/discuss.xml:187
#, python-format
msgid "Discard selected messages"
-msgstr ""
+msgstr "放弃选中的信息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:398
+#: code:addons/mail/static/src/xml/thread.xml:416
#, python-format
msgid "Discard |"
-msgstr ""
+msgstr "放弃 |"
#. module: mail
#: model:ir.actions.client,name:mail.action_discuss
#: model:ir.ui.menu,name:mail.menu_root_discuss
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Discuss"
msgstr "讨论"
@@ -1647,7 +1673,7 @@ msgstr "讨论"
#. module: mail
#: model:ir.model,name:mail.model_mail_resend_cancel
msgid "Dismiss notification for resend by model"
-msgstr ""
+msgstr "重发请求被拒绝"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__display_name
@@ -1680,7 +1706,7 @@ msgid "Display Name"
msgstr "显示名称"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid ""
"Display an option on related documents to open a composition wizard with "
"this template"
@@ -1699,7 +1725,7 @@ msgid ""
msgstr "不要在文档通信历史中保存电子邮件副本(仅限群发邮件)"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_document_file_kanban
+#: model_terms:ir.ui.view,arch_db:mail.view_document_file_kanban
msgid "Document"
msgstr "单据"
@@ -1728,15 +1754,15 @@ msgstr "完成"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:97
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
#, python-format
msgid "Done & Schedule Next"
msgstr "完成 & 安排下一次"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:34
-#: code:addons/mail/static/src/xml/thread.xml:61
+#: code:addons/mail/static/src/xml/thread.xml:43
+#: code:addons/mail/static/src/xml/thread.xml:77
#, python-format
msgid "Download"
msgstr "下载"
@@ -1746,7 +1772,7 @@ msgstr "下载"
#: code:addons/mail/static/src/xml/followers.xml:11
#, python-format
msgid "Dropdown menu - Followers"
-msgstr ""
+msgstr "下拉菜单—关注者"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity__date_deadline
@@ -1756,7 +1782,7 @@ msgstr "到期时间"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range
msgid "Due Date In"
-msgstr ""
+msgstr "到期日期至"
#. module: mail
#. openerp-web
@@ -1768,10 +1794,10 @@ msgstr "截至 %d 天"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_date_deadline_range_type
msgid "Due type"
-msgstr ""
+msgstr "截止类型"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Dynamic Placeholder Generator"
msgstr "动态定位符生成器"
@@ -1783,9 +1809,9 @@ msgid "Edit"
msgstr "编辑"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid "Edit Partners"
-msgstr ""
+msgstr "编辑伙伴"
#. module: mail
#. openerp-web
@@ -1805,8 +1831,8 @@ msgstr "编辑订阅"
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_email
#: model:ir.model.fields,field_description:mail.field_mail_moderation__email
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__email
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
#: model:mail.activity.type,name:mail.mail_activity_data_email
#: selection:mail.compose.message,message_type:0
#: selection:mail.message,message_type:0
@@ -1819,7 +1845,7 @@ msgid "Email Address"
msgstr "Email地址"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Email Alias"
msgstr "Email别名"
@@ -1829,22 +1855,22 @@ msgid "Email Aliases"
msgstr "Email别名"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
msgid "Email Blacklist"
-msgstr ""
+msgstr "Email黑名单"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Email Configuration"
msgstr "Email配置"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "Email Preview"
msgstr "Email预览"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Email Search"
msgstr "Email搜索"
@@ -1876,7 +1902,7 @@ msgstr "电子邮件线程"
#. module: mail
#: sql_constraint:mail.blacklist:0
msgid "Email address already exists!"
-msgstr ""
+msgstr "电子邮件地址已存在!"
#. module: mail
#: model:ir.model.fields,help:mail.field_res_users__alias_id
@@ -1886,11 +1912,6 @@ msgid ""
msgstr "关联这个用户的电子邮件地址,收到的电子邮件被显示在用户的通知中。"
#. module: mail
-#: selection:mail.notification,failure_type:0
-msgid "Email address not found"
-msgstr ""
-
-#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__email_from
#: model:ir.model.fields,help:mail.field_mail_mail__email_from
#: model:ir.model.fields,help:mail.field_mail_message__email_from
@@ -1900,16 +1921,21 @@ msgid ""
msgstr "发送者的Email地址。当找不到业务伙伴的匹配的邮件时候,这个字段就被设置。并且Chatter中的作者id被替换掉"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: selection:mail.notification,failure_type:0
+msgid "Email address rejected by destination"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Email address to redirect replies..."
msgstr "电子邮件地址重定向回复..."
#. module: mail
-#: model:ir.actions.act_window,help:mail.mail_blacklist_action
+#: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action
msgid ""
"Email addresses that are blacklisted means that the recipient won't receive "
"any mass mailing anymore."
-msgstr ""
+msgstr "存在于黑名单的电子邮件表示收件者不会再收到群发邮件。"
#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
@@ -1917,20 +1943,20 @@ msgid "Email composition wizard"
msgstr "Email撰写向导"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_message_subtype_form
msgid "Email message"
msgstr "Email消息"
#. module: mail
#: model:ir.model,name:mail.model_mail_resend_message
msgid "Email resend wizard"
-msgstr ""
+msgstr "电子邮件重发向导"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_mail
#: model:ir.ui.menu,name:mail.menu_mail_mail
-#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
msgid "Emails"
msgstr "电子邮件"
@@ -1939,16 +1965,16 @@ msgstr "电子邮件"
#: code:addons/mail/static/src/xml/composer.xml:14
#, python-format
msgid "Emojis"
-msgstr ""
+msgstr "表情符号"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
msgid "Envelope Example"
-msgstr ""
+msgstr "信封样例"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:381
+#: code:addons/mail/static/src/xml/thread.xml:399
#: selection:mail.activity.type,decoration_type:0
#, python-format
msgid "Error"
@@ -1961,11 +1987,6 @@ msgid "Error during communication with the publisher warranty server."
msgstr "当与保障服务器通信时发生错误。"
#. module: mail
-#: selection:mail.notification,failure_type:0
-msgid "Error while connecting to smtp server"
-msgstr ""
-
-#. module: mail
#: code:addons/mail/models/mail_mail.py:317
#, python-format
msgid ""
@@ -2011,17 +2032,24 @@ msgid "Execute several actions"
msgstr "执行几个动作"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Extended Filters..."
msgstr "扩展筛选..."
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "Extract pages:&nbsp;"
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_config_settings__fail_counter
msgid "Fail Mail"
msgstr "失败的邮件"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Failed"
msgstr "失败的"
@@ -2033,14 +2061,14 @@ msgstr "渲染模板%r 失败 使用数值 %r"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__failure_reason
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
msgid "Failure Reason"
msgstr "失败原因"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_reason
msgid "Failure reason"
-msgstr ""
+msgstr "失败原因"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_mail__failure_reason
@@ -2052,7 +2080,7 @@ msgstr "失败原因。这通常是通过电子邮件服务器抛出的异常,
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_notification__failure_type
msgid "Failure type"
-msgstr ""
+msgstr "失败类型"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__starred_partner_ids
@@ -2063,7 +2091,7 @@ msgstr "收藏夹"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/activity.js:255
+#: code:addons/mail/static/src/js/activity.js:277
#: model:ir.model.fields,field_description:mail.field_mail_activity__feedback
#, python-format
msgid "Feedback"
@@ -2133,7 +2161,7 @@ msgstr "关注"
#: model:ir.model.fields,field_description:mail.field_res_partner__message_follower_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_follower_ids
#: model:ir.ui.menu,name:mail.menu_email_followers
-#: model:ir.ui.view,arch_db:mail.view_followers_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_followers_tree
msgid "Followers"
msgstr "关注者"
@@ -2156,13 +2184,13 @@ msgid "Followers (Partners)"
msgstr "关注者(业务伙伴)"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_subscription_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_subscription_form
msgid "Followers Form"
msgstr "关注者表单"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:17
+#: code:addons/mail/static/src/xml/chatter.xml:40
#, python-format
msgid "Followers of"
msgstr "关注者"
@@ -2202,21 +2230,21 @@ msgstr "从"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:50
+#: code:addons/mail/static/src/xml/chatter.xml:73
#, python-format
msgid "Full composer"
-msgstr ""
+msgstr "完全创建者"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:87
+#: code:addons/mail/static/src/xml/systray.xml:98
#, python-format
msgid "Future"
msgstr "未来"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "Future Activities"
msgstr "未来活动"
@@ -2227,14 +2255,14 @@ msgid "Gantt"
msgstr "甘特图"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_form
msgid "Gateway"
msgstr "网关"
#. module: mail
#: selection:ir.actions.server,activity_user_type:0
msgid "Generic User From Record"
-msgstr ""
+msgstr "记录显示为一般用户"
#. module: mail
#: code:addons/mail/models/res_users.py:87
@@ -2249,19 +2277,19 @@ msgid "Graph"
msgstr "图形"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Group By"
msgstr "分组"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_email_template_search
+#: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
msgid "Group by..."
msgstr "分组 于"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_tree
msgid "Groups"
msgstr "群组"
@@ -2273,7 +2301,7 @@ msgstr "方针"
#. module: mail
#: model:mail.template,subject:mail.mail_template_channel_send_guidelines
msgid "Guidelines of channel ${ctx['channel'].name}"
-msgstr ""
+msgstr "频道指引 ${ctx['channel'].name}"
#. module: mail
#: selection:res.users,notification_type:0
@@ -2288,15 +2316,15 @@ msgstr "在odoo内处理"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel
msgid "Has Cancel"
-msgstr ""
+msgstr "已取消"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
msgid "Has Mentions"
msgstr "提及"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
msgid "Has attachments"
msgstr "有附件"
@@ -2312,21 +2340,21 @@ msgstr "有误差"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__headers
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
msgid "Headers"
msgstr "头信息"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
-#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
msgid "Hello"
-msgstr ""
+msgstr "您好"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__help_message
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__message
msgid "Help message"
-msgstr ""
+msgstr "帮助信息"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__hidden
@@ -2462,7 +2490,7 @@ msgstr "如果设置完毕,队列管理员将在指定日期之后发送电子
msgid ""
"If the email address is on the blacklist, the contact won't receive mass "
"mailing anymore, from any list"
-msgstr ""
+msgstr "存在于黑名单的电子邮件表示收件者不会再收到任何列表的群发邮件。"
#. module: mail
#: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
@@ -2472,21 +2500,21 @@ msgid ""
msgstr "如果你设置了电子邮件域名重定向到这个Odoo服务器,请在这里输入域名。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form
msgid ""
"If you want to re-send them, click Cancel now, then click on the "
"notification and review them one by one by clicking on the red envelope next"
" to each message."
-msgstr ""
+msgstr "如果你想重新发送,请点击取消,然后点击每条信息旁边的红色信封提示逐一检查。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid "Ignore all failures"
-msgstr ""
+msgstr "忽略所有失败"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:30
+#: code:addons/mail/static/src/xml/thread.xml:39
#, python-format
msgid "Image"
msgstr "图像"
@@ -2511,7 +2539,7 @@ msgstr "收件箱"
#: model:ir.model.fields,help:mail.field_mail_activity__automated
msgid ""
"Indicates this activity has been created automatically and not by any user."
-msgstr ""
+msgstr "表示这个活动是自动生成的,不是任何用户创建。"
#. module: mail
#. openerp-web
@@ -2523,7 +2551,7 @@ msgstr "信息"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__initial_res_model_id
msgid "Initial model"
-msgstr ""
+msgstr "初始模型"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_compose_message__parent_id
@@ -2534,7 +2562,7 @@ msgstr "初始化线程消息"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_channel_integrations_menu
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Integrations"
msgstr "集成"
@@ -2545,7 +2573,7 @@ msgstr "仅仅内部的"
#. module: mail
#: selection:mail.notification,failure_type:0
-msgid "Invalid email adress"
+msgid "Invalid email address"
msgstr ""
#. module: mail
@@ -2560,11 +2588,11 @@ msgstr "错误的表达式,必须是符合文法的python字典定义,例如
#: code:addons/mail/models/mail_blacklist.py:78
#, python-format
msgid "Invalid primary email field on model %s"
-msgstr ""
+msgstr "初级邮件模型中无效的部分 %s"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1953
-#: code:addons/mail/models/mail_thread.py:2176
+#: code:addons/mail/models/mail_thread.py:1967
+#: code:addons/mail/models/mail_thread.py:2196
#, python-format
msgid ""
"Invalid record set: should be called as model (without records) or on "
@@ -2615,7 +2643,7 @@ msgstr "邀请人员"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1186
+#: code:addons/mail/static/src/js/discuss.js:1188
#, python-format
msgid "Invite people to #%s"
msgstr "邀请人员 到 %s"
@@ -2631,14 +2659,14 @@ msgid "Invited people only"
msgstr "仅邀请人员"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
msgid "Is Allowed"
-msgstr ""
+msgstr "允许的"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
msgid "Is Banned"
-msgstr ""
+msgstr "禁止的"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_is_follower
@@ -2672,7 +2700,7 @@ msgstr "是成员"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_users__is_moderator
msgid "Is moderator"
-msgstr ""
+msgstr "是管理员"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_pinned
@@ -2680,7 +2708,7 @@ msgid "Is pinned on the interface"
msgstr "是否置顶"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Join"
msgstr "加入"
@@ -2735,7 +2763,7 @@ msgstr "最后修改日"
#: 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 "最近一次查阅"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_email_template_preview__write_uid
@@ -2787,14 +2815,14 @@ msgstr "最后更新时间"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/systray.xml:83
+#: code:addons/mail/static/src/xml/systray.xml:94
#, python-format
msgid "Late"
msgstr "过往"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "Late Activities"
msgstr "逾期活动"
@@ -2806,7 +2834,7 @@ msgid "Layout"
msgstr "布局"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
msgid "Leave"
msgstr "休假"
@@ -2858,17 +2886,17 @@ msgstr "在线聊天对话"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:41
+#: code:addons/mail/static/src/xml/thread.xml:55
#, python-format
msgid "Loading"
msgstr "正在加载"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:526
+#: code:addons/mail/static/src/xml/thread.xml:544
#, python-format
msgid "Loading older messages..."
-msgstr ""
+msgstr "正在加载历史信息"
#. module: mail
#. openerp-web
@@ -2881,26 +2909,26 @@ msgstr "加载..."
#. openerp-web
#: code:addons/mail/static/src/js/composers/chatter_composer.js:34
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:34
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Log"
msgstr "日志"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:66
+#: code:addons/mail/static/src/xml/chatter.xml:89
#, python-format
msgid "Log a note. Followers will not be notified."
msgstr "记录说明,关注者不会被通知。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid "Log a note..."
msgstr "记录一个备注..."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
msgid "Log an Activity"
msgstr "记录一个活动"
@@ -2911,14 +2939,14 @@ msgstr "记录内部备注"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:66
+#: code:addons/mail/static/src/xml/chatter.xml:89
#, python-format
msgid "Log note"
msgstr "记录备注"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:69
+#: code:addons/mail/static/src/xml/chatter.xml:92
#, python-format
msgid "Log or schedule an activity"
msgstr "记录或安排活动"
@@ -2942,12 +2970,12 @@ msgstr "邮件活动类型"
#. module: mail
#: model:ir.model,name:mail.model_mail_blacklist
msgid "Mail Blacklist"
-msgstr ""
+msgstr "邮件黑名单"
#. module: mail
#: model:ir.model,name:mail.model_mail_blacklist_mixin
msgid "Mail Blacklist mixin"
-msgstr ""
+msgstr "mixin邮件黑名单"
#. module: mail
#. openerp-web
@@ -2957,7 +2985,7 @@ msgid "Mail Body"
msgstr "邮件内容"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Mail Channel Form"
msgstr "邮件频道表单"
@@ -2969,7 +2997,7 @@ msgstr "邮件发送失败"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_model__is_mail_thread
-#: model:ir.ui.view,arch_db:mail.model_search_view
+#: model_terms:ir.ui.view,arch_db:mail.model_search_view
msgid "Mail Thread"
msgstr "邮件线程"
@@ -2995,10 +3023,10 @@ msgstr "Mail: Email 队列管理器"
#: model:ir.cron,cron_name:mail.ir_cron_mail_notify_channel_moderators
#: model:ir.cron,name:mail.ir_cron_mail_notify_channel_moderators
msgid "Mail: Notify channel moderators"
-msgstr ""
+msgstr "邮件:通知频道管理员"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:924
+#: code:addons/mail/models/mail_thread.py:939
#, python-format
msgid "Mailbox unavailable - %s"
msgstr "Mailbox 不可用- %s"
@@ -3007,6 +3035,23 @@ msgstr "Mailbox 不可用- %s"
#: model:ir.model.fields,field_description:mail.field_mail_activity__mail_template_ids
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__mail_template_ids
msgid "Mails templates"
+msgstr "邮件模板"
+
+#. module: mail
+#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_channel__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_mail_thread__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_res_partner__message_main_attachment_id
+#: model:ir.model.fields,field_description:mail.field_res_users__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/tools/debug_manager.js:22
+#: code:addons/mail/static/src/xml/thread.xml:9
+#, python-format
+msgid "Manage Messages"
msgstr ""
#. module: mail
@@ -3031,22 +3076,22 @@ msgid "Mark all read"
msgstr "标记全部已读"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
msgid "Mark as Done"
msgstr "标记为完成"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/discuss.xml:298
-#: code:addons/mail/static/src/xml/thread.xml:328
+#: code:addons/mail/static/src/xml/thread.xml:346
#, python-format
msgid "Mark as Read"
msgstr "标记为已读"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:282
-#: code:addons/mail/static/src/xml/thread.xml:322
+#: code:addons/mail/static/src/xml/thread.xml:299
+#: code:addons/mail/static/src/xml/thread.xml:340
#, python-format
msgid "Mark as Todo"
msgstr "标记为待办"
@@ -3061,7 +3106,7 @@ msgstr "标记为完成"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_blacklist_menu
msgid "Mass Mail Blacklist"
-msgstr ""
+msgstr "群发邮件黑名单"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
@@ -3083,7 +3128,7 @@ msgid "Meeting"
msgstr "会议"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Members"
msgstr "会员"
@@ -3106,7 +3151,7 @@ msgstr "合并以下业务伙伴:"
#: model:ir.model.fields,field_description:mail.field_mail_notification__mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_resend_message__mail_message_id
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__message
-#: model:ir.ui.view,arch_db:mail.view_message_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_form
msgid "Message"
msgstr "消息"
@@ -3142,10 +3187,10 @@ msgid "Message Type"
msgstr "消息类型"
#. module: mail
-#: code:addons/mail/models/mail_message.py:1256
+#: code:addons/mail/models/mail_message.py:1267
#, python-format
msgid "Message are pending moderation"
-msgstr ""
+msgstr "信息有待调整"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_mail__email_to
@@ -3218,12 +3263,12 @@ msgstr "Message-Id"
#: model:ir.model.fields,field_description:mail.field_res_partner__message_ids
#: model:ir.model.fields,field_description:mail.field_res_users__message_ids
#: model:ir.ui.menu,name:mail.menu_mail_message
-#: model:ir.ui.view,arch_db:mail.view_message_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_message_tree
msgid "Messages"
msgstr "信息"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
msgid "Messages Search"
msgstr "消息搜索"
@@ -3246,21 +3291,21 @@ msgstr "内部的消息将只有员工可见,即基础用户组成员"
#: code:addons/mail/static/src/js/models/threads/mailbox.js:202
#, python-format
msgid "Missing domain for mailbox with ID '%s'"
-msgstr ""
+msgstr " ID信箱缺少域名 '%s'"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_id
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__res_model
#: model:ir.model.fields,field_description:mail.field_mail_resend_cancel__model
-#: model:ir.ui.view,arch_db:mail.view_email_template_search
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
+#: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Model"
msgstr "模型"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_activity_type__res_model_change
msgid "Model has change"
-msgstr ""
+msgstr "模型已更改"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_wizard_invite__res_model
@@ -3281,89 +3326,89 @@ msgstr "型号"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/services/mail_manager.js:1244
-#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
#, python-format
msgid "Moderate Messages"
-msgstr ""
+msgstr "管理消息"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation
msgid "Moderate this channel"
-msgstr ""
+msgstr "管理这个频道"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderator_id
#: model:ir.model.fields,field_description:mail.field_mail_mail__moderator_id
#: model:ir.model.fields,field_description:mail.field_mail_message__moderator_id
msgid "Moderated By"
-msgstr ""
+msgstr "管理人"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_ids
msgid "Moderated Emails"
-msgstr ""
+msgstr "管理电子邮件"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_users__moderation_channel_ids
msgid "Moderated channels"
-msgstr ""
+msgstr "管理频道"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_count
msgid "Moderated emails count"
-msgstr ""
+msgstr "管理电子邮件账户"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_moderation_action
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Moderation"
-msgstr ""
+msgstr "管理操作"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_tree
msgid "Moderation Lists"
-msgstr ""
+msgstr "管理列表"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/discuss.xml:39
#, python-format
msgid "Moderation Queue"
-msgstr ""
+msgstr "管理队列"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__moderation_status
#: model:ir.model.fields,field_description:mail.field_mail_mail__moderation_status
#: model:ir.model.fields,field_description:mail.field_mail_message__moderation_status
msgid "Moderation Status"
-msgstr ""
+msgstr "管理状态"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
msgid "Moderation count"
-msgstr ""
+msgstr "管理账户"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
msgid "Moderator"
-msgstr ""
+msgstr "管理人员"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderator_ids
msgid "Moderators"
-msgstr ""
+msgstr "管理员们"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_form
msgid ""
"Modifying the model can have an impact on existing activities using this "
"activity type, be careful."
-msgstr ""
+msgstr "请注意,这个活动类型修改模型会影响现有活动"
#. module: mail
#: model:ir.model,name:mail.model_base_module_uninstall
msgid "Module Uninstallation"
-msgstr "模块反安装"
+msgstr "模块卸载"
#. module: mail
#: selection:ir.actions.server,activity_date_deadline_range_type:0
@@ -3371,8 +3416,8 @@ msgid "Months"
msgstr "月"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "My Activities"
msgstr "我的活动"
@@ -3382,7 +3427,7 @@ msgstr "我的活动"
#: model:ir.model.fields,field_description:mail.field_mail_channel__name
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__name
#: model:ir.model.fields,field_description:mail.field_mail_template__name
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Name"
msgstr "名称"
@@ -3410,7 +3455,7 @@ msgstr ""
#: model:ir.model.fields,help:mail.field_mail_compose_message__needaction
#: model:ir.model.fields,help:mail.field_mail_mail__needaction
#: model:ir.model.fields,help:mail.field_mail_message__needaction
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
msgid "Need Action"
msgstr "待处理"
@@ -3419,7 +3464,7 @@ msgstr "待处理"
#: model:ir.model.fields,field_description:mail.field_mail_mail__need_moderation
#: model:ir.model.fields,field_description:mail.field_mail_message__need_moderation
msgid "Need moderation"
-msgstr ""
+msgstr "需要调节"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_notification__res_partner_id
@@ -3473,7 +3518,7 @@ msgstr "新文本值"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/services/mail_manager.js:935
-#: code:addons/mail/static/src/js/thread_windows/thread_window.js:121
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:112
#: code:addons/mail/static/src/xml/systray.xml:15
#: code:addons/mail/static/src/xml/systray.xml:24
#, python-format
@@ -3482,14 +3527,14 @@ msgstr "新建消息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:411
+#: code:addons/mail/static/src/xml/thread.xml:429
#, python-format
msgid "New messages"
msgstr "新建消息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:115
+#: code:addons/mail/static/src/xml/thread.xml:131
#, python-format
msgid "New messages appear here."
msgstr "新消息出现在这里"
@@ -3506,17 +3551,17 @@ msgstr "新用户"
msgid ""
"Newcomers on this moderated channel will automatically receive the "
"guidelines."
-msgstr ""
+msgstr "这个调节频道的新用户会自动收到指引。"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:79
+#: code:addons/mail/static/src/xml/thread.xml:95
#, python-format
msgid "Next"
msgstr "下一个"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_tree
msgid "Next Activities"
msgstr "下一步活动"
@@ -3547,6 +3592,12 @@ msgid "Next activities available"
msgstr "下一活动可用"
#. module: mail
+#: code:addons/mail/models/mail_notification.py:50
+#, python-format
+msgid "No Error"
+msgstr ""
+
+#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/systray.xml:68
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:20
@@ -3559,12 +3610,14 @@ msgstr "无计划的活动."
#: code:addons/mail/static/src/xml/systray.xml:54
#, python-format
msgid "No conversation yet..."
-msgstr ""
+msgstr "还没有对话..."
#. module: mail
-#: selection:mail.notification,failure_type:0
-msgid "No error"
-msgstr ""
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:21
+#, python-format
+msgid "No data to display"
+msgstr "无数据可供显示"
#. module: mail
#. openerp-web
@@ -3575,28 +3628,28 @@ msgstr "无关注者"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:18
+#: code:addons/mail/static/src/xml/thread.xml:27
#, python-format
msgid "No matches found"
msgstr "无法匹配"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:19
+#: code:addons/mail/static/src/js/tools/debug_manager.js:17
#, python-format
-msgid "No message matches your search. Try to change your search filters."
-msgstr "找不到与你查找相匹配的消息。试着更改搜索筛选"
+msgid "No message available"
+msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/views/activity/activity_renderer.js:32
+#: code:addons/mail/static/src/xml/thread.xml:28
#, python-format
-msgid "No schedulded activity"
-msgstr ""
+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:118
+#: code:addons/mail/static/src/xml/thread.xml:134
#, python-format
msgid "No starred message"
msgstr "没有标星的消息"
@@ -3617,13 +3670,13 @@ msgstr "备注"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:287
+#: code:addons/mail/static/src/xml/thread.xml:304
#, python-format
msgid "Note by"
msgstr "备注"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Notification"
msgstr "通知"
@@ -3635,7 +3688,7 @@ msgstr "通知管理"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify_msg
msgid "Notification message"
-msgstr ""
+msgstr "通知信息"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__notification_ids
@@ -3669,7 +3722,7 @@ msgstr "行动数量"
msgid ""
"Number of days/week/month before executing the action. It allows to plan the"
" action deadline."
-msgstr ""
+msgstr "在执行该动作前几天/周/月,允许计划动作的截止日期。"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_has_error_counter
@@ -3708,10 +3761,10 @@ msgid "Number of unread messages"
msgstr "未读消息的数量"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_notification_borders
-#: model:ir.ui.view,arch_db:mail.mail_notification_light
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
-#: model:ir.ui.view,arch_db:mail.message_notification_email
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
msgid "Odoo"
msgstr "Odoo"
@@ -3793,12 +3846,12 @@ msgid "Open"
msgstr "打开"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_form
msgid "Open Document"
msgstr "打开单据"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_form
msgid "Open Parent Document"
msgstr "打开上级单据"
@@ -3811,14 +3864,14 @@ msgstr "打开聊天"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread_windows/thread_window.js:199
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:190
#, python-format
msgid "Open document"
-msgstr ""
+msgstr "打开文件"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread_windows/thread_window.js:201
+#: code:addons/mail/static/src/js/thread_windows/thread_window.js:192
#, python-format
msgid "Open in Discuss"
msgstr "在讨论打开"
@@ -3871,7 +3924,8 @@ msgid "Other"
msgstr "其他"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
msgid "Outgoing"
msgstr "出局"
@@ -3901,7 +3955,7 @@ msgid "Overdue"
msgstr "逾期"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Override author's email"
msgstr "覆盖作者电子邮件"
@@ -3914,10 +3968,10 @@ msgstr "所有者"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:31
+#: code:addons/mail/static/src/xml/thread.xml:40
#, python-format
msgid "PDF file"
-msgstr ""
+msgstr "PDF文件"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_message_subtype__parent_id
@@ -3979,12 +4033,12 @@ msgstr "业务伙伴特征"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_readonly
msgid "Partner Readonly"
-msgstr ""
+msgstr "业务合作伙伴只读"
#. module: mail
#: model:ir.model,name:mail.model_mail_resend_partner
msgid "Partner with additionnal information for mail resend"
-msgstr ""
+msgstr "业务伙伴需要额外信息重发电邮"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__needaction_partner_ids
@@ -3997,33 +4051,33 @@ msgstr "待处理的业务伙伴"
#: selection:mail.compose.message,moderation_status:0
#: selection:mail.message,moderation_status:0
msgid "Pending Moderation"
-msgstr ""
+msgstr "待调节"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:406
+#: code:addons/mail/static/src/xml/thread.xml:424
#, python-format
msgid "Pending moderation"
-msgstr ""
+msgstr "待调节"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:123
+#: code:addons/mail/static/src/xml/thread.xml:139
#, python-format
msgid "Pending moderation messages appear here."
-msgstr ""
+msgstr "待新的调节消息出现在这里。"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_channel__moderation_notify
msgid ""
"People receive an automatic notification about their message being waiting "
"for moderation."
-msgstr ""
+msgstr "消息有待调节的人会收到自动通知"
#. module: mail
#: selection:mail.moderation,status:0
msgid "Permanent Ban"
-msgstr ""
+msgstr "永久禁止"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__auto_delete
@@ -4064,9 +4118,9 @@ msgid "Planned activities"
msgstr "计划的活动"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
msgid "Planned in"
-msgstr ""
+msgstr "计划于"
#. module: mail
#. openerp-web
@@ -4076,16 +4130,16 @@ msgid "Please complete customer's informations"
msgstr "请填写客户的信息"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "Please contact us instead using"
-msgstr ""
+msgstr "不要使用,请联系我们"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:526
+#: code:addons/mail/static/src/xml/thread.xml:544
#, python-format
msgid "Please wait"
-msgstr ""
+msgstr "请稍等"
#. module: mail
#. openerp-web
@@ -4101,6 +4155,9 @@ msgid ""
"- Handle by Emails: notifications are sent to your email address\n"
"- Handle in Odoo: notifications appear in your Odoo Inbox"
msgstr ""
+"处理聊天通知的规则:\n"
+"- 通过电邮处理: 通知会发送至您的电邮地址\n"
+"- 系统内部处理: 通知会出现在Odoo 收件箱"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_alias__alias_contact
@@ -4119,9 +4176,9 @@ msgstr ""
"- followers: 只有相关文件或下列频道成员的跟随者\n"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_notification_borders
-#: model:ir.ui.view,arch_db:mail.mail_notification_light
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_borders
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "Powered by"
msgstr "官方技术支持"
@@ -4131,7 +4188,7 @@ msgid "Preceding Activities"
msgstr "前活动"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Preferred reply address"
msgstr "首选回复地址"
@@ -4146,19 +4203,19 @@ msgstr "首选的响应地址(可以在这里用占位符)"
#: code:addons/mail/static/src/xml/activity.xml:70
#: code:addons/mail/static/src/xml/discuss.xml:275
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:47
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
#, python-format
msgid "Preview"
msgstr "预览"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "Preview of"
msgstr "预览"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:76
+#: code:addons/mail/static/src/xml/thread.xml:92
#, python-format
msgid "Previous"
msgstr "以前"
@@ -4170,14 +4227,14 @@ msgstr "前一活动类型"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:60
+#: code:addons/mail/static/src/xml/thread.xml:76
#, python-format
msgid "Print"
msgstr "打印"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__public
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Privacy"
msgstr "隐私"
@@ -4191,7 +4248,7 @@ msgstr "私人频道"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/discuss.js:1346
+#: code:addons/mail/static/src/js/discuss.js:1348
#, python-format
msgid "Public Channels"
msgstr "公众频道"
@@ -4216,7 +4273,7 @@ msgstr "Re:"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:382
+#: code:addons/mail/static/src/xml/thread.xml:400
#, python-format
msgid "Ready"
msgstr "就绪"
@@ -4227,13 +4284,14 @@ msgid "Ready to Send"
msgstr "准备好发送"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0
msgid "Received"
msgstr "已接收"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel_partner__partner_id
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid "Recipient"
msgstr "收件人"
@@ -4243,8 +4301,8 @@ msgstr "收件人"
#: model:ir.model.fields,field_description:mail.field_mail_message__partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_resend_message__partner_ids
#: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__partner_ids
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
-#: model:ir.ui.view,arch_db:mail.view_message_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_form
msgid "Recipients"
msgstr "收件人"
@@ -4271,9 +4329,9 @@ msgid "References"
msgstr "参考"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "Regards,"
-msgstr ""
+msgstr "祝愿"
#. module: mail
#. openerp-web
@@ -4287,14 +4345,14 @@ msgstr "拒绝"
#: code:addons/mail/static/src/xml/discuss.xml:186
#, python-format
msgid "Reject selected messages"
-msgstr ""
+msgstr "拒绝选中的消息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:396
+#: code:addons/mail/static/src/xml/thread.xml:414
#, python-format
msgid "Reject |"
-msgstr ""
+msgstr "拒绝 |"
#. module: mail
#: selection:mail.compose.message,moderation_status:0
@@ -4329,7 +4387,7 @@ msgid "Related Document Model Name"
msgstr "相关的单据模型名称"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
msgid "Related Message"
msgstr "相关的消息"
@@ -4350,20 +4408,20 @@ msgstr "提醒"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:396
+#: code:addons/mail/static/src/xml/thread.xml:414
#, python-format
msgid "Remove message with explanation"
-msgstr ""
+msgstr "删除带有注释的消息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:398
+#: code:addons/mail/static/src/xml/thread.xml:416
#, python-format
msgid "Remove message without explanation"
-msgstr ""
+msgstr "删除没有注释的消息"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Remove the contextual action to use this template on related documents"
msgstr "移除上下文动作,使用相关单据的模板。"
@@ -4376,8 +4434,8 @@ msgstr "移除此关注者"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:325
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: code:addons/mail/static/src/xml/thread.xml:343
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "Reply"
msgstr "回复"
@@ -4409,24 +4467,24 @@ msgstr "报告文件名"
#. module: mail
#: model:ir.actions.act_window,name:mail.mail_resend_message_action
msgid "Resend mail"
-msgstr ""
+msgstr "重发邮件"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid "Resend to selected"
-msgstr ""
+msgstr "重发至已选中"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend_wizard_id
msgid "Resend wizard"
-msgstr ""
+msgstr "重发向导"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:53
+#: code:addons/mail/static/src/xml/thread.xml:69
#, python-format
msgid "Reset Zoom"
-msgstr ""
+msgstr "重置缩放"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_id
@@ -4441,8 +4499,8 @@ msgid "Responsible User"
msgstr "责任用户"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
msgid "Retry"
msgstr "重试"
@@ -4458,13 +4516,13 @@ msgstr "富文本/HTML消息"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:57
+#: code:addons/mail/static/src/xml/thread.xml:73
#, python-format
msgid "Rotate"
-msgstr ""
+msgstr "替换"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_email_template_search
+#: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
msgid "SMTP Server"
msgstr "SMTP 服务器"
@@ -4474,12 +4532,12 @@ msgid "Sample Document"
msgstr "示例文档"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Save as a new template"
msgstr "保存为新模版"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Save as new template"
msgstr "保存为新模版"
@@ -4491,19 +4549,19 @@ msgid "Say something"
msgstr "说些什么..."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
msgid "Schedule"
msgstr "安排"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:70
+#: code:addons/mail/static/src/xml/chatter.xml:93
#, python-format
msgid "Schedule activity"
msgstr "安排活动"
#. module: mail
-#: code:addons/mail/models/mail_activity.py:378
+#: code:addons/mail/models/mail_activity.py:383
#, python-format
msgid "Schedule an Activity"
msgstr "安排活动"
@@ -4523,7 +4581,7 @@ msgstr "计划日期"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__scheduled_date
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Scheduled Send Date"
msgstr "安排的发送日期"
@@ -4533,19 +4591,19 @@ msgid "Search"
msgstr "搜索"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
msgid "Search Alias"
msgstr "搜索别名"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_search
msgid "Search Groups"
msgstr "搜索群组"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_moderation_view_search
+#: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search
msgid "Search Moderation List"
-msgstr ""
+msgstr "搜索调节列表"
#. module: mail
#. openerp-web
@@ -4572,7 +4630,7 @@ msgstr ""
"如果这是个关系型字段,你可以选择关系型字段的目标字段。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_resend_message_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_resend_message_view_form
msgid ""
"Select the action to do on each mail and correct the email address if "
"needed. The modified address will be saved on the corresponding contact."
@@ -4588,7 +4646,7 @@ msgstr "选择用户组"
#: code:addons/mail/static/src/js/composers/basic_composer.js:49
#: code:addons/mail/static/src/js/discuss.js:148
#: code:addons/mail/static/src/xml/composer.xml:16
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
#, python-format
msgid "Send"
msgstr "发送"
@@ -4596,7 +4654,7 @@ msgstr "发送"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_resend_partner__resend
msgid "Send Again"
-msgstr ""
+msgstr "再次发送"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_partner_mass_mail
@@ -4615,15 +4673,15 @@ msgstr "发送邮件( %s)"
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:72
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:49
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
#, python-format
msgid "Send Now"
msgstr "现在发送"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:63
+#: code:addons/mail/static/src/xml/chatter.xml:86
#, python-format
msgid "Send a message"
msgstr "发送消息"
@@ -4636,9 +4694,9 @@ msgid "Send explanation to author"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Send guidelines"
-msgstr ""
+msgstr "发送指南"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_guidelines
@@ -4647,7 +4705,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:63
+#: code:addons/mail/static/src/xml/chatter.xml:86
#, python-format
msgid "Send message"
msgstr "发送消息"
@@ -4681,17 +4739,17 @@ msgstr "以邮件形式发送"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:379
-#: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0
-#: selection:mail.notification,email_status:0
+#: code:addons/mail/static/src/xml/thread.xml:397
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
+#: selection:mail.mail,state:0 selection:mail.notification,email_status:0
#, python-format
msgid "Sent"
msgstr "已汇"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_notification_email
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
msgid "Sent by"
-msgstr ""
+msgstr "发送者"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_notification__is_email
@@ -4705,8 +4763,8 @@ msgid "Sequence"
msgstr "序号"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form
-#: model:ir.ui.view,arch_db:mail.mail_shortcode_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_shortcode_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_shortcode_view_tree
msgid "Shortcodes"
msgstr "短码"
@@ -4716,8 +4774,8 @@ msgid "Shortcut"
msgstr "快捷"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "Show all records which has next action date is before today"
msgstr "显示在今天之前的下一个行动日期的所有记录"
@@ -4767,7 +4825,7 @@ msgstr "群组的小尺寸照片. 被自动缩放到64x64px,保持纵横比。
#. module: mail
#: selection:ir.actions.server,activity_user_type:0
msgid "Specific User"
-msgstr ""
+msgstr "特定用户"
#. module: mail
#: model:ir.model.fields,help:mail.field_mail_activity_type__res_model_id
@@ -4778,6 +4836,13 @@ msgstr "如果活动应特定于某个模型并且在管理其他模型的活动
#. module: mail
#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:47
+#, python-format
+msgid "Split"
+msgstr "拆分"
+
+#. module: mail
+#. openerp-web
#: code:addons/mail/static/src/js/services/mail_manager.js:1237
#: code:addons/mail/static/src/xml/discuss.xml:33
#: code:addons/mail/static/src/xml/discuss.xml:208
@@ -4796,8 +4861,8 @@ msgstr "状态"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_mail__state
#: model:ir.model.fields,field_description:mail.field_mail_moderation__status
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Status"
msgstr "状态"
@@ -4844,18 +4909,18 @@ msgstr "主题"
#. module: mail
#: model:ir.model.fields,help:mail.field_email_template_preview__subject
#: model:ir.model.fields,help:mail.field_mail_template__subject
-#: model:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
msgid "Subject (placeholders may be used here)"
msgstr "主题(可以在这里使用占位符)"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
+#: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form
msgid "Subject..."
msgstr "主题..."
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:347
+#: code:addons/mail/static/src/xml/thread.xml:365
#, python-format
msgid "Subject:"
msgstr "主题:"
@@ -4870,7 +4935,7 @@ msgstr "替换"
#: model:ir.model.fields,field_description:mail.field_mail_followers__subtype_ids
#: model:ir.model.fields,field_description:mail.field_mail_mail__subtype_id
#: model:ir.model.fields,field_description:mail.field_mail_message__subtype_id
-#: model:ir.ui.view,arch_db:mail.view_message_subtype_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_message_subtype_tree
msgid "Subtype"
msgstr "子类型"
@@ -4923,19 +4988,19 @@ msgstr "模板预览"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_email_template_tree_all
#: model:ir.ui.menu,name:mail.menu_email_templates
-#: model:ir.ui.view,arch_db:mail.email_template_form
-#: model:ir.ui.view,arch_db:mail.email_template_tree
-#: model:ir.ui.view,arch_db:mail.view_email_template_search
+#: model_terms:ir.ui.view,arch_db:mail.email_template_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_email_template_search
msgid "Templates"
msgstr "模板"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
msgid "Thank you!"
msgstr "谢谢!"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "The"
msgstr "此"
@@ -4951,7 +5016,7 @@ msgid "The email address must be unique per channel !"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "The email sent to"
msgstr ""
@@ -4994,8 +5059,8 @@ msgstr ""
#. module: mail
#: code:addons/mail/models/mail_activity.py:240
-#: code:addons/mail/models/mail_message.py:683
-#: code:addons/mail/models/mail_message.py:853
+#: code:addons/mail/models/mail_message.py:694
+#: code:addons/mail/models/mail_message.py:864
#, python-format
msgid ""
"The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
@@ -5018,7 +5083,7 @@ msgid "The type of document this template can be used with"
msgstr "该模板可使用的文档类型"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_origin_link
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
msgid "This"
msgstr "此"
@@ -5049,7 +5114,7 @@ msgid ""
msgstr "这个小组是由非成员可见。非可见小组可以通过邀请按钮添加成员。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_search
msgid "Thread"
msgstr "线程"
@@ -5078,7 +5143,7 @@ msgstr "待办"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:16
+#: code:addons/mail/static/src/xml/chatter.xml:39
#: code:addons/mail/static/src/xml/thread_window.xml:10
#, python-format
msgid "To:"
@@ -5088,7 +5153,7 @@ msgstr "至:"
#. openerp-web
#: code:addons/mail/static/src/js/activity.js:83
#: code:addons/mail/static/src/js/models/messages/abstract_message.js:107
-#: code:addons/mail/static/src/xml/systray.xml:85
+#: code:addons/mail/static/src/xml/systray.xml:96
#: selection:mail.activity,state:0
#: selection:mail.activity.mixin,activity_state:0
#: selection:res.partner,activity_state:0
@@ -5097,8 +5162,8 @@ msgid "Today"
msgstr "今日"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_search
-#: model:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
+#: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
msgid "Today Activities"
msgstr "今天的活动"
@@ -5110,7 +5175,7 @@ msgid "Tomorrow"
msgstr "明天"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Topics discussed in this group..."
msgstr "在该群组中讨论的话题 ..."
@@ -5125,13 +5190,13 @@ msgstr "在单独的模型中存储跟踪值。该字段允许重建跟踪,以
#. module: mail
#: model:ir.model.fields,field_description:mail.field_ir_model_fields__track_visibility
-#: model:ir.ui.view,arch_db:mail.view_message_form
+#: model_terms:ir.ui.view,arch_db:mail.view_message_form
msgid "Tracking"
msgstr "追踪"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
-#: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tracking_value_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tracking_value_tree
msgid "Tracking Value"
msgstr "追踪值"
@@ -5160,10 +5225,19 @@ msgid "Tree"
msgstr "树形"
#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/activity_view.xml:23
+#, python-format
+msgid ""
+"Try to add some activity on records, or make sure that\n"
+" there is no active filter in the search bar."
+msgstr ""
+
+#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_compose_message__message_type
#: model:ir.model.fields,field_description:mail.field_mail_mail__message_type
#: model:ir.model.fields,field_description:mail.field_mail_message__message_type
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
msgid "Type"
msgstr "类型"
@@ -5203,13 +5277,13 @@ msgid "Unable to connect to SMTP Server"
msgstr "无法连接到 SMTP 服务器"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:2184
+#: code:addons/mail/models/mail_thread.py:2204
#, python-format
msgid "Unable to log message, please configure the sender's email address."
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:2149
+#: code:addons/mail/models/mail_thread.py:2169
#, python-format
msgid "Unable to notify message, please configure the sender's email address."
msgstr ""
@@ -5222,7 +5296,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:154
+#: code:addons/mail/static/src/js/thread_windows/abstract_thread_window.js:163
#, python-format
msgid "Undefined"
msgstr "未定义的"
@@ -5241,7 +5315,7 @@ msgid ""
msgstr "可惜 这个电子邮件别名已经被使用,请选择一个不一样的"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_type_view_tree
msgid "Unit"
msgstr "单位"
@@ -5251,9 +5325,11 @@ msgid "Unit of delay"
msgstr ""
#. module: mail
+#: code:addons/mail/models/mail_notification.py:52
#: selection:mail.notification,failure_type:0
-msgid "Unknown error occured"
-msgstr ""
+#, python-format
+msgid "Unknown error"
+msgstr "未知错误"
#. module: mail
#: model:ir.model.fields,field_description:mail.field_mail_blacklist__message_unread
@@ -5276,7 +5352,7 @@ msgstr "未读消息计数器"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/abstract_thread_window.xml:35
-#: model:ir.ui.view,arch_db:mail.view_message_search
+#: model_terms:ir.ui.view,arch_db:mail.view_message_search
#, python-format
msgid "Unread messages"
msgstr "未读信息"
@@ -5329,14 +5405,14 @@ msgstr "更新记录"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:513
+#: code:addons/mail/static/src/xml/thread.xml:531
#, python-format
msgid "Uploaded"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:505
+#: code:addons/mail/static/src/xml/thread.xml:523
#, python-format
msgid "Uploading"
msgstr "上传中"
@@ -5367,7 +5443,7 @@ msgid "Use template"
msgstr "使用模版"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "Use your own email servers"
msgstr "使用你自己的邮件服务器"
@@ -5379,9 +5455,9 @@ msgstr "用于排序子类型。"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/web_kanban_activity.xml:55
-#: model:ir.ui.view,arch_db:mail.view_mail_alias_search
-#: model:ir.ui.view,arch_db:mail.view_mail_form
-#: model:ir.ui.view,arch_db:mail.view_mail_tree
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_alias_search
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_tree
#, python-format
msgid "User"
msgstr "用户"
@@ -5411,7 +5487,7 @@ msgid "Users in this channel: %s %s and you."
msgstr "在此频道的用户 : %s %s 以及 你."
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid ""
"Using your own email server is required to send/receive emails in Community "
"and Enterprise versions. Online users already benefit from a ready-to-use "
@@ -5422,22 +5498,22 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:32
+#: code:addons/mail/static/src/xml/thread.xml:41
#, python-format
msgid "Video"
msgstr "视频"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:732
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
-#: model:ir.ui.view,arch_db:mail.message_activity_assigned
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
+#: code:addons/mail/models/mail_thread.py:747
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
#, python-format
msgid "View"
msgstr "查看"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:730
+#: code:addons/mail/models/mail_thread.py:745
#, python-format
msgid "View %s"
msgstr "视图 %s"
@@ -5450,7 +5526,14 @@ msgstr "视图类型"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:43
+#: code:addons/mail/static/src/xml/chatter.xml:99
+#, python-format
+msgid "View all the attachments of the current record"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:57
#, python-format
msgid "Viewer"
msgstr ""
@@ -5513,7 +5596,7 @@ msgid "Whether this model supports messages and notifications."
msgstr "该模型是否支持消息和通知。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid "Who can follow the group's activities?"
msgstr "谁能关注群组的活动?"
@@ -5574,7 +5657,7 @@ msgid "You are going to discard 1 message. Do you confirm the action?"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_view_form
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form
msgid ""
"You are going to send the guidelines to all the subscribers. Do you confirm "
"the action?"
@@ -5603,7 +5686,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:119
+#: code:addons/mail/static/src/xml/thread.xml:135
#, python-format
msgid ""
"You can mark any message as 'starred', and it shows up in this mailbox."
@@ -5628,7 +5711,7 @@ msgid ""
msgstr "你不能删除这些群组,因为整个公司群组被其它模块引用。"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_user_assigned
+#: model_terms:ir.ui.view,arch_db:mail.message_user_assigned
msgid "You have been assigned to the"
msgstr "你被指派到"
@@ -5640,13 +5723,13 @@ msgid "You have been invited to: "
msgstr "你已被邀请:"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
+#: model_terms:ir.ui.view,arch_db:mail.mail_channel_notify_moderation
msgid "You have messages to moderate, please go for the proceedings."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:122
+#: code:addons/mail/static/src/xml/thread.xml:138
#, python-format
msgid "You have no message to moderate"
msgstr ""
@@ -5681,8 +5764,8 @@ msgid "You:"
msgstr "您:"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_notification_light
-#: model:ir.ui.view,arch_db:mail.mail_notification_paynow
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_light
+#: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow
msgid "Your"
msgstr ""
@@ -5695,7 +5778,7 @@ msgstr "您的短信尚未发送。"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:406
+#: code:addons/mail/static/src/xml/thread.xml:424
#, python-format
msgid "Your message is pending moderation"
msgstr ""
@@ -5715,14 +5798,14 @@ msgstr "你的模板需要定义email_from"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:52
+#: code:addons/mail/static/src/xml/thread.xml:68
#, python-format
msgid "Zoom In"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:54
+#: code:addons/mail/static/src/xml/thread.xml:70
#, python-format
msgid "Zoom Out"
msgstr ""
@@ -5738,13 +5821,13 @@ msgid "after validation date"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1059
+#: code:addons/mail/models/mail_thread.py:1074
#, python-format
msgid "alias %s: %s"
msgstr "别名 %:%"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
msgid "assigned you an activity"
msgstr ""
@@ -5756,20 +5839,20 @@ msgstr "base.partner.merge.automatic.wizard"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/activity.xml:43
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "by"
msgstr "by"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid ""
"cannot be processed. This address\n"
" is used to collect replies and should not be used to directly contact"
msgstr ""
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_origin_link
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
msgid "created"
msgstr "创建"
@@ -5779,21 +5862,28 @@ msgid "days"
msgstr "天"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:344
+#: code:addons/mail/models/mail_thread.py:357
#, python-format
msgid "document"
msgstr "单据"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_activity_done
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_done
msgid ""
"done\n"
" by"
msgstr "由谁完成 \n"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
-#: model:ir.ui.view,arch_db:mail.view_server_action_form_template
+#. openerp-web
+#: code:addons/mail/static/src/xml/thread.xml:45
+#, python-format
+msgid "e.g. 1-5, 7, 8-9"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
+#: model_terms:ir.ui.view,arch_db:mail.view_server_action_form_template
msgid "e.g. Discuss proposal"
msgstr "例如.讨论提案"
@@ -5812,7 +5902,7 @@ msgid "for"
msgstr "由于"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_origin_link
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
msgid "from:"
msgstr "从:"
@@ -5822,7 +5912,7 @@ msgid "general"
msgstr "一般"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_origin_link
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
msgid "has been"
msgstr "已经"
@@ -5849,6 +5939,11 @@ msgid "ir.actions.server"
msgstr "ir.actions.server"
#. module: mail
+#: model:ir.model,name:mail.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: mail
#: model:ir.model,name:mail.model_ir_autovacuum
msgid "ir.autovacuum"
msgstr "ir.autovacuum"
@@ -5864,26 +5959,26 @@ msgid "mail.alias.mixin"
msgstr "mail.alias.mixin"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1036
+#: code:addons/mail/models/mail_thread.py:1051
#, python-format
msgid "model %s does not accept document creation"
msgstr "模型 % 不接受文档创建"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1031
+#: code:addons/mail/models/mail_thread.py:1046
#, python-format
msgid "model %s does not accept document update"
msgstr "模型 % 不接受文档更新"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1024
+#: code:addons/mail/models/mail_thread.py:1039
#, python-format
msgid ""
"model %s does not accept document update, fall back on document creation"
msgstr "模型 % 不接受文档更新,将在文档创建中退回"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_origin_link
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
msgid "modified"
msgstr "修改"
@@ -5893,7 +5988,7 @@ msgid "months"
msgstr "月"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
msgid "mycompany.odoo.com"
msgstr "mycompany.odoo.com"
@@ -5906,9 +6001,9 @@ msgstr "现在"
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:306
-#: model:ir.ui.view,arch_db:mail.message_activity_assigned
-#: model:ir.ui.view,arch_db:mail.view_mail_form
+#: code:addons/mail/static/src/xml/thread.xml:323
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
+#: model_terms:ir.ui.view,arch_db:mail.view_mail_form
#, python-format
msgid "on"
msgstr "在"
@@ -5922,7 +6017,7 @@ msgid "or"
msgstr "或"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1006
+#: code:addons/mail/models/mail_thread.py:1021
#, python-format
msgid ""
"posting a message without model should be with a null res_id (private "
@@ -5930,7 +6025,7 @@ msgid ""
msgstr "发布无模型消息应使用无效 res_id(私人信息),收到 %"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1010
+#: code:addons/mail/models/mail_thread.py:1025
#, python-format
msgid ""
"posting a message without model should be with a parent_id (private message)"
@@ -5956,18 +6051,18 @@ msgid "read more"
msgstr "阅读全文"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.email_template_preview_form
+#: model_terms:ir.ui.view,arch_db:mail.email_template_preview_form
msgid "record:"
msgstr "记录:"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1028
+#: code:addons/mail/models/mail_thread.py:1043
#, python-format
msgid "reply to missing document (%s,%s)"
msgstr "对缺失文档的回复 (%,%)"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1021
+#: code:addons/mail/models/mail_thread.py:1036
#, python-format
msgid "reply to missing document (%s,%s), fall back on new document creation"
msgstr "对丢失文档的回复 (%,%),在新文档创建中退回"
@@ -5978,7 +6073,7 @@ msgid "res.config.settings"
msgstr "设置-基础设置"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1006
+#: code:addons/mail/models/mail_thread.py:1021
#, python-format
msgid "resetting thread_id"
msgstr "重新设置 thread_id"
@@ -6002,46 +6097,46 @@ msgid "restricted to known authors"
msgstr "仅限于已知的作者"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1010
-#: code:addons/mail/models/mail_thread.py:1028
-#: code:addons/mail/models/mail_thread.py:1031
-#: code:addons/mail/models/mail_thread.py:1036
-#: code:addons/mail/models/mail_thread.py:1059
+#: code:addons/mail/models/mail_thread.py:1025
+#: code:addons/mail/models/mail_thread.py:1043
+#: code:addons/mail/models/mail_thread.py:1046
+#: code:addons/mail/models/mail_thread.py:1051
+#: code:addons/mail/models/mail_thread.py:1074
#, python-format
msgid "skipping"
msgstr "跳过"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.mail_bounce_catchall
+#: model_terms:ir.ui.view,arch_db:mail.mail_bounce_catchall
msgid "team."
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/chatter.xml:22
+#: code:addons/mail/static/src/xml/chatter.xml:45
#, python-format
msgid "this document"
msgstr "此单据"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_activity_assigned
+#: model_terms:ir.ui.view,arch_db:mail.message_activity_assigned
msgid "to close for"
msgstr ""
#. module: mail
-#: code:addons/mail/models/mail_thread.py:1059
+#: code:addons/mail/models/mail_thread.py:1074
#, python-format
msgid "unknown error"
msgstr "未知错误"
#. module: mail
-#: code:addons/mail/models/mail_thread.py:999
+#: code:addons/mail/models/mail_thread.py:1014
#, python-format
msgid "unknown target model %s"
msgstr "位置目标模型 %s"
#. module: mail
-#: model:ir.ui.view,arch_db:mail.message_notification_email
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
msgid "using"
msgstr ""