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

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

diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
index 06e66ce..ffd486d 100644 (file)
--- a/addons/auth_oauth/i18n/zh_CN.po
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-11-04 05:29+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-08-15 06:55+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-11-05 07:41+0000\n"
+"X-Generator: Launchpad (build 17223)\n"
 
 #. module: auth_oauth
 #: code:addons/auth_oauth/controllers/main.py:99
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "访问被拒绝（请检查是否输入了正确的master密码）"
 
 #. module: auth_oauth
 #: field:base.config.settings,auth_oauth_facebook_enabled:0
@@ -63,12 +63,12 @@ msgstr "Client ID"
 #. module: auth_oauth
 #: field:auth.oauth.provider,create_uid:0
 msgid "Created by"
-msgstr ""
+msgstr "创建人"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "创建"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,data_endpoint:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: auth_oauth
 #: field:auth.oauth.provider,write_uid:0
 msgid "Last Updated by"
-msgstr ""
+msgstr "最后更新"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,write_date:0
@@ -123,7 +123,7 @@ msgstr "OAuth2 provider"
 #. module: auth_oauth
 #: view:res.users:auth_oauth.view_users_form
 msgid "Oauth"
-msgstr ""
+msgstr "OAuth身份认证"
 
 #. module: auth_oauth
 #: help:res.users,oauth_uid:0
@@ -149,7 +149,7 @@ msgstr "作用域"
 #: code:addons/auth_oauth/controllers/main.py:97
 #, python-format
 msgid "Sign up is not allowed on this database."
-msgstr ""
+msgstr "此数据库不允许注册"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
@@ -168,7 +168,7 @@ msgid ""
 "You do not have access to this database or your invitation has expired. "
 "Please ask for an invitation and be sure to follow the link in your "
 "invitation email."
-msgstr ""
+msgstr "您无权访问此数据库或者您的邀请已经过期.请申请一个新的邀请并在您的邀请邮件中确认。"
 
 #. module: auth_oauth
 #: view:auth.oauth.provider:auth_oauth.view_oauth_provider_form