The following commit has been merged in the master branch: commit 3697b56b9e8b65e461a770579f68a0d0abc87097 Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 11:26:07 2010 +0200
Translation update done using Pootle.
diff --git a/po/zh_CN.po b/po/zh_CN.po index ed828b4..ba44d2d 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 11:22+0200\n" +"PO-Revision-Date: 2010-02-24 11:26+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -2209,6 +2209,8 @@ msgid "" "as <tt>foreign_db</tt>. Those fields have been put in future development of " "the cross-db relations." msgstr "" +"请注意在当前版本中 <tt>master_db</tt> 必须和 <tt>foreign_db</tt> " +"一致。这两个字段是为以后增加跨数据库关系预留的。"
#. type: Content of: <html><body><div><dl><dt> #: ../phpMyAdmin/Documentation.html:930