The following commit has been merged in the master branch: commit dfb47f9b77caa05828fe459fa42993681e6dfe17 Author: shanyan baishui Siramizu@gmail.com Date: Wed Feb 24 10:16:32 2010 +0200
Translation update done using Pootle.
diff --git a/po/zh_CN.po b/po/zh_CN.po index 25dfdb8..617fddd 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 10:13+0200\n" +"PO-Revision-Date: 2010-02-24 10:16+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: none\n" "Language: zh_CN\n" @@ -1976,11 +1976,14 @@ msgstr "$cfg['Servers'][$i]['hide_db'] = '^a';" msgid "and to hide both "db1" and "db2" use" msgstr "要隐藏数据库 "数据库1" 和 "数据库2" ，用"
+# using chinese as database name is ok, but should make sure config file encoding is utf-8 #. type: Content of: <html><body><div><dl><dd><pre> #: ../phpMyAdmin/Documentation.html:840 #, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';" msgstr "" +"$cfg['Servers'][$i]['hide_db'] = '(数据库1|数据库2)';// 译者注: 上例中也可使用中文，需注意配置文件编码应为 " +"UTF-8"
#. type: Content of: <html><body><div><dl><dd> #: ../phpMyAdmin/Documentation.html:841