The following commit has been merged in the master branch: commit 98b8043518a68adba651318de5ba2f50f979e023 Author: shanyan baishui Siramizu@gmail.com Date: Tue Feb 23 11:58:42 2010 +0200
Translation update done using Pootle.
diff --git a/po/zh_CN.po b/po/zh_CN.po index deccd05..e6dd6e9 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 11:54+0200\n" +"PO-Revision-Date: 2010-02-23 11:58+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -984,6 +984,11 @@ msgid "" "['controluser']</a></tt> and <tt><a href="#cfg_Servers_controlpass" class=" ""configrule"> $cfg['Servers'][$i]['controlpass']</a></tt> settings." msgstr "" +"你必须在 <tt>config.inc.php</tt> 中的 <tt><a href="#cfg_Servers_controluser" " +"class="configrule"> $cfg['Servers'][$i]['controluser']</a></tt> 和 <tt><a " +"href="#cfg_Servers_controlpass" class="configrule"> " +"$cfg['Servers'][$i]['controlpass']</a></tt> 设置中设置好<a " +"href="#controluser">控制用户</a>。"
#. type: Content of: <html><body><div><ul><li> #: ../phpMyAdmin/Documentation.html:416