The following commit has been merged in the master branch: commit ea9b39da12e08287da95e4304be406d35e925dba Author: shanyan baishui <Siramizu@gmail.com> Date: Tue Feb 23 14:02:03 2010 +0200 Translation update done using Pootle. diff --git a/po/zh_CN.po b/po/zh_CN.po index 3eb37ff..0c45428 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 13:57+0200\n" +"PO-Revision-Date: 2010-02-23 14:02+0200\n" "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -1136,6 +1136,9 @@ msgid "" "with '<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' " "authentication mode." msgstr "" +"参见 <a href=\"#faq4_4\"> <abbr title=\"常见问题 (Frequently Asked " +"Questions)\">FAQ</abbr> 4.4</a> 关于不要同时使用 <i>.htaccess</i> 和 '<abbr " +"title=\"超文本转移协议 (HyperText Transfer Protocol)\">HTTP</abbr>' 认证。" #. type: Content of: <html><body><div><h4> #: ../phpMyAdmin/Documentation.html:486 -- phpMyAdmin localized documentation