[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 2b7a3813a2801f5047081c5725d3b7df74ab8e72 - Git

4 May 2011

The branch, master has been updated
       via  2b7a3813a2801f5047081c5725d3b7df74ab8e72 (commit)
       via  74ebe2ff21504e574c74423f2a882e68b8d72f03 (commit)
       via  7a4ff035e0e569eb9eb058ea3678cdbeb98efc5a (commit)
       via  2ebc71b3739bcc43660fcaefe0be1194989824e2 (commit)
       via  238c420c5c7b0d5c845862ae2fda4bf74b16cab0 (commit)
       via  5406c906eb4e28021d63b1eccf3fd88822dbbda4 (commit)
       via  33ffaf6064d67da49735645a83f18170c9f98785 (commit)
       via  4ecfd39ca551ee057f1236315ea7bf52a59e6f72 (commit)
       via  caa47c08ffe35ffd4cb55aba33360d66ae040ce5 (commit)
       via  54523bb381620743f588a793fcf3f3bce11da5ce (commit)
       via  9721227c8a837825e178a4035fc8fcb2c6b3ddcc (commit)
       via  32cb0de0d4d4ecb7298e960aef2c55072b28a1bd (commit)
       via  5cb4d3042801387a2dd9a86a7b299318ed8c80dd (commit)
       via  3e0e3e5f3b75af3e8b97d177ff9655008d8470da (commit)
       via  bffee8cdd68cd6b3f17e10b39f1aed1d86115553 (commit)
       via  becbdc21388efdcb99ef108a750f4c6930f41bcb (commit)
       via  07849a137428f7faa47486205169ff7eaf5672ea (commit)
       via  c2b3d66a43a56edd231603c7fd3cdf2664490805 (commit)
       via  27a504aa4e31d82e846e98ec1324d00b5a6852a5 (commit)
       via  552d58b710ccd6b04c8282ffffb769ab366d6acf (commit)
       via  91be0a0757d1bd3440682e95751b608274bc0e8b (commit)
       via  ea1d04a938dfaf7c97a4db280931ce19744c47ed (commit)
       via  4082318f60d00f5eea1b3cb38a8a75e0fab858bb (commit)
       via  750ab157249799e5c3bb623e4da31918e780dce4 (commit)
       via  bd9c78778ff4b3dee67b62e0de857a66a4729315 (commit)
       via  7f8763d28b5f25483c9900819297d4713a393c74 (commit)
       via  5b2b83c94924a79fb597a7d2fe09ce667b1e2568 (commit)
       via  61829c1e72416d28c1f9c9c9f203509c15fe52f9 (commit)
       via  f5d9b4f9695b6fb3d5df86d1e44b8762e6eba509 (commit)
       via  f44365aa0f4c5d4d65c9338a46839c7ba1ef969c (commit)
       via  f1a7b027be6c328945cdd38fdeda32a30665b929 (commit)
       via  a47eb19862789192a8dd3b661c89b000dc2256da (commit)
       via  19f6de959ba23db797419aac833da174c1fff688 (commit)
       via  448ff9160e75d935d335e14cea45711901374f19 (commit)
       via  0a2103e5071c0296a04c9f8fbf3acb06fae23ec5 (commit)
       via  74d54a82c431dcb7dafd309cb5c68b009a732a3e (commit)
       via  80167aea7449d559643f050cb99a65a8637e3d76 (commit)
       via  b546a69a9f885398f624aaca5406f98b33bf6846 (commit)
       via  37f089a2363249813e2d48bed99574fab40b80c1 (commit)
       via  0133218e1f47bae0c551fd62ccadf4c444e8bbd0 (commit)
       via  561fc62c7fa6e1814c418f77d1662854f4cf2a0c (commit)
       via  d1f00d794b2215d65125e04b5a78601127239acd (commit)
       via  723744a021c78c2db087f84f50d048cbb6c3d8ad (commit)
       via  8703a97f0802b64409ac3cef06ee4122a608ffb2 (commit)
       via  a26199948bcc29583914e5459bcd94c9f617783f (commit)
       via  482ae17275e8bfb0fba85deb84cf6aebf97be6b4 (commit)
       via  7d2a481680748792720cbe632f0c15a1bbba40d5 (commit)
       via  db706c1cfa7f238c3c4d54f79c2430d5551d7de1 (commit)
       via  034fdaf01705250d1fa0a13ad10ebcd4884c2fac (commit)
       via  a520a33d05d89d586f80a091bb409db3c1949534 (commit)
       via  52d3cc7ce7fb9048bffe823cd7a8c9472535cc9f (commit)
       via  592e4be1b2dcabec2f52c28849080cbeb724ee9f (commit)
       via  72fbab14ddd490b13f565518addc3d57c483c45f (commit)
       via  e949eec8522d15eb9497a016f484bfecc9504571 (commit)
       via  72250e4fe24b1148b26398faf001726ed14da024 (commit)
       via  426274d074215a65e3b7f5b522ce0cccfbe102ce (commit)
       via  380e24719621937dc9de93589c13177406d158cb (commit)
       via  06bcef54c0045cd74fcc09889a17436ed7e8afda (commit)
       via  dc3f74ac411e6f7dbc11f391a14761d57272f352 (commit)
       via  39255add7de64893135c236f188137f3bb3b5a38 (commit)
       via  4a284e054044efb6461cb3e8cb2fe4eb3e1398a3 (commit)
       via  211587838b12c90676b117687fc6294776f863f9 (commit)
       via  6e777cf5902cbfd099d0835df6195965a2785860 (commit)
       via  de8c45c13c913a626addde9159a0e4aad8ecff7d (commit)
       via  a195eebf589ab3f39059eaa75428a2e41f6e18e7 (commit)
       via  ae1eafbc71324a7c2232cc531937849271e91596 (commit)
      from  2cc74d228db1c42481b01df58ddbc4be61d84105 (commit)
- Log -----------------------------------------------------------------
commit 2b7a3813a2801f5047081c5725d3b7df74ab8e72
Author: Michal Čihař mcihar@novell.com
Date:   Wed May 4 09:47:18 2011 +0200
Generate docs
commit 74ebe2ff21504e574c74423f2a882e68b8d72f03
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:45:44 2011 +0200
Translation update done using Pootle.
commit 7a4ff035e0e569eb9eb058ea3678cdbeb98efc5a
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:41:04 2011 +0200
Translation update done using Pootle.
commit 2ebc71b3739bcc43660fcaefe0be1194989824e2
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:40:17 2011 +0200
Translation update done using Pootle.
commit 238c420c5c7b0d5c845862ae2fda4bf74b16cab0
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:39:51 2011 +0200
Translation update done using Pootle.
commit 5406c906eb4e28021d63b1eccf3fd88822dbbda4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:39:23 2011 +0200
Translation update done using Pootle.
commit 33ffaf6064d67da49735645a83f18170c9f98785
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:39:04 2011 +0200
Translation update done using Pootle.
commit 4ecfd39ca551ee057f1236315ea7bf52a59e6f72
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:38:45 2011 +0200
Translation update done using Pootle.
commit caa47c08ffe35ffd4cb55aba33360d66ae040ce5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:38:30 2011 +0200
Translation update done using Pootle.
commit 54523bb381620743f588a793fcf3f3bce11da5ce
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:38:06 2011 +0200
Translation update done using Pootle.
commit 9721227c8a837825e178a4035fc8fcb2c6b3ddcc
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:34:42 2011 +0200
Translation update done using Pootle.
commit 32cb0de0d4d4ecb7298e960aef2c55072b28a1bd
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:34:41 2011 +0200
Translation update done using Pootle.
commit 5cb4d3042801387a2dd9a86a7b299318ed8c80dd
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:33:58 2011 +0200
Translation update done using Pootle.
commit 3e0e3e5f3b75af3e8b97d177ff9655008d8470da
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:33:43 2011 +0200
Translation update done using Pootle.
commit bffee8cdd68cd6b3f17e10b39f1aed1d86115553
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:33:22 2011 +0200
Translation update done using Pootle.
commit becbdc21388efdcb99ef108a750f4c6930f41bcb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:33:09 2011 +0200
Translation update done using Pootle.
commit 07849a137428f7faa47486205169ff7eaf5672ea
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:32:07 2011 +0200
Translation update done using Pootle.
commit c2b3d66a43a56edd231603c7fd3cdf2664490805
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:29:05 2011 +0200
Translation update done using Pootle.
commit 27a504aa4e31d82e846e98ec1324d00b5a6852a5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:26:33 2011 +0200
Translation update done using Pootle.
commit 552d58b710ccd6b04c8282ffffb769ab366d6acf
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:26:29 2011 +0200
Translation update done using Pootle.
commit 91be0a0757d1bd3440682e95751b608274bc0e8b
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:26:22 2011 +0200
Translation update done using Pootle.
commit ea1d04a938dfaf7c97a4db280931ce19744c47ed
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:26:17 2011 +0200
Translation update done using Pootle.
commit 4082318f60d00f5eea1b3cb38a8a75e0fab858bb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:25:05 2011 +0200
Translation update done using Pootle.
commit 750ab157249799e5c3bb623e4da31918e780dce4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:24:56 2011 +0200
Translation update done using Pootle.
commit bd9c78778ff4b3dee67b62e0de857a66a4729315
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:24:40 2011 +0200
Translation update done using Pootle.
commit 7f8763d28b5f25483c9900819297d4713a393c74
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:24:31 2011 +0200
Translation update done using Pootle.
commit 5b2b83c94924a79fb597a7d2fe09ce667b1e2568
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:23:55 2011 +0200
Translation update done using Pootle.
commit 61829c1e72416d28c1f9c9c9f203509c15fe52f9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:23:48 2011 +0200
Translation update done using Pootle.
commit f5d9b4f9695b6fb3d5df86d1e44b8762e6eba509
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:23:12 2011 +0200
Translation update done using Pootle.
commit f44365aa0f4c5d4d65c9338a46839c7ba1ef969c
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:22:35 2011 +0200
Translation update done using Pootle.
commit f1a7b027be6c328945cdd38fdeda32a30665b929
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:22:03 2011 +0200
Translation update done using Pootle.
commit a47eb19862789192a8dd3b661c89b000dc2256da
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:21:41 2011 +0200
Translation update done using Pootle.
commit 19f6de959ba23db797419aac833da174c1fff688
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:21:24 2011 +0200
Translation update done using Pootle.
commit 448ff9160e75d935d335e14cea45711901374f19
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:20:31 2011 +0200
Translation update done using Pootle.
commit 0a2103e5071c0296a04c9f8fbf3acb06fae23ec5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:18:58 2011 +0200
Translation update done using Pootle.
commit 74d54a82c431dcb7dafd309cb5c68b009a732a3e
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:18:09 2011 +0200
Translation update done using Pootle.
commit 80167aea7449d559643f050cb99a65a8637e3d76
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:17:42 2011 +0200
Translation update done using Pootle.
commit b546a69a9f885398f624aaca5406f98b33bf6846
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:17:29 2011 +0200
Translation update done using Pootle.
commit 37f089a2363249813e2d48bed99574fab40b80c1
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:17:03 2011 +0200
Translation update done using Pootle.
commit 0133218e1f47bae0c551fd62ccadf4c444e8bbd0
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:15:19 2011 +0200
Translation update done using Pootle.
commit 561fc62c7fa6e1814c418f77d1662854f4cf2a0c
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 08:12:58 2011 +0200
Translation update done using Pootle.
commit d1f00d794b2215d65125e04b5a78601127239acd
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 07:46:49 2011 +0200
Translation update done using Pootle.
commit 723744a021c78c2db087f84f50d048cbb6c3d8ad
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 07:46:06 2011 +0200
Translation update done using Pootle.
commit 8703a97f0802b64409ac3cef06ee4122a608ffb2
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 07:45:46 2011 +0200
Translation update done using Pootle.
commit a26199948bcc29583914e5459bcd94c9f617783f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 07:43:31 2011 +0200
Translation update done using Pootle.
commit 482ae17275e8bfb0fba85deb84cf6aebf97be6b4
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 07:40:57 2011 +0200
Translation update done using Pootle.
commit 7d2a481680748792720cbe632f0c15a1bbba40d5
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:59:02 2011 +0200
Translation update done using Pootle.
commit db706c1cfa7f238c3c4d54f79c2430d5551d7de1
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:58:36 2011 +0200
Translation update done using Pootle.
commit 034fdaf01705250d1fa0a13ad10ebcd4884c2fac
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:56:08 2011 +0200
Translation update done using Pootle.
commit a520a33d05d89d586f80a091bb409db3c1949534
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:22:01 2011 +0200
Translation update done using Pootle.
commit 52d3cc7ce7fb9048bffe823cd7a8c9472535cc9f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:16:28 2011 +0200
Translation update done using Pootle.
commit 592e4be1b2dcabec2f52c28849080cbeb724ee9f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:15:55 2011 +0200
Translation update done using Pootle.
commit 72fbab14ddd490b13f565518addc3d57c483c45f
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:12:19 2011 +0200
Translation update done using Pootle.
commit e949eec8522d15eb9497a016f484bfecc9504571
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:12:06 2011 +0200
Translation update done using Pootle.
commit 72250e4fe24b1148b26398faf001726ed14da024
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:11:35 2011 +0200
Translation update done using Pootle.
commit 426274d074215a65e3b7f5b522ce0cccfbe102ce
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:08:55 2011 +0200
Translation update done using Pootle.
commit 380e24719621937dc9de93589c13177406d158cb
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:08:32 2011 +0200
Translation update done using Pootle.
commit 06bcef54c0045cd74fcc09889a17436ed7e8afda
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:07:48 2011 +0200
Translation update done using Pootle.
commit dc3f74ac411e6f7dbc11f391a14761d57272f352
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:02:58 2011 +0200
Translation update done using Pootle.
commit 39255add7de64893135c236f188137f3bb3b5a38
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 05:02:28 2011 +0200
Translation update done using Pootle.
commit 4a284e054044efb6461cb3e8cb2fe4eb3e1398a3
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:58:33 2011 +0200
Translation update done using Pootle.
commit 211587838b12c90676b117687fc6294776f863f9
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:57:38 2011 +0200
Translation update done using Pootle.
commit 6e777cf5902cbfd099d0835df6195965a2785860
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:52:51 2011 +0200
Translation update done using Pootle.
commit de8c45c13c913a626addde9159a0e4aad8ecff7d
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:46:54 2011 +0200
Translation update done using Pootle.
commit a195eebf589ab3f39059eaa75428a2e41f6e18e7
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:46:36 2011 +0200
Translation update done using Pootle.
commit ae1eafbc71324a7c2232cc531937849271e91596
Author: shanyan baishui Siramizu@gmail.com
Date:   Wed May 4 04:44:29 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 output/zh_CN/Documentation.html |  187 +++++++++++++++++----------------------
 po/zh_CN.po                     |  163 +++++++++++++++++-----------------
 2 files changed, 165 insertions(+), 185 deletions(-)

diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html
index fd9552a..27f991e 100644
--- a/output/zh_CN/Documentation.html
+++ b/output/zh_CN/Documentation.html
@@ -1110,78 +1110,65 @@ session_save_path (外链，英语)</a>)。</dd>
     <dd>标记正在使用的表以使得可以显示含有已锁定表的数据库 (自 MySQL 3.23.30 起) 。</dd>
<dt id="cfg_ShowSQL">$cfg['ShowSQL'] 布尔</dt>
-    <dd>Defines whether <abbr title="structured query language">SQL</abbr> queries
-generated by phpMyAdmin should be displayed or not.</dd>
-
-    <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] boolean</dt>
-    <dd>Defines whether normal users (non-administrator) are allowed to delete their
-own database or not. If set as FALSE, the link &quot;Drop Database&quot;
-will not be shown, and even a &quot;DROP DATABASE mydatabase&quot; will be
-rejected. Quite practical for <abbr title="Internet service
-provider">ISP</abbr>'s with many customers.<br />
-        Please note that this limitation of SQL queries is not as strict as when
-using MySQL privileges. This is due to nature of SQL queries which might be
-quite complicated. So this choice should be viewed as help to avoid
-accidental dropping rather than strict privilege limitation.</dd>
-
-    <dt id="cfg_Confirm">$cfg['Confirm'] boolean</dt>
-    <dd>Whether a warning (&quot;Are your really sure...&quot;) should be displayed
-when you're about to lose data.</dd>
-
-    <dt id="cfg_LoginCookieRecall">$cfg['LoginCookieRecall'] boolean</dt>
-    <dd>Define whether the previous login should be recalled or not in cookie
-authentication mode.<br /><br />
-
-        This is automatically disabled if you do not have configured <tt><a
-href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>.
+    <dd>设置是否显示 phpMyAdmin 生成的 <abbr title="结构化查询语言 (structured query
+language)">SQL</abbr> 查询语句。</dd>
+
+    <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] 布尔</dt>
+    <dd>设置普通用户 (非管理员) 是否可以删除他们自己的数据库。若设为 FALSE，链接 &quot;删除数据库&quot;
+将不会显示出来，&quot;DROP DATABASE 我的数据库名&quot; 语句也会被忽略。该功能对于有很多客户的 <abbr
+title="互联网服务提供商 (Internet service provider)">ISP</abbr> 相当有用。<br />
+        请注意这里对 SQL 查询的限制并不能像使用 MySQL 权限限制那样严格。因为 SQL
+查询可以非常复杂。所以该功能应作为避免误删除数据库而不是严格的权限限制来使用。</dd>
+
+    <dt id="cfg_Confirm">$cfg['Confirm'] 布尔</dt>
+    <dd>设置当查询可能丢失数据时是否显示警告 (&quot;您真的要 ...&quot;) 。</dd>
+
+    <dt id="cfg_LoginCookieRecall">$cfg['LoginCookieRecall'] 布尔</dt>
+    <dd>设置在 cookie 认证下是否能自动重复上次登录。<br /><br />
+
+        如果没有设置 <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>
+该功能将自动禁用。
         </dd>
-    <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] integer [number of seconds]</dt>
-    <dd>Define how long is login cookie valid. Please note that php configuration
-option <a
+    <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] 整数 [单位: 秒]</dt>
+    <dd>设置登录 cookie 的有效期。请注意 PHP 配置选项的 <a
 href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a>
-might limit session validity and if session is lost, login cookie is also
-invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code>
-not lower than the value of $cfg['LoginCookieValidity'].</dd>
+可能会限制会话有效期，若会话失效 cookie 同样会失效。所以最好将 <code>session.gc_maxlifetime</code>
+设置为不小于 $cfg['LoginCookieValidity'] 的值。</dd>
-    <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt>
+    <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] 整数 [单位: 秒]</dt>
     <dd>设置登录 cookie 应在浏览器中保存多长时间。默认值 0 表示当前会话。建议在公共环境下使用。</dd>
-    <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] boolean</dt>
-    <dd>If enabled (default), logout deletes cookies for all servers, otherwise only
-for current one. Setting this to false makes it easy to forget to log out
-from other server, when you are using more of them.</dd>
+    <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] 布尔</dt>
+    <dd>若启用 (默认值)，退出时将会删除所有服务器的 cookies，否则仅删除当前服务器的 cookies 。若设为
+false，当你访问多台服务器时可能会容易忘记退出其它服务器。</dd>
-    <dt id="cfg_UseDbSearch">$cfg['UseDbSearch'] boolean</dt>
-    <dd>Define whether the "search string inside database" is enabled or not.</dd>
+    <dt id="cfg_UseDbSearch">$cfg['UseDbSearch'] 布尔</dt>
+    <dd>设置是否允许使用 "数据库搜索" 。</dd>
-    <dt id="cfg_IgnoreMultiSubmitErrors">$cfg['IgnoreMultiSubmitErrors'] boolean</dt>
-    <dd>Define whether phpMyAdmin will continue executing a multi-query statement if
-one of the queries fails. Default is to abort execution.</dd>
+    <dt id="cfg_IgnoreMultiSubmitErrors">$cfg['IgnoreMultiSubmitErrors'] 布尔</dt>
+    <dd>设置 phpMyAdmin 是否在执行多语句查询出错的时候继续执行。默认为中断执行。</dd>
-    <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt>
+    <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] 布尔</dt>
     <dd>Define whether phpMyAdmin will output the results of each query of a
 multi-query statement embedded into the <abbr title="structured query
 language">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>.</dd>
     <dt id="AllowArbitraryServer">
-        <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span>
-boolean</dt>
-    <dd>If enabled, allows you to log in to arbitrary servers using cookie auth and
-permits to specify servers of your choice in the Synchronize dialog.
+        <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> 布尔</dt>
+    <dd>若启用，将允许通过 cookie 认证登录到任意服务器并允许在同步对话框中指定服务器。
         <br /><br />
-        <b>NOTE:</b> Please use this carefully, as this may allow users access to
-MySQL servers behind the firewall where your <abbr title="HyperText Transfer
-Protocol">HTTP</abbr> server is placed.
+        <b>注意:</b> 请谨慎使用该功能，这将可能导致用户访问到位于 <abbr title="超文本转移协议 (HyperText Transfer
+Protocol)">HTTP</abbr> 服务器防火墙后面的 MySQL 服务器。
     </dd>
<dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] 布尔</dt>
-    <dd>Whether to display errors from PHP or not.</dd>
+    <dd>设置是否显示 PHP 错误。</dd>
<dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] 布尔</dt>
-    <dd>Whether to gather errors from PHP or not.</dd>
+    <dd>设置是否收集 PHP 错误。</dd>
-    <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
+    <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] 布尔</dt>
     <dd>Defines whether to use a select-based menu and display only the current
 tables in the left frame (smaller page). Only in Non-Lightmode you can use
 the feature to display nested folders using <a
@@ -1341,22 +1328,19 @@ in edit/insert mode. Since version 2.10, the user can toggle this setting
 from the interface.
     </dd>
-    <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] boolean</dt>
+    <dt id="cfg_ShowFieldTypesInDataEditView">$cfg['ShowFieldTypesInDataEditView'] 布尔</dt>
     <dd>Defines whether or not type fields should be initially displayed in
 edit/insert mode. The user can toggle this setting from the interface.
     </dd>
<dt id="cfg_CharEditing">$cfg['CharEditing'] string</dt>
-    <dd>Defines which type of editing controls should be used for CHAR and VARCHAR
-columns. Possible values are:
-        <ul><li>input - this allows to limit size of text to size of columns in MySQL, but
-has problems with newlines in columns</li>
-            <li>textarea - no problems with newlines in columns, but also no length
-limitations</li>
+    <dd>设置编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件。可选值为:
+        <ul><li>输入框 (input) - 允许限制输入字数使其不超过 MySQL 字段限制，但无法换行</li>
+            <li>文本框 (textarea) - 可以换行，但没有字数限制</li>
         </ul>
-        Default is old behavior so input.</dd>
+        默认为输入框 (input) 。</dd>
-    <dt id="cfg_InsertRows">$cfg['InsertRows'] integer</dt>
+    <dt id="cfg_InsertRows">$cfg['InsertRows'] 整数</dt>
     <dd>Defines the maximum number of concurrent entries for the Insert page.</dd>
<dt id="cfg_ForeignKeyMaxLimit">$cfg['ForeignKeyMaxLimit'] integer</dt>
@@ -1371,14 +1355,13 @@ offering both the key and value data. The contents of the array should be
 one or both of the following strings: <i>'content-id'</i>,
 <i>'id-content'</i>.</dd>
-    <dt><span id="cfg_ZipDump">$cfg['ZipDump'] </span>boolean<br />
-        <span id="cfg_GZipDump">$cfg['GZipDump'] </span>boolean<br />
-        <span id="cfg_BZipDump">$cfg['BZipDump'] </span>boolean
+    <dt><span id="cfg_ZipDump">$cfg['ZipDump'] </span>布尔<br />
+        <span id="cfg_GZipDump">$cfg['GZipDump'] </span>布尔<br />
+        <span id="cfg_BZipDump">$cfg['BZipDump'] </span>布尔
     </dt>
-    <dd>Defines whether to allow the use of zip/GZip/BZip2 compression when creating
-a dump file</dd>
+    <dd>设置在创建转储文件时是否允许使用 zip/GZip/BZip2 压缩</dd>
-    <dt><span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>boolean<br />
+    <dt><span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>布尔<br />
     </dt>
     <dd>Defines whether to allow on the fly compression for GZip/BZip2 compressed
 exports. This doesn't affect smaller dumps and allows users to create larger
@@ -1449,24 +1432,21 @@ locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo.
 href="http://dev.mysql.com/doc/mysql/en/charset-charsets.html%22%3EMySQL
 documentation</a> for list of possible values.</dd>
-    <dt id="cfg_Lang">$cfg['Lang'] string</dt>
-    <dd>Force language to use.<br />
+    <dt id="cfg_Lang">$cfg['Lang'] 字符串</dt>
+    <dd>强制使用的语言。<br />
         The corresponding language file needs to be in
 locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo.
         </dd>
-    <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] string</dt>
-    <dd>Limit list of available languages to those matching the given regular
-expression. For example if you want only Czech and English, you should set
-filter to <code>'^(cs|en)'</code>.</dd>
-
-    <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] string</dt>
-    <dd>You can select here which functions will be used for character set
-conversion. Possible values are:
-        <ul><li>auto - automatically use available one (first is tested iconv, then recode)</li>
-            <li>iconv - use iconv or libiconv functions</li>
-            <li>recode - use recode_string function</li>
-            <li>none - disable encoding conversion</li>
+    <dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] 字符串</dt>
+    <dd>通过正则表达式限制可用语言列表。例如只允许使用简体中文和英语，可以设置为 <code>'^(zh_CN|en)'</code>。</dd>
+
+    <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] 字符串</dt>
+    <dd>你可以在这里选择使用哪个函数来转换字符集。可选值为:
+        <ul><li>自动 (auto) - 自动选择可用的函数 (首先尝试 iconv，然后 recode)</li>
+            <li>iconv - 使用 iconv 或 libiconv 函数</li>
+            <li>recode - 使用 recode_string 函数</li>
+            <li>无 (none) - 禁止编码转换</li>
         </ul>
         Default is auto.</dd>
     <dd>
@@ -1538,17 +1518,17 @@ have problems with long URLs.  Default is <code>1000</code>.
     <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
-    <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS
-color for background]<br />
-        <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS
-color for background]
+    <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> 字符串 [格式: CSS
+背景色]<br />
+        <span id="cfg_MainBackground">$cfg['MainBackground']</span> 字符串 [格式: CSS
+背景色]
     </dt>
     <dd>The background styles used for both the frames.  See
 <tt>themes/themename/layout.inc.php</tt>.</dd>
-    <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br />
-        <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS
-color]</dt>
+    <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] 字符串 [格式: CSS 背景色]<br />
+        <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> 字符串 [格式: CSS
+颜色]</dt>
     <dd>The style used for the pointer in the navi frame.  See
 <tt>themes/themename/layout.inc.php</tt>.</dd>
@@ -1560,29 +1540,29 @@ color]</dt>
     <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
     </dd>
-    <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br />
-        <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt>
+    <dt id="cfg_ThBackground">$cfg['ThBackground'] 字符串 [格式: CSS 背景色]<br />
+        <span id="cfg_ThColor">$cfg['ThColor']</span> 字符串 [格式: CSS 颜色]</dt>
     <dd>The style used for table headers. See
 <tt>themes/themename/layout.inc.php</tt>.</dd>
-    <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt>
+    <dt id="cfg_BgcolorOne">$cfg['BgOne'] 字符串 [格式: CSS 颜色]</dt>
     <dd>The color (HTML) #1 for table rows. See
 <tt>themes/themename/layout.inc.php</tt>.
     </dd>
-    <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt>
+    <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] 字符串 [格式: CSS 颜色]</dt>
     <dd>The color (HTML) #2 for table rows. See
 <tt>themes/themename/layout.inc.php</tt>.
     </dd>
<dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground']
-</span>string [CSS color]<br />
-        <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string
-[CSS color]<br />
+</span>字符串 [格式: CSS 颜色]<br />
+        <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>字符串 [格式:
+CSS 颜色]<br />
         <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground']
-</span>string [CSS color]<br />
-        <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string
-[CSS color]
+</span>字符串 [格式: CSS 颜色]<br />
+        <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>字符串 [格式:
+CSS 颜色]
     </dt>
     <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br />
         The former feature highlights the row over which your mouse is passing and
@@ -1643,7 +1623,7 @@ both at the left and at the right).  &quot;Left&quot; and &quot;right&quot;
 are parsed as &quot;top&quot; and &quot;bottom&quot; with vertical display
 mode.</dd>
-    <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string</dt>
+    <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] 字符串</dt>
     <dd>There are 3 display modes: horizontal, horizontalflipped and vertical.
 Define which one is displayed by default. The first mode displays each row
 on a horizontal line, the second rotates the headers by 90 degrees, so you
@@ -1652,7 +1632,7 @@ and still print them out. The vertical mode sorts each row on a vertical
 lineup.
     </dd>
-    <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt>
+    <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] 字符串</dt>
     <dd>
         The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using 'css'
 the rotation of the header for horizontalflipped is done via CSS. The CSS
@@ -1795,7 +1775,7 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
-    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] 字符串</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
         <ul>
@@ -1902,7 +1882,7 @@ Database view, for the table list.</dd>
 state. A value of <tt>'open'</tt> does the reverse. To completely disable
 all visual sliders, use <tt>'disabled'</tt>.</dd>
-    <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] array</dt>
+    <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] 数组</dt>
     <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array)  that
 users can't set through user preferences. For possible values, refer to
 <tt>libraries/config/user_preferences.forms.php</tt>.</dd>
@@ -2278,9 +2258,8 @@ phpMyAdmin 的特性和接口方面的信息。</p>
 <h3 id="faqserver">服务器</h3>
<h4 id="faq1_1">
-    <a href="#faq1_1">1.1 My server is crashing each time a specific action is
-required or phpMyAdmin sends a blank page or a page full of cryptic
-characters to my browser, what can I do?</a></h4>
+    <a href="#faq1_1">1.1 我的服务器不是在处理特定请求时崩溃就是 phpMyAdmin
+发送空白页面或者都是乱码的页面，我该怎么办？</a></h4>
<p> 在 <i>config.inc.php</i> 文件中将 <a href="#cfg_OBGzip"
 class="configurule">$cfg['OBGzip']</a> 显式地设为 <tt>FALSE</tt>，同时将 PHP 配置文件中的
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9f93d3e..1dc8b69 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: 2011-04-21 14:32+0300\n"
-"PO-Revision-Date: 2011-05-03 08:22+0200\n"
+"PO-Revision-Date: 2011-05-04 08:45+0200\n"
 "Last-Translator: shanyan baishui Siramizu@gmail.com\n"
 "Language-Team: none\n"
 "Language: zh_CN\n"
@@ -3418,11 +3418,13 @@ msgid ""
 "Defines whether <abbr title="structured query language">SQL</abbr> queries "
 "generated by phpMyAdmin should be displayed or not."
 msgstr ""
+"设置是否显示 phpMyAdmin 生成的 <abbr title="结构化查询语言 (structured query "
+"language)">SQL</abbr> 查询语句。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1367
 msgid "$cfg['AllowUserDropDatabase'] boolean"
-msgstr ""
+msgstr "$cfg['AllowUserDropDatabase'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1368
@@ -3433,6 +3435,9 @@ msgid ""
 "rejected. Quite practical for <abbr title="Internet service provider">ISP</"
 "abbr>'s with many customers."
 msgstr ""
+"设置普通用户 (非管理员) 是否可以删除他们自己的数据库。若设为 FALSE，链接 &quot;删除数据库&quot; "
+"将不会显示出来，&quot;DROP DATABASE 我的数据库名&quot; 语句也会被忽略。该功能对于有很多客户的 <abbr "
+"title="互联网服务提供商 (Internet service provider)">ISP</abbr> 相当有用。"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1374
@@ -3442,30 +3447,32 @@ msgid ""
 "quite complicated. So this choice should be viewed as help to avoid "
 "accidental dropping rather than strict privilege limitation."
 msgstr ""
+"请注意这里对 SQL 查询的限制并不能像使用 MySQL 权限限制那样严格。因为 SQL "
+"查询可以非常复杂。所以该功能应作为避免误删除数据库而不是严格的权限限制来使用。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1380
 msgid "$cfg['Confirm'] boolean"
-msgstr ""
+msgstr "$cfg['Confirm'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1381
 msgid ""
 "Whether a warning (&quot;Are your really sure...&quot;) should be displayed "
 "when you're about to lose data."
-msgstr ""
+msgstr "设置当查询可能丢失数据时是否显示警告 (&quot;您真的要 ...&quot;) 。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1384
 msgid "$cfg['LoginCookieRecall'] boolean"
-msgstr ""
+msgstr "$cfg['LoginCookieRecall'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1385
 msgid ""
 "Define whether the previous login should be recalled or not in cookie "
 "authentication mode."
-msgstr ""
+msgstr "设置在 cookie 认证下是否能自动重复上次登录。"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1388
@@ -3473,11 +3480,13 @@ msgid ""
 "This is automatically disabled if you do not have configured <tt><a href="
 ""#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>."
 msgstr ""
+"如果没有设置 <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt> "
+"该功能将自动禁用。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1392
 msgid "$cfg['LoginCookieValidity'] integer [number of seconds]"
-msgstr ""
+msgstr "$cfg['LoginCookieValidity'] 整数 [单位: 秒]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1393
@@ -3489,11 +3498,15 @@ msgid ""
 "a good idea to set <code>session.gc_maxlifetime</code> not lower than the "
 "value of $cfg['LoginCookieValidity']."
 msgstr ""
+"设置登录 cookie 的有效期。请注意 PHP 配置选项的 <a "
+"href="http://php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime">session.gc_maxlifetime</a> 可能会限制会话有效期，若会话失效 cookie 同样会失效。所以最好将 "
+"<code>session.gc_maxlifetime</code> 设置为不小于 $cfg['LoginCookieValidity'] 的值。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1399
 msgid "$cfg['LoginCookieStore'] integer [number of seconds]"
-msgstr ""
+msgstr "$cfg['LoginCookieStore'] 整数 [单位: 秒]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1400
@@ -3506,7 +3519,7 @@ msgstr "设置登录 cookie 应在浏览器中保存多长时间。默认值 0 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1404
 msgid "$cfg['LoginCookieDeleteAll'] boolean"
-msgstr ""
+msgstr "$cfg['LoginCookieDeleteAll'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1405
@@ -3515,33 +3528,35 @@ msgid ""
 "for current one. Setting this to false makes it easy to forget to log out "
 "from other server, when you are using more of them."
 msgstr ""
+"若启用 (默认值)，退出时将会删除所有服务器的 cookies，否则仅删除当前服务器的 cookies 。若设为 "
+"false，当你访问多台服务器时可能会容易忘记退出其它服务器。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1410
 msgid "$cfg['UseDbSearch'] boolean"
-msgstr ""
+msgstr "$cfg['UseDbSearch'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1411
 msgid "Define whether the "search string inside database" is enabled or not."
-msgstr ""
+msgstr "设置是否允许使用 "数据库搜索" 。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1413
 msgid "$cfg['IgnoreMultiSubmitErrors'] boolean"
-msgstr ""
+msgstr "$cfg['IgnoreMultiSubmitErrors'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1414
 msgid ""
 "Define whether phpMyAdmin will continue executing a multi-query statement if "
 "one of the queries fails. Default is to abort execution."
-msgstr ""
+msgstr "设置 phpMyAdmin 是否在执行多语句查询出错的时候继续执行。默认为中断执行。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1417
 msgid "$cfg['VerboseMultiSubmit'] boolean"
-msgstr ""
+msgstr "$cfg['VerboseMultiSubmit'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1418
@@ -3557,13 +3572,14 @@ msgid ""
 "<span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> "
 "boolean"
 msgstr ""
+"<span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1424
 msgid ""
 "If enabled, allows you to log in to arbitrary servers using cookie auth and "
 "permits to specify servers of your choice in the Synchronize dialog."
-msgstr ""
+msgstr "若启用，将允许通过 cookie 认证登录到任意服务器并允许在同步对话框中指定服务器。"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1427
@@ -3572,6 +3588,8 @@ msgid ""
 "MySQL servers behind the firewall where your <abbr title="HyperText "
 "Transfer Protocol">HTTP</abbr> server is placed."
 msgstr ""
+"<b>注意:</b> 请谨慎使用该功能，这将可能导致用户访问到位于 <abbr title="超文本转移协议 (HyperText Transfer "
+"Protocol)">HTTP</abbr> 服务器防火墙后面的 MySQL 服务器。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1432
@@ -3581,7 +3599,7 @@ msgstr "$cfg['Error_Handler']['display'] 布尔"
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1433
 msgid "Whether to display errors from PHP or not."
-msgstr ""
+msgstr "设置是否显示 PHP 错误。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1435
@@ -3591,12 +3609,12 @@ msgstr "$cfg['Error_Handler']['gather'] 布尔"
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1436
 msgid "Whether to gather errors from PHP or not."
-msgstr ""
+msgstr "设置是否收集 PHP 错误。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1438
 msgid "$cfg['LeftFrameLight'] boolean"
-msgstr ""
+msgstr "$cfg['LeftFrameLight'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1439
@@ -4007,9 +4025,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1602
-#, fuzzy
 msgid "$cfg['ShowFieldTypesInDataEditView'] boolean"
-msgstr "$cfg['SuhosinDisableWarning'] 布尔"
+msgstr "$cfg['ShowFieldTypesInDataEditView'] 布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1603
@@ -4025,37 +4042,34 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1609
-#, fuzzy
 msgid ""
 "Defines which type of editing controls should be used for CHAR and VARCHAR "
 "columns. Possible values are:"
-msgstr ""
-"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] "
-"- 允许限制输入长度，[kbd]文本框 (textarea)[/kbd] - 允许输入多行数据"
+msgstr "设置编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件。可选值为:"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1611
 msgid ""
 "input - this allows to limit size of text to size of columns in MySQL, but "
 "has problems with newlines in columns"
-msgstr ""
+msgstr "输入框 (input) - 允许限制输入字数使其不超过 MySQL 字段限制，但无法换行"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1613
 msgid ""
 "textarea - no problems with newlines in columns, but also no length "
 "limitations"
-msgstr ""
+msgstr "文本框 (textarea) - 可以换行，但没有字数限制"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1616
 msgid "Default is old behavior so input."
-msgstr ""
+msgstr "默认为输入框 (input) 。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1618
 msgid "$cfg['InsertRows'] integer"
-msgstr ""
+msgstr "$cfg['InsertRows'] 整数"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1619
@@ -4093,29 +4107,29 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1633
 msgid "<span id="cfg_ZipDump">$cfg['ZipDump'] </span>boolean"
-msgstr ""
+msgstr "<span id="cfg_ZipDump">$cfg['ZipDump'] </span>布尔"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1634
 msgid "<span id="cfg_GZipDump">$cfg['GZipDump'] </span>boolean"
-msgstr ""
+msgstr "<span id="cfg_GZipDump">$cfg['GZipDump'] </span>布尔"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1635
 msgid "<span id="cfg_BZipDump">$cfg['BZipDump'] </span>boolean"
-msgstr ""
+msgstr "<span id="cfg_BZipDump">$cfg['BZipDump'] </span>布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1637
 msgid ""
 "Defines whether to allow the use of zip/GZip/BZip2 compression when creating "
 "a dump file"
-msgstr ""
+msgstr "设置在创建转储文件时是否允许使用 zip/GZip/BZip2 压缩"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1640
 msgid "<span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>boolean"
-msgstr ""
+msgstr "<span id="cfg_CompressOnFly">$cfg['CompressOnFly'] </span>布尔"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1642
@@ -4309,17 +4323,17 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1714
 msgid "$cfg['Lang'] string"
-msgstr ""
+msgstr "$cfg['Lang'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1715
 msgid "Force language to use."
-msgstr ""
+msgstr "强制使用的语言。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1720
 msgid "$cfg['FilterLanguages'] string"
-msgstr ""
+msgstr "$cfg['FilterLanguages'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1721
@@ -4327,41 +4341,40 @@ msgid ""
 "Limit list of available languages to those matching the given regular "
 "expression. For example if you want only Czech and English, you should set "
 "filter to <code>'^(cs|en)'</code>."
-msgstr ""
+msgstr "通过正则表达式限制可用语言列表。例如只允许使用简体中文和英语，可以设置为 <code>'^(zh_CN|en)'</code>。"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1725
 msgid "$cfg['RecodingEngine'] string"
-msgstr ""
+msgstr "$cfg['RecodingEngine'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1726
 msgid ""
 "You can select here which functions will be used for character set "
 "conversion. Possible values are:"
-msgstr ""
+msgstr "你可以在这里选择使用哪个函数来转换字符集。可选值为:"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1728
 msgid ""
 "auto - automatically use available one (first is tested iconv, then recode)"
-msgstr ""
+msgstr "自动 (auto) - 自动选择可用的函数 (首先尝试 iconv，然后 recode)"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1730
 msgid "iconv - use iconv or libiconv functions"
-msgstr ""
+msgstr "iconv - 使用 iconv 或 libiconv 函数"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1731
 msgid "recode - use recode_string function"
-msgstr ""
+msgstr "recode - 使用 recode_string 函数"
#. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:1732
-#, fuzzy
 msgid "none - disable encoding conversion"
-msgstr "编码转换"
+msgstr "无 (none) - 禁止编码转换"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1734 orig-docs/Documentation.html:1780
@@ -4518,13 +4531,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1804
-#, fuzzy
 msgid ""
 "<span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS "
 "color for background]"
 msgstr ""
-"<span id="cfg_Servers_only_db">$cfg['Servers'][$i]['only_db']</span> 字符"
-"串 或 数组"
+"<span id="cfg_NaviBackground">$cfg['NaviBackground']</span> 字符串 [格式: CSS "
+"背景色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1805
@@ -4532,6 +4544,8 @@ msgid ""
 "<span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS "
 "color for background]"
 msgstr ""
+"<span id="cfg_MainBackground">$cfg['MainBackground']</span> 字符串 [格式: CSS "
+"背景色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1807
@@ -4543,17 +4557,16 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1810
 msgid "$cfg['NaviPointerBackground'] string [CSS color for background]"
-msgstr ""
+msgstr "$cfg['NaviPointerBackground'] 字符串 [格式: CSS 背景色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1811
-#, fuzzy
 msgid ""
 "<span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string "
 "[CSS color]"
 msgstr ""
-"<span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</"
-"span> 字符串"
+"<span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> 字符串 [格式: CSS "
+"颜色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1812
@@ -4588,14 +4601,12 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1823
 msgid "$cfg['ThBackground'] string [CSS color for background]"
-msgstr ""
+msgstr "$cfg['ThBackground'] 字符串 [格式: CSS 背景色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1824
-#, fuzzy
 msgid "<span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]"
-msgstr ""
-"<span id="cfg_Servers_history">$cfg['Servers'][$i]['history']</span> 字符串"
+msgstr "<span id="cfg_ThColor">$cfg['ThColor']</span> 字符串 [格式: CSS 颜色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1825
@@ -4607,7 +4618,7 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1828
 msgid "$cfg['BgOne'] string [CSS color]"
-msgstr ""
+msgstr "$cfg['BgOne'] 字符串 [格式: CSS 颜色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1829
@@ -4619,7 +4630,7 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1832
 msgid "$cfg['BgTwo'] string [CSS color]"
-msgstr ""
+msgstr "$cfg['BgTwo'] 字符串 [格式: CSS 颜色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1833
@@ -4630,43 +4641,39 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1836
-#, fuzzy
 msgid ""
 "<span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] </"
 "span>string [CSS color]"
 msgstr ""
-"<span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> 字符"
-"串"
+"<span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] "
+"</span>字符串 [格式: CSS 颜色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1837
-#, fuzzy
 msgid ""
 "<span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string "
 "[CSS color]"
 msgstr ""
-"<span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</"
-"span> 字符串"
+"<span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>字符串 [格式: "
+"CSS 颜色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1838
-#, fuzzy
 msgid ""
 "<span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] </"
 "span>string [CSS color]"
 msgstr ""
-"<span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> 字符"
-"串"
+"<span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] "
+"</span>字符串 [格式: CSS 颜色]"
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1839
-#, fuzzy
 msgid ""
 "<span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string "
 "[CSS color]"
 msgstr ""
-"<span id="cfg_Servers_only_db">$cfg['Servers'][$i]['only_db']</span> 字符"
-"串 或 数组"
+"<span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>字符串 [格式: "
+"CSS 颜色]"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1841
@@ -4830,9 +4837,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1899
-#, fuzzy
 msgid "$cfg['DefaultDisplay'] string"
-msgstr "$cfg['PmaAbsoluteUri'] 字符串"
+msgstr "$cfg['DefaultDisplay'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1900
@@ -4847,9 +4853,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:1908
-#, fuzzy
 msgid "$cfg['HeaderFlipType'] string"
-msgstr "$cfg['PmaAbsoluteUri'] 字符串"
+msgstr "$cfg['HeaderFlipType'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:1910
@@ -5113,9 +5118,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:2055
-#, fuzzy
 msgid "$cfg['Export']['method'] string"
-msgstr "$cfg['Servers'][$i]['host'] 字符串"
+msgstr "$cfg['Export']['method'] 字符串"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:2057
@@ -5344,9 +5348,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:2163
-#, fuzzy
 msgid "$cfg['UserprefsDisallow'] array"
-msgstr "$cfg['Servers'] 数组"
+msgstr "$cfg['UserprefsDisallow'] 数组"
#. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:2164
@@ -6425,15 +6428,13 @@ msgstr "服务器"
#. type: Content of: <html><body><div><h4>
 #: orig-docs/Documentation.html:2579
-#, fuzzy
 msgid ""
 "<a href="#faq1_1">1.1 My server is crashing each time a specific action is "
 "required or phpMyAdmin sends a blank page or a page full of cryptic "
 "characters to my browser, what can I do?</a>"
 msgstr ""
-"<a href="#faq1_1">1.1 我正在使用 PHP 4+ 版本，在我执行某些特性操作的时候服"
-"务器总是会发生一些错误，如 phpMyAdmin 返回空页面，或者显示乱码，我该怎么办？"
-"</a>"
+"<a href="#faq1_1">1.1 我的服务器不是在处理特定请求时崩溃就是 phpMyAdmin "
+"发送空白页面或者都是乱码的页面，我该怎么办？</a>"
#. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:2583
hooks/post-receive
-- 
phpMyAdmin localized documentation


    