The following commit has been merged in the master branch: commit b4e363eaad3984099c56bf72a87f9ea3017a2b74 Author: shanyan baishui Siramizu@gmail.com Date: Tue Feb 23 12:16:47 2010 +0200
Translation update done using Pootle.
diff --git a/po/zh_CN.po b/po/zh_CN.po index 57129a2..7e4bcd6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-01-25 13:26+0100\n" -"PO-Revision-Date: 2010-02-23 12:15+0200\n" +"PO-Revision-Date: 2010-02-23 12:16+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -1097,6 +1097,9 @@ msgid "" "authentication mode, you don't need to fill the user/password fields inside " "the <a href="#cfg_Servers" class="configrule">$cfg['Servers']</a> array." msgstr "" +"<abbr title="超文本转移协议 (HyperText Transfer Protocol)">HTTP</abbr> 和 cookie " +"认证不需要填写 <a href="#cfg_Servers" class="configrule">$cfg['Servers']</a> " +"数组中的用户/密码一栏。"
#. type: Content of: <html><body><div><h4> #: ../phpMyAdmin/Documentation.html:466