Merge branch 'master' of https://github.com/odoo/odoo

[odoo/odoo.git] / addons / mail / i18n / zh_CN.po

diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 9f017dd..4f38c93 100644 (file)
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-09-23 16:27+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-10-28 05:22+0000\n"
+"Last-Translator: jeffery chen fan <jeffery9@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-24 09:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-10-29 07:49+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:384
@@ -48,14 +48,14 @@ msgstr "（没有电子邮件地址）"
 #, python-format
 msgid ""
 "<div><p>Hello,</p><p>%s invited you to follow %s document: %s.<p></div>"
-msgstr ""
+msgstr "<div><p>你好，</p><p>%s 邀请你关注 %s 文档: %s.<p></div>"
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:47
 #, python-format
 msgid ""
 "<div><p>Hello,</p><p>%s invited you to follow a new document.</p></div>"
-msgstr ""
+msgstr "<div><p>你好，</p><p>%s 邀请你关注新文档。</p></div>"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:134
@@ -195,7 +195,7 @@ msgstr "订阅时，默认激活"
 #. module: mail
 #: view:mail.alias:mail.view_mail_alias_search
 msgid "Active"
-msgstr ""
+msgstr "激活"
 
 #. module: mail
 #: field:mail.compose.message,active_domain:0
@@ -263,7 +263,7 @@ msgstr "别名域"
 #. module: mail
 #: field:mail.alias,alias_name:0
 msgid "Alias Name"
-msgstr ""
+msgstr "别名"
 
 #. module: mail
 #: field:mail.alias,alias_domain:0
@@ -284,7 +284,7 @@ msgstr "别名"
 #. module: mail
 #: selection:res.partner,notify_email:0
 msgid "All Messages"
-msgstr ""
+msgstr "全部消息"
 
 #. module: mail
 #: view:mail.compose.message:mail.email_compose_message_wizard_form
@@ -314,7 +314,7 @@ msgstr ""
 #: code:addons/mail/static/src/js/mail_followers.js:101
 #, python-format
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
@@ -332,7 +332,7 @@ msgstr "附加一个文件"
 #. module: mail
 #: view:mail.compose.message:mail.email_compose_message_wizard_form
 msgid "Attach a file"
-msgstr ""
+msgstr "附加文件"
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
@@ -478,7 +478,7 @@ msgstr "内容"
 #. module: mail
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "内容类型"
 
 #. module: mail
 #: field:mail.compose.message,body:0
@@ -495,7 +495,7 @@ msgstr "内容"
 #: field:mail.message.subtype,create_uid:0
 #: field:mail.wizard.invite,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "创建者"
 
 #. module: mail
 #: field:mail.alias,create_date:0
@@ -506,7 +506,7 @@ msgstr ""
 #: field:mail.message.subtype,create_date:0
 #: field:mail.wizard.invite,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "创建在"
 
 #. module: mail
 #: view:mail.mail:mail.view_mail_search
@@ -529,7 +529,7 @@ msgstr "当前用户有关联到这条消息的未读的提醒"
 #: code:addons/mail/res_partner.py:31
 #, python-format
 msgid "Customers"
-msgstr ""
+msgstr "客户"
 
 #. module: mail
 #: field:mail.compose.message,date:0