The following commit has been merged in the master branch: commit 9707196156173cb9cc57c1622eb64b8d99f1babb Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 13:25:02 2010 +0200

Translation update done using Pootle.

diff --git a/po/zh_CN.po b/po/zh_CN.po index 64e14db..6bcc2f3 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-24 13:20+0200\n" +"PO-Revision-Date: 2010-02-24 13:25+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -11695,6 +11695,10 @@ msgid "" " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" " GNU General Public License for more details.\n" msgstr "" +" 本软件因希望能对大家有用而发布，\n" +" 但没有任何担保，也没有任何适销性\n" +" 或针对特定用途的隐含的担保。参见\n" +" GNU 通用公共许可协议获得详细信息。\n"

#. type: Plain text #: ../phpMyAdmin/README:35