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

Translation update done using Pootle.

diff --git a/po/zh_CN.po b/po/zh_CN.po index 3cfa393..9b1eaed 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 12:42+0200\n" +"PO-Revision-Date: 2010-02-24 13:10+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -11618,7 +11618,7 @@ msgstr "" #. type: Plain text #: ../phpMyAdmin/README:2 ../phpMyAdmin/TODO:2 ../phpMyAdmin/INSTALL:2 msgid "$Id$" -msgstr "" +msgstr "$Id$"

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