The following commit has been merged in the master branch: commit a15ac70bc018936ae05c9c9f7378e0af22dd3030 Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 14:30:40 2010 +0200

Translation update done using Pootle.

diff --git a/po/zh_CN.po b/po/zh_CN.po index d869786..0a3c644 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 14:29+0200\n" +"PO-Revision-Date: 2010-02-24 14:30+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -11844,7 +11844,7 @@ msgstr "目前我们将 Sourceforge 的追踪器作为计划表使用:" #: ../phpMyAdmin/TODO:9 #, no-wrap msgid " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=brow..." -msgstr "" +msgstr " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=brow..."

#. type: Plain text #: ../phpMyAdmin/TODO:10