The following commit has been merged in the master branch: commit d7d76d1677b24d810aeb9c3bf4eee30f5b06dd68 Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 11:17:32 2010 +0200
Translation update done using Pootle.
diff --git a/po/zh_CN.po b/po/zh_CN.po index a64011b..d0d8816 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:07+0200\n" +"PO-Revision-Date: 2010-02-24 11:17+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -2172,6 +2172,8 @@ msgid "" "in query-by-example, create automatic joins (see <a href="#faq6_6"> <abbr " "title="Frequently Asked Questions">FAQ</abbr> 6.6</a>)" msgstr "" +"通过依例查询自动创建关联查询 (参见 <a href="#faq6_6"> <abbr title="常见问题 (Frequently Asked " +"Questions)">FAQ</abbr> 6.6</a>)"
#. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpMyAdmin/Documentation.html:906