The following commit has been merged in the master branch: commit 225ed117ffb24d0b0a993f6b5fb34c078bc24f08 Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 13:17:54 2010 +0200

Translation update done using Pootle.

diff --git a/po/zh_CN.po b/po/zh_CN.po index d3c4726..67f4efa 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:16+0200\n" +"PO-Revision-Date: 2010-02-24 13:17+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -11663,6 +11663,17 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" +" 版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n" +" 版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n" +" Olivier Müller <om_at_omnis.ch>\n" +" Robin Johnson <robbat2_at_users.sourceforge.net>\n" +" Alexander M. Turek <me_at_derrabus.de>\n" +" Michal Čihař <michal_at_cihar.com>\n" +" Garvin Hicking <me_at_supergarv.de>\n" +" Michael Keck <mkkeck_at_users.sourceforge.net>\n" +" Sebastian Mendel " +"<cybot_tm_at_users.sourceforge.net>\n" +" [详细信息请参见 Documentation.txt/.html 文件]\n"

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