[MERGE] forward port of branch 8.0 up to 3e965ec

This commit is contained in:
Christophe Simonis
2016-06-28 12:23:54 +02:00
141 changed files with 3204 additions and 2440 deletions
+3 -3
View File
@@ -18,8 +18,8 @@ msgstr ""
"Project-Id-Version: Odoo 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-01-21 14:07+0000\n"
"PO-Revision-Date: 2016-06-22 02:43+0000\n"
"Last-Translator: liAnGjiA <liangjia@qq.com>\n"
"PO-Revision-Date: 2016-06-23 14:03+0000\n"
"Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-8/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -329,7 +329,7 @@ msgstr "称呼“客户”的另一种方式"
#: field:base.config.settings,module_auth_oauth:0
msgid ""
"Use external authentication providers, sign in with google, facebook, ..."
msgstr "使用OpenID登陆(Google, Facebook...)"
msgstr "使用OpenID登录(Google, Facebook...)"
#. module: base_setup
#: help:sale.config.settings,module_web_linkedin:0