[MERGE] from master

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

diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index aaf1e7b..3491ade 100644 (file)
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/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-31 08:03+0000\n"
+"Last-Translator: 卓忆科技 <zhanghao@jointd.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 08:58+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-11-01 07:13+0000\n"
+"X-Generator: Launchpad (build 17211)\n"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.set_password_email
@@ -50,6 +50,33 @@ msgid ""
 "                \n"
 "            "
 msgstr ""
+"\n"
+"                \n"
+"                    <p>\n"
+"                        ${object.name},\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        您被邀请链接到 \"${object.company_id.name}\"为了获取您在 "
+"Odoo的文件.\n"
+"                    </p>\n"
+"                    <p>\n"
+"                        接收邀请, 点击下面的链接:\n"
+"                    </p>\n"
+"                    <ul>\n"
+"                        <li><a href=\"${object.signup_url}\">Accept "
+"invitation to \"${object.company_id.name}\"</a></li>\n"
+"                    </ul>\n"
+"                    <p>\n"
+"                        谢谢,\n"
+"                    </p>\n"
+"                    <pre>\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    </pre>\n"
+"                \n"
+"            "
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -63,18 +90,24 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p> Odoo 帐号的密码重置请求的链接在此电子邮件内.</p>\n"
+"\n"
+"<p>您可以通过下面的链接修改您的密码 <a href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>注: 如果您不想更改密码您可以忽略此邮件.</p>"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.set_password_email
 msgid "${object.company_id.name} invitation to connect on Odoo"
-msgstr ""
+msgstr "${object.company_id.name} 邀请链接到Odoo"
 
 #. module: auth_signup
 #: view:res.users:auth_signup.res_users_form_view
 msgid ""
 "A password reset has been requested for this user. An email containing the "
 "following link has been sent:"
-msgstr ""
+msgstr "当前用户密码重置的请求已提交，一封包含重置密码链接的邮件已被发送"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -90,19 +123,19 @@ msgstr "允许外部用户注册"
 #: code:addons/auth_signup/controllers/main.py:78
 #, python-format
 msgid "An email has been sent with credentials to reset your password"
-msgstr ""
+msgstr "一封包含验证证书以重置您的密码的电子邮件已经发送"
 
 #. module: auth_signup
 #: view:res.users:auth_signup.res_users_form_view
 msgid ""
 "An invitation email containing the following subscription link has been sent:"
-msgstr ""
+msgstr "含有下列订阅链接邀请邮件已被发送："
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:125
 #, python-format
 msgid "Authentification Failed."
-msgstr ""
+msgstr "认证失败"
 
 #. module: auth_signup
 #: view:website:auth_signup.reset_password
@@ -125,7 +158,7 @@ msgstr "确认密码"
 #: code:addons/auth_signup/controllers/main.py:80
 #, python-format
 msgid "Could not reset your password"
-msgstr ""
+msgstr "无法重置您的密码"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
@@ -146,7 +179,7 @@ msgstr "密码错误"
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Never Connected"
-msgstr ""
+msgstr "从未连接"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
@@ -156,7 +189,7 @@ msgstr "合作伙伴"
 #. module: auth_signup
 #: view:website:auth_signup.fields
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
@@ -176,12 +209,12 @@ msgstr "重置密码"
 #. module: auth_signup
 #: view:res.users:auth_signup.res_users_form_view
 msgid "Send Reset Password Instructions"
-msgstr ""
+msgstr "发送密码重置指令"
 
 #. module: auth_signup
 #: view:res.users:auth_signup.res_users_form_view
 msgid "Send an Invitation Email"
-msgstr ""
+msgstr "发送一封邀请邮件"
 
 #. module: auth_signup
 #: view:website:auth_signup.signup
@@ -238,14 +271,14 @@ msgstr "用户"
 #: view:website:auth_signup.fields
 #: view:website:auth_signup.reset_password
 msgid "Your Email"
-msgstr ""
+msgstr "您的电子邮件"
 
 #. module: auth_signup
 #: view:website:auth_signup.fields
 msgid "Your Name"
-msgstr ""
+msgstr "您的姓名"
 
 #. module: auth_signup
 #: view:website:auth_signup.fields
 msgid "e.g. John Doe"
-msgstr ""
+msgstr "例如:约翰"