[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. eaa96ec1dfcff0d08c6cf69490da6e73d870d99f

Michal Čihař nijel at users.sourceforge.net
Tue Mar 1 06:52:35 CET 2011


The branch, master has been updated
       via  eaa96ec1dfcff0d08c6cf69490da6e73d870d99f (commit)
       via  08bd5e3ba9135b9adfcd5898ea13278c5aed9355 (commit)
       via  2b0b437316daeeee55e2d623ce811d38b7851aba (commit)
       via  5c97cb575dcefb765f4b5f2468f6bdf1867b8465 (commit)
       via  b3615314ad8b1df2ee1bb98c7c47c6824c944b61 (commit)
       via  c951ab997e31440c19cdfa03ef31c20595e932b1 (commit)
       via  fe84c31b60556549cf167220d6f7c720dfd077b3 (commit)
       via  3cfb58eb64f2f4d5ab2f920c59af3f5e477e72de (commit)
       via  b87a0359316c5e6a917c2b794634e99b86d00f5c (commit)
       via  65c88579bd728af3a038ee61fc05de88ea35ab06 (commit)
       via  cdc66dfdcd805631a4264e59f52db0b4ccfdfe2f (commit)
       via  8564b118e878fb8ab4346a14ac3b1c1d2551f509 (commit)
       via  6f5e1820cce3ead79cfd07678a5bdb87ac44752c (commit)
       via  2e7cf75b087d2c254bd755bcf35aeb826470b033 (commit)
       via  ad5f7b9542ca500f2c193a205116a351e076e6a3 (commit)
       via  2e03e9ca69c2673fd452619cacc1b62e0fb2cc0b (commit)
       via  a5301b68fc70d6981e998917e6e9f40cd41e4dbb (commit)
       via  eebca9040c5e3e7d90aa629280a0cac50e53098a (commit)
       via  30fd1464822b66e7705770e933aeabee8022a9eb (commit)
       via  c543fc9ee33aab08e1da62036fbb93690befbfde (commit)
       via  2e8942b36f863a4b13b806e25fec46d3aa15d10a (commit)
       via  d45f2d7675a605f504b0acca10fa89e7d40a11e8 (commit)
       via  7cd0b42148e2512f80d463c36876f1d0b083f99c (commit)
       via  f47ad9b71dd1bf557a606b5f96d5f74fd73c3661 (commit)
       via  0739e05ae8e58e1045d49edfa3fd080649e79c7a (commit)
       via  f4d833e9b1348b7528480882913585f15f85cedf (commit)
       via  c74663dc5fb47b0f67b11f81d1901b564f00292c (commit)
       via  1e3c9c965b41c6458ad32c7098ae627dc6465174 (commit)
       via  0f6d05559b55a7b34dc96672c20f96d261202432 (commit)
       via  f3821644e7f628d634f77f85a8018ece72d09b64 (commit)
       via  5b6929910580806e5f275cd44d48eab4fae8652b (commit)
       via  28b4f72ccd910272da33912e217659e913b6485d (commit)
       via  aa2ac37b0f9a3ddee0e21c83e159dbd7845ec8c7 (commit)
       via  dcd7e21d11a21511586e0b377b742eb5b9a5da88 (commit)
       via  139effa37c9db6b14ff76202774cb259235db483 (commit)
       via  ef0a720197fb4514792591d6651d31be064d846b (commit)
       via  a7bf57d478152f1c2f43229e2148bf23c87a36d3 (commit)
       via  f9019fd6cc58d1b2a5ada08dd2c5e91eda4cba84 (commit)
       via  7690ef8352af0bc4f57a6d80989aa876e9783355 (commit)
       via  a7d2ff4b818f1aea4168923b9261c7754a147545 (commit)
       via  fa5b42bc90af9ad6c8d40e2d4953c75e46e2f554 (commit)
       via  bd3083471b0190eb42eb9498ff2225b989c1445d (commit)
       via  5832fd6c30cb23a952ee6f40cb7a46cb5fb37535 (commit)
       via  cb52af136bd9978a4268efe9e20955ebf7c53d5c (commit)
       via  6a25170d5f06c919ec4ab0e39152a18c87eab6dc (commit)
       via  b6ee197282cceaa47f726e33a30b8df67eed52c7 (commit)
       via  fd3b936534944aa10ef4ac9717b9f25566f05fc7 (commit)
       via  e655b1227c77b34266641eca0c033a30fe1a182e (commit)
       via  cd17c645537dfa45b31c1a7c45dce3c4363a0259 (commit)
       via  4652293350ef637ac73b80d340a7c2d774317034 (commit)
       via  a4b58fd74a5250b67f5721c66b1be946f93b010d (commit)
       via  6aaf00c1f51a36bda4d45229e961b35a30cdbbd4 (commit)
       via  faba39869d696f86e6442bbb1f5b3b1a765ee9b6 (commit)
       via  2a19bff0337d470f09ddfa7cdd9a4cb2f2b4e3e8 (commit)
       via  88897b384f4f07575555019d79bd9f81ba3065b4 (commit)
       via  e0ab46d7900acd90cd8d50fbbcfabf3db4213a6a (commit)
       via  ac101807b8cb22f5c140e3ab3ce40dd0c7676320 (commit)
       via  8dc83ff7bf6850d8c260c1d768f49a769bda7188 (commit)
       via  da9928b5c302a5c3b6bfcecbcd6d29bb79ff2bd9 (commit)
       via  312cb6501a67690dedd8cdc9df06a5fead84bd52 (commit)
       via  697351ef08c9dd559fb6f3867335209cc2f90534 (commit)
       via  8686c9e86be7da6f18c23c21298d54c69eed272e (commit)
      from  b724a8ac8c330712cc642f2aa2f889305e1f6611 (commit)


- Log -----------------------------------------------------------------
commit eaa96ec1dfcff0d08c6cf69490da6e73d870d99f
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Mar 1 06:52:25 2011 +0100

    Update generated docs

commit 08bd5e3ba9135b9adfcd5898ea13278c5aed9355
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 06:00:05 2011 +0200

    Translation update done using Pootle.

commit 2b0b437316daeeee55e2d623ce811d38b7851aba
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:59:18 2011 +0200

    Translation update done using Pootle.

commit 5c97cb575dcefb765f4b5f2468f6bdf1867b8465
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:57:35 2011 +0200

    Translation update done using Pootle.

commit b3615314ad8b1df2ee1bb98c7c47c6824c944b61
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:55:55 2011 +0200

    Translation update done using Pootle.

commit c951ab997e31440c19cdfa03ef31c20595e932b1
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:44:07 2011 +0200

    Translation update done using Pootle.

commit fe84c31b60556549cf167220d6f7c720dfd077b3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:43:07 2011 +0200

    Translation update done using Pootle.

commit 3cfb58eb64f2f4d5ab2f920c59af3f5e477e72de
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:43:02 2011 +0200

    Translation update done using Pootle.

commit b87a0359316c5e6a917c2b794634e99b86d00f5c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:42:43 2011 +0200

    Translation update done using Pootle.

commit 65c88579bd728af3a038ee61fc05de88ea35ab06
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:42:33 2011 +0200

    Translation update done using Pootle.

commit cdc66dfdcd805631a4264e59f52db0b4ccfdfe2f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:42:20 2011 +0200

    Translation update done using Pootle.

commit 8564b118e878fb8ab4346a14ac3b1c1d2551f509
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:42:15 2011 +0200

    Translation update done using Pootle.

commit 6f5e1820cce3ead79cfd07678a5bdb87ac44752c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:41:37 2011 +0200

    Translation update done using Pootle.

commit 2e7cf75b087d2c254bd755bcf35aeb826470b033
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:41:29 2011 +0200

    Translation update done using Pootle.

commit ad5f7b9542ca500f2c193a205116a351e076e6a3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:40:53 2011 +0200

    Translation update done using Pootle.

commit 2e03e9ca69c2673fd452619cacc1b62e0fb2cc0b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:40:47 2011 +0200

    Translation update done using Pootle.

commit a5301b68fc70d6981e998917e6e9f40cd41e4dbb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:39:02 2011 +0200

    Translation update done using Pootle.

commit eebca9040c5e3e7d90aa629280a0cac50e53098a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:38:56 2011 +0200

    Translation update done using Pootle.

commit 30fd1464822b66e7705770e933aeabee8022a9eb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:38:42 2011 +0200

    Translation update done using Pootle.

commit c543fc9ee33aab08e1da62036fbb93690befbfde
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:38:36 2011 +0200

    Translation update done using Pootle.

commit 2e8942b36f863a4b13b806e25fec46d3aa15d10a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:38:11 2011 +0200

    Translation update done using Pootle.

commit d45f2d7675a605f504b0acca10fa89e7d40a11e8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:36:45 2011 +0200

    Translation update done using Pootle.

commit 7cd0b42148e2512f80d463c36876f1d0b083f99c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:32:57 2011 +0200

    Translation update done using Pootle.

commit f47ad9b71dd1bf557a606b5f96d5f74fd73c3661
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:32:45 2011 +0200

    Translation update done using Pootle.

commit 0739e05ae8e58e1045d49edfa3fd080649e79c7a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:32:15 2011 +0200

    Translation update done using Pootle.

commit f4d833e9b1348b7528480882913585f15f85cedf
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:30:34 2011 +0200

    Translation update done using Pootle.

commit c74663dc5fb47b0f67b11f81d1901b564f00292c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:28:11 2011 +0200

    Translation update done using Pootle.

commit 1e3c9c965b41c6458ad32c7098ae627dc6465174
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:27:09 2011 +0200

    Translation update done using Pootle.

commit 0f6d05559b55a7b34dc96672c20f96d261202432
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:24:29 2011 +0200

    Translation update done using Pootle.

commit f3821644e7f628d634f77f85a8018ece72d09b64
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:23:14 2011 +0200

    Translation update done using Pootle.

commit 5b6929910580806e5f275cd44d48eab4fae8652b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:22:11 2011 +0200

    Translation update done using Pootle.

commit 28b4f72ccd910272da33912e217659e913b6485d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:20:58 2011 +0200

    Translation update done using Pootle.

commit aa2ac37b0f9a3ddee0e21c83e159dbd7845ec8c7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:18:37 2011 +0200

    Translation update done using Pootle.

commit dcd7e21d11a21511586e0b377b742eb5b9a5da88
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:14:10 2011 +0200

    Translation update done using Pootle.

commit 139effa37c9db6b14ff76202774cb259235db483
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:02:07 2011 +0200

    Translation update done using Pootle.

commit ef0a720197fb4514792591d6651d31be064d846b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 05:01:51 2011 +0200

    Translation update done using Pootle.

commit a7bf57d478152f1c2f43229e2148bf23c87a36d3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:55:46 2011 +0200

    Translation update done using Pootle.

commit f9019fd6cc58d1b2a5ada08dd2c5e91eda4cba84
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:53:35 2011 +0200

    Translation update done using Pootle.

commit 7690ef8352af0bc4f57a6d80989aa876e9783355
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:48:02 2011 +0200

    Translation update done using Pootle.

commit a7d2ff4b818f1aea4168923b9261c7754a147545
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:46:28 2011 +0200

    Translation update done using Pootle.

commit fa5b42bc90af9ad6c8d40e2d4953c75e46e2f554
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:45:05 2011 +0200

    Translation update done using Pootle.

commit bd3083471b0190eb42eb9498ff2225b989c1445d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:44:38 2011 +0200

    Translation update done using Pootle.

commit 5832fd6c30cb23a952ee6f40cb7a46cb5fb37535
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:44:28 2011 +0200

    Translation update done using Pootle.

commit cb52af136bd9978a4268efe9e20955ebf7c53d5c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:44:22 2011 +0200

    Translation update done using Pootle.

commit 6a25170d5f06c919ec4ab0e39152a18c87eab6dc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:41:41 2011 +0200

    Translation update done using Pootle.

commit b6ee197282cceaa47f726e33a30b8df67eed52c7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:41:33 2011 +0200

    Translation update done using Pootle.

commit fd3b936534944aa10ef4ac9717b9f25566f05fc7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:41:16 2011 +0200

    Translation update done using Pootle.

commit e655b1227c77b34266641eca0c033a30fe1a182e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:41:07 2011 +0200

    Translation update done using Pootle.

commit cd17c645537dfa45b31c1a7c45dce3c4363a0259
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:40:26 2011 +0200

    Translation update done using Pootle.

commit 4652293350ef637ac73b80d340a7c2d774317034
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:38:38 2011 +0200

    Translation update done using Pootle.

commit a4b58fd74a5250b67f5721c66b1be946f93b010d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:37:59 2011 +0200

    Translation update done using Pootle.

commit 6aaf00c1f51a36bda4d45229e961b35a30cdbbd4
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:37:04 2011 +0200

    Translation update done using Pootle.

commit faba39869d696f86e6442bbb1f5b3b1a765ee9b6
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:36:11 2011 +0200

    Translation update done using Pootle.

commit 2a19bff0337d470f09ddfa7cdd9a4cb2f2b4e3e8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:35:56 2011 +0200

    Translation update done using Pootle.

commit 88897b384f4f07575555019d79bd9f81ba3065b4
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:35:38 2011 +0200

    Translation update done using Pootle.

commit e0ab46d7900acd90cd8d50fbbcfabf3db4213a6a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:35:29 2011 +0200

    Translation update done using Pootle.

commit ac101807b8cb22f5c140e3ab3ce40dd0c7676320
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:35:08 2011 +0200

    Translation update done using Pootle.

commit 8dc83ff7bf6850d8c260c1d768f49a769bda7188
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:35:00 2011 +0200

    Translation update done using Pootle.

commit da9928b5c302a5c3b6bfcecbcd6d29bb79ff2bd9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:34:25 2011 +0200

    Translation update done using Pootle.

commit 312cb6501a67690dedd8cdc9df06a5fead84bd52
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 04:32:13 2011 +0200

    Translation update done using Pootle.

commit 697351ef08c9dd559fb6f3867335209cc2f90534
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 03:06:30 2011 +0200

    Translation update done using Pootle.

commit 8686c9e86be7da6f18c23c21298d54c69eed272e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Tue Mar 1 03:06:16 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 output/zh_CN/Documentation.html |   97 ++++++++------------
 output/zh_CN/INSTALL            |    6 ++
 output/zh_CN/README             |   50 +++++------
 output/zh_CN/TODO               |    4 +-
 po/zh_CN.po                     |  185 +++++++++++++++++----------------------
 5 files changed, 151 insertions(+), 191 deletions(-)
 create mode 100644 output/zh_CN/INSTALL

diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html
index f00f4c7..3c2419c 100644
--- a/output/zh_CN/Documentation.html
+++ b/output/zh_CN/Documentation.html
@@ -19,7 +19,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.0-beta4-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.0-beta4-dev - 文档</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -27,7 +27,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span
-class="myadmin">MyAdmin</span></a> 3.4.0-beta4-dev Documentation
+class="myadmin">MyAdmin</span></a> 3.4.0-beta4-dev 文档
     </h1>
 </div>
 
@@ -138,9 +138,7 @@ Language)">SQL</abbr> 文件中导入数据和 MySQL 结构</li>
 Questions)">FAQ</abbr> 3.6)</a></li>
     <li>支持改进的 MySQL 扩展 mysqli <a href="#faq1_17"> (参见 <abbr title="常见问题 (Frequently
 Asked Questions)">FAQ</abbr> 1.17)</a></li>
-    <li>communicate in <a
-href="http://www.phpmyadmin.net/home_page/translations.php">62 different
-languages</a>
+    <li>支持 <a href="http://www.phpmyadmin.net/home_page/translations.php">62 种语言</a>
         </li>
     <li>同步当前或远程服务器上的任意两个数据库 <a href="#faq9_1">(参见 <abbr title="常见问题 (Frequently
 Asked Questions)">FAQ</abbr> 9.1)</a>
@@ -311,8 +309,7 @@ href="#authentication_modes">使用认证</a> 一节)。</p>
 
 <ul><li>在<b>多用户环境</b>中,我们推荐使用 <abbr title="超文本转移协议 (HyperText Transfer
 Protocol)">HTTP</abbr> 和 cookie 认证,这样用户仅可以看到并管理自己的数据库。<br />
-        Nevertheless be aware that MS Internet Explorer seems to be really buggy
-about cookies, at least till version 6.<br />
+        目前已知微软的 IE6 (Internet Explorer,或更低版本) 在处理 cookies 上存在严重问题。<br />
         即使在<b>单用户环境</b>中使用 <abbr title="超文本转移协议 (HyperText Transfer
 Protocol)">HTTP</abbr> 或 cookie 认证,用户名和密码也不会被保存在配置文件中。
         </li>
@@ -654,10 +651,8 @@ array('要置顶的数据库1', '要置顶的数据库2', '*');</tt> 即可,ph
 
     <dt><span id="cfg_Servers_hide_db">$cfg['Servers'][$i]['hide_db']</span> 字符串
     </dt>
-    <dd>Regular expression for hiding some databases from unprivileged users.  This
-only hides them from listing, but a user is still able to access them
-(using, for example, the SQL query area). To limit access, use the MySQL
-privilege system.
+    <dd>对非特权用户隐藏数据库的正则表达式。  这仅仅将数据库从列表中隐藏,用户仍然可以直接访问 (如通过 SQL 查询)。要彻底限制访问,请使用 MySQL
+权限系统。
         <br /><br />
         例如,要隐藏所有以字母 "a" 开头的数据库,用<br />
         <pre>$cfg['Servers'][$i]['hide_db'] = '^a';</pre>
@@ -703,13 +698,10 @@ id="cfg_Servers_bookmarktable">$cfg['Servers'][$i]['bookmarktable']</span>
     </dt>
     <dd>自 2.2.4 起你可以在 'relation' 表的支持下定义一张表中的一个字段与另一张表的关系 (外键)。目前 phpMyAdmin 用它来
         <ul><li>使外键数据可点击,浏览主表时可通过点击数据值转到外表;</li>
-            <li>display in an optional tool-tip the "display column" when browsing
-the master table, if you move the mouse to a column containing a foreign key
-(use also the 'table_info' table);<br />
+            <li>在浏览主表时,当鼠标移到含有外键的字段上用气泡提示显示可选的"显示的字段" (需同时使用 'table_info' 表);<br />
                 (参见 <a href="#faqdisplay"><abbr title="常见问题 (Frequently Asked Questions)">
 FAQ</abbr> 6.7</a>)</li>
-            <li>in edit/insert mode, display a drop-down list of possible foreign keys (key
-value and "display column" are shown)<br />
+            <li>在编辑/插入时,显示可能的外键下拉列表 (显示为键值和"显示的字段")<br />
                 (参见 <a href="#faq6_21"><abbr title="常见问题 (Frequently Asked Questions)">
 FAQ</abbr> 6.21</a>)</li>
             <li>display links on the table properties page, to check referential integrity
@@ -3909,7 +3901,7 @@ or on the Structure page.</p>
 
 
 <h4 id="faq6_27">
-    <a href="#faq6_27">6.27 What format strings can I use?</a></h4>
+    <a href="#faq6_27">6.27 我可以使用哪些格式字符串?</a></h4>
 
 <p>
     In all places where phpMyAdmin accepts format strings, you can use
@@ -3920,22 +3912,21 @@ you can not get the table name), but the following variables can be used:
 </p>
 <dl>
     <dt><code>@HTTP_HOST@</code></dt>
-        <dd>HTTP host that runs phpMyAdmin</dd>
+        <dd>运行 phpMyAdmin 的 HTTP 主机</dd>
     <dt><code>@SERVER@</code></dt>
-        <dd>MySQL server name</dd>
+        <dd>MySQL 服务器名</dd>
     <dt><code>@VERBOSE@</code></dt>
-        <dd>Verbose MySQL server name as defined in <a
-href="#cfg_Servers_verbose">server configuration</a></dd>
+        <dd>在<a href="#cfg_Servers_verbose">服务器设置</a>中定义的详细的 MySQL 服务器名</dd>
     <dt><code>@VSERVER@</code></dt>
-        <dd>Verbose MySQL server name if set, otherwise normal</dd>
+        <dd>如果设置了详细的 MySQL 服务器名则使用,否则使用常规的服务器名</dd>
     <dt><code>@DATABASE@</code></dt>
-        <dd>Currently opened database</dd>
+        <dd>当前打开的数据库</dd>
     <dt><code>@TABLE@</code></dt>
-        <dd>Currently opened table</dd>
+        <dd>当前打开的数据表</dd>
     <dt><code>@FIELDS@</code></dt>
-        <dd>Fields of currently opened table</dd>
+        <dd>当前打开表的字段</dd>
     <dt><code>@PHPMYADMIN@</code></dt>
-        <dd>phpMyAdmin with version</dd>
+        <dd>带版本号的 phpMyAdmin 字样</dd>
 </dl>
 
 <h4 id="wysiwyg">
@@ -4365,7 +4356,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>)。</li>
 
 <li>Nicola Asuni (Tecnick.com)
 <ul>
-    <li>TCPDF library (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>)</li>
+    <li>TCPDF 库 (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>)</li>
 </ul></li>
 
 <li>Michael Keck <mkkeck_at_users.sourceforge.net>
@@ -4474,51 +4465,40 @@ Zigmantas, "Manuzhai".
 </p>
 
 
-<h3>Original Credits of Version 2.1.0</h3>
+<h3>版本 2.1.0 的鸣谢原文</h3>
 
 <p>
-    This work is based on Peter Kuppelwieser's MySQL-Webadmin. It was his idea
-to create a web-based interface to MySQL using PHP3. Although I have not
-used any of his source-code, there are some concepts I've borrowed from
-him. phpMyAdmin was created because Peter told me he wasn't going to further
-develop his (great) tool.
+    此项目基于 Peter Kuppelwieser 的 MySQL-Webadmin 而来。他想出了通过 PHP3 来建立一个基于 web 的 MySQL
+交互界面这个点子。尽管我没有使用他的源代码,但很多想法都是受他而启发。我之所以启动 phpMyAdmin 这个项目是因为 Peter 告诉我他不再开发他
+(优秀) 的工具了。
 </p>
 <p>
-    Thanks go to
+    在这里要感谢
 </p>
 <ul>
-  <li>Amalesh Kempf <ak-lsml_at_living-source.com> who contributed the code
-for the check when dropping a table or database. He also suggested that you
-should be able to specify the primary key on tbl_create.php3. To version
-1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as a
-bug-report. Plus many smaller improvements.
+  <li>Amalesh Kempf <ak-lsml_at_living-source.com>
+贡献了检查是否正在删除数据表或数据库的代码。同时他建议在 tbl_create.php3 中应该可以让用户设置主键。在 1.1.1 版本中他贡献了
+ldi_*.php3-set (导入文本文件) 、缺陷报告以及许多小改进。
   </li>
-  <li>Jan Legenhausen <jan_at_nrw.net>: He made many of the changes that
-were introduced in 1.3.0 (including quite significant ones like the
-authentication). For 1.4.1 he enhanced the table-dump feature. Plus
-bug-fixes and help.
+  <li>Jan Legenhausen <jan_at_nrw.net>: 他对 1.3.0 中引进的功能作出许多改进
+(包括诸如认证这样的重要功能)。他还增强了 1.4.1 中的数据表转储功能。以及缺陷修正及帮助。
   </li>
-  <li>Marc Delisle <DelislMa_at_CollegeSherbrooke.qc.ca> made phpMyAdmin
-language-independent by outsourcing the strings to a separate file. He also
-contributed the French translation.
+  <li>Marc Delisle <DelislMa_at_CollegeSherbrooke.qc.ca> 通过使用单独的语言文件使
+phpMyAdmin 实现语言分离。他也对法语翻译作出了贡献。
   </li>
-  <li>Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed
-tbl_select.php3, a feature to display only some columns from a table.
+  <li>Alexandr Bravo <abravo_at_hq.admiral.ru> 贡献了
+tbl_select.php3,可以只显示一张表中的某些字段的功能。
   </li>
-  <li>Chris Jackson <chrisj_at_ctel.net> added support for MySQL functions
-in tbl_change.php3. He also added the "Query by Example" feature
-in 2.0.
+  <li>Chris Jackson <chrisj_at_ctel.net> 在 tbl_change.php3 中添加了对 MySQL
+函数的支持。在 2.0 中添加了 "依例查询" 功能。
   </li>
-  <li>Dave Walton <walton_at_nordicdms.com> added support for multiple
-servers and is a regular contributor for bug-fixes.
+  <li>Dave Walton <walton_at_nordicdms.com> 添加了多服务器的支持并且经常贡献缺陷修正。
   </li>
-  <li>Gabriel Ash <ga244_at_is8.nyu.edu> contributed the random access
-features for 2.0.6.
+  <li>Gabriel Ash <ga244_at_is8.nyu.edu> 贡献了 2.0.6 中的随机访问功能。
   </li>
 </ul>
 <p>
-    The following people have contributed minor changes, enhancements, bugfixes
-or support for a new language:
+    感谢下列对小的修改、改进、缺陷修正以及新语言支持作出贡献的人们:
 </p>
 <p>
     Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas Kleemann,
@@ -4527,8 +4507,7 @@ Kettler, Joe Pruett, Renato Lins, Mark Kronsbein, Jannis Hermanns,
 G. Wieggers.
 </p>
 <p>
-    And thanks to everyone else who sent me email with suggestions, bug-reports
-and or just some feedback.
+    同时感谢所有给我们提出建议、意见、报告缺陷以及使用反馈的热心用户。
 </p>
 
 <p>
diff --git a/output/zh_CN/INSTALL b/output/zh_CN/INSTALL
new file mode 100644
index 0000000..7ce4f53
--- /dev/null
+++ b/output/zh_CN/INSTALL
@@ -0,0 +1,6 @@
+phpMyAdmin - 安装
+===================
+
+请参见 Documentation.txt 或 Documentation.html 文件。
+
+
diff --git a/output/zh_CN/README b/output/zh_CN/README
index 2d78208..a7d7fa7 100644
--- a/output/zh_CN/README
+++ b/output/zh_CN/README
@@ -1,7 +1,7 @@
-phpMyAdmin - Readme
+phpMyAdmin - 读我
 ===================
 
-Version 3.4.0-beta4-dev
+版本 3.4.0-beta4-dev
 
 使用 PHP 编写,通过 web 管理 MySQL 的工具。
 
@@ -10,10 +10,10 @@ http://www.phpmyadmin.net/
 版权
 ------
 
-Copyright (C) 1998-2000
+版权所有 (C) 1998-2000
     Tobias Ratschiller <tobias_at_ratschiller.com>
 
-Copyright (C) 2001-2011
+版权所有 (C) 2001-2011
     Marc Delisle <marc_at_infomarc.info>
     Olivier Müller <om_at_omnis.ch>
     Robin Johnson <robbat2_at_users.sourceforge.net>
@@ -22,10 +22,10 @@ Copyright (C) 2001-2011
     Garvin Hicking <me_at_supergarv.de>
     Michael Keck <mkkeck_at_users.sourceforge.net>
     Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-    [check Documentation.txt/.html file for more details]
+    [详细信息请参见 Documentation.txt/.html 文件]
 
-License
--------
+授权
+------
 
 本软件是自由软件,你可以在自由软件基金会发布的 GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。
 
@@ -41,40 +41,36 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 * MySQL 5.0 或更高版本
 * a web-browser (doh!)
 
-Summary
--------
+概要
+------
 
-phpMyAdmin is intended to handle the administration of MySQL over the web.
-For a summary of features, please see the Documentation.txt/.html file.
+phpMyAdmin 旨在通过 web 管理 MySQL 。  具体功能请参见 Documentation.txt/.html 文件。
 
 下载
 ------
 
-You can get the newest version at http://www.phpmyadmin.net/.
+你可以在 http://www.phpmyadmin.net/ 获得最新版本。
 
-More Information
-----------------
+更多信息
+------------
 
-Please see the Documentation.txt/.html file.
+请见 Documentation.txt/.html 文件。
 
-Support
--------
+支持
+------
 
-See reference about support forums under http://www.phpmyadmin.net/
+参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息
 
 
-Enjoy!
-------
+尽情享受吧!
+------------------
 
-The phpMyAdmin Devel team
+phpMyAdmin 开发组
 
 
-PS:
+附:
 
-Please, don't send us emails with question like "How do I compile PHP with
-MySQL-support". We just don't have the time to be your free help desk.
+请勿向我们发送邮件询问诸如 "怎样编译支持 MySQL 的 PHP" 之类的问题。我们没有时间为您提供免费咨询。
 
-Please send your questions to the appropriate mailing lists / forums.
-Before contacting us, please read the Documentation.html (esp. the FAQ
-part).
+请将您的问题发送至对应的邮件列表/论坛。  在联系我们之前,请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。
 
diff --git a/output/zh_CN/TODO b/output/zh_CN/TODO
index 072b518..2797f57 100644
--- a/output/zh_CN/TODO
+++ b/output/zh_CN/TODO
@@ -1,5 +1,5 @@
-phpMyAdmin - Todo
-=================
+phpMyAdmin - 计划
+===================
 
 目前我们将 Sourceforge 的追踪器作为计划表使用:
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b61367d..fd3dcad 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-02-19 23:01+0100\n"
-"PO-Revision-Date: 2010-12-30 05:11+0200\n"
+"PO-Revision-Date: 2011-03-01 06:00+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: none\n"
 "Language: zh_CN\n"
@@ -20,19 +20,17 @@ msgstr ""
 
 #. type: Content of: <html><head><title>
 #: orig-docs/Documentation.html:12
-#, fuzzy
 msgid "phpMyAdmin @@VER@@ - Documentation"
-msgstr "phpMyAdmin 文档"
+msgstr "phpMyAdmin @@VER@@ - 文档"
 
 #. type: Content of: <html><body><div><h1>
 #: orig-docs/Documentation.html:19
-#, fuzzy
 msgid ""
 "<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</"
 "span></a> @@VER@@ Documentation"
 msgstr ""
-"<a href=\"http://www.phpmyadmin.net/\">php<span class=\"myadmin\">MyAdmin</"
-"span></a> 3.4.0-beta1 文档"
+"<a href=\"http://www.phpmyadmin.net/\">php<span "
+"class=\"myadmin\">MyAdmin</span></a> @@VER@@ 文档"
 
 #. type: Content of: <html><body><ul><li>
 #: orig-docs/Documentation.html:27
@@ -391,11 +389,11 @@ msgstr ""
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:140
-#, fuzzy
 msgid ""
 "communicate in <a href=\"http://www.phpmyadmin.net/home_page/translations.php"
 "\">62 different languages</a>"
-msgstr "支持 <a href=\"./translators.html\">58 种不同的语言</a>"
+msgstr ""
+"支持 <a href=\"http://www.phpmyadmin.net/home_page/translations.php\">62 种语言</a>"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:142
@@ -949,13 +947,10 @@ msgstr ""
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:381
-#, fuzzy
 msgid ""
 "Nevertheless be aware that MS Internet Explorer seems to be really buggy "
 "about cookies, at least till version 6."
-msgstr ""
-"目前已知微软的 IE6 (Internet Explorer,或更低版本) 在处理 cookies 上存在很严"
-"重的问题,而 PHP 4.1.1 在该方面也存在一些严重问题!"
+msgstr "目前已知微软的 IE6 (Internet Explorer,或更低版本) 在处理 cookies 上存在严重问题。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:383
@@ -2075,15 +2070,14 @@ msgstr ""
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:840
-#, fuzzy
 msgid ""
 "Regular expression for hiding some databases from unprivileged users.  This "
 "only hides them from listing, but a user is still able to access them "
 "(using, for example, the SQL query area). To limit access, use the MySQL "
 "privilege system."
 msgstr ""
-"隐藏数据库的正则表达式。这仅仅将数据库从列表中隐藏,用户仍然可以直接访问 (如"
-"通过 SQL 查询)。要彻底限制访问,请使用 MySQL 权限系统。"
+"对非特权用户隐藏数据库的正则表达式。  这仅仅将数据库从列表中隐藏,用户仍然可以直接访问 (如通过 SQL 查询)。要彻底限制访问,请使用 MySQL "
+"权限系统。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:845
@@ -2245,14 +2239,11 @@ msgstr "使外键数据可点击,浏览主表时可通过点击数据值转到
 
 #. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:900
-#, fuzzy
 msgid ""
 "display in an optional tool-tip the "display column" when browsing "
 "the master table, if you move the mouse to a column containing a foreign key "
 "(use also the 'table_info' table);"
-msgstr ""
-"在浏览主表时,当鼠标移到含有外键的字段上用气泡提示显示可选的"显示的字段"
-""  (需同时使用 'table_info' 表);"
+msgstr "在浏览主表时,当鼠标移到含有外键的字段上用气泡提示显示可选的"显示的字段" (需同时使用 'table_info' 表);"
 
 #. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:903
@@ -2265,12 +2256,10 @@ msgstr ""
 
 #. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:905
-#, fuzzy
 msgid ""
 "in edit/insert mode, display a drop-down list of possible foreign keys (key "
 "value and "display column" are shown)"
-msgstr ""
-"在编辑/插入时,显示可能的外键下拉列表 (显示为键值和"显示的字段")"
+msgstr "在编辑/插入时,显示可能的外键下拉列表 (显示为键值和"显示的字段")"
 
 #. type: Content of: <html><body><div><dl><dd><ul><li>
 #: orig-docs/Documentation.html:907
@@ -10130,9 +10119,8 @@ msgstr ""
 
 #. type: Content of: <html><body><div><h4>
 #: orig-docs/Documentation.html:4256
-#, fuzzy
 msgid "<a href=\"#faq6_27\">6.27 What format strings can I use?</a>"
-msgstr "<a href=\"#faq1_12\">1.12 我忘了 MySQL 的 root 密码,怎么办?</a>"
+msgstr "<a href=\"#faq6_27\">6.27 我可以使用哪些格式字符串?</a>"
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4259
@@ -10147,85 +10135,84 @@ msgstr ""
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4266
 msgid "<code>@HTTP_HOST@</code>"
-msgstr ""
+msgstr "<code>@HTTP_HOST@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4267
 msgid "HTTP host that runs phpMyAdmin"
-msgstr ""
+msgstr "运行 phpMyAdmin 的 HTTP 主机"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4268
 msgid "<code>@SERVER@</code>"
-msgstr ""
+msgstr "<code>@SERVER@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4269
 msgid "MySQL server name"
-msgstr ""
+msgstr "MySQL 服务器名"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4270
 msgid "<code>@VERBOSE@</code>"
-msgstr ""
+msgstr "<code>@VERBOSE@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4271
 msgid ""
 "Verbose MySQL server name as defined in <a href=\"#cfg_Servers_verbose"
 "\">server configuration</a>"
-msgstr ""
+msgstr "在<a href=\"#cfg_Servers_verbose\">服务器设置</a>中定义的详细的 MySQL 服务器名"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4272
 msgid "<code>@VSERVER@</code>"
-msgstr ""
+msgstr "<code>@VSERVER@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4273
 msgid "Verbose MySQL server name if set, otherwise normal"
-msgstr ""
+msgstr "如果设置了详细的 MySQL 服务器名则使用,否则使用常规的服务器名"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4274
 msgid "<code>@DATABASE@</code>"
-msgstr ""
+msgstr "<code>@DATABASE@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4275
 msgid "Currently opened database"
-msgstr ""
+msgstr "当前打开的数据库"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4276
 msgid "<code>@TABLE@</code>"
-msgstr ""
+msgstr "<code>@TABLE@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4277
 msgid "Currently opened table"
-msgstr ""
+msgstr "当前打开的数据表"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4278
-#, fuzzy
 msgid "<code>@FIELDS@</code>"
-msgstr "添加自增 (AUTO_INCREMENT) 值"
+msgstr "<code>@FIELDS@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4279
 msgid "Fields of currently opened table"
-msgstr ""
+msgstr "当前打开表的字段"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: orig-docs/Documentation.html:4280
 msgid "<code>@PHPMYADMIN@</code>"
-msgstr ""
+msgstr "<code>@PHPMYADMIN@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: orig-docs/Documentation.html:4281
 msgid "phpMyAdmin with version"
-msgstr ""
+msgstr "带版本号的 phpMyAdmin 字样"
 
 #. type: Content of: <html><body><div><h4>
 #: orig-docs/Documentation.html:4285
@@ -11375,13 +11362,13 @@ msgstr "mysqli 支持"
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4761
 msgid "Nicola Asuni (Tecnick.com)"
-msgstr ""
+msgstr "Nicola Asuni (Tecnick.com)"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: orig-docs/Documentation.html:4763
 msgid ""
 "TCPDF library (<a href=\"http://www.tcpdf.org\">http://www.tcpdf.org</a>)"
-msgstr ""
+msgstr "TCPDF 库 (<a href=\"http://www.tcpdf.org\">http://www.tcpdf.org</a>)"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4767
@@ -11604,7 +11591,7 @@ msgstr ""
 #. type: Content of: <html><body><div><h3>
 #: orig-docs/Documentation.html:4874
 msgid "Original Credits of Version 2.1.0"
-msgstr ""
+msgstr "版本 2.1.0 的鸣谢原文"
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4877
@@ -11615,11 +11602,14 @@ msgid ""
 "phpMyAdmin was created because Peter told me he wasn't going to further "
 "develop his (great) tool."
 msgstr ""
+"此项目基于 Peter Kuppelwieser 的 MySQL-Webadmin 而来。他想出了通过 PHP3 来建立一个基于 web 的 MySQL "
+"交互界面这个点子。尽管我没有使用他的源代码,但很多想法都是受他而启发。我之所以启动 phpMyAdmin 这个项目是因为 Peter "
+"告诉我他不再开发他 (优秀) 的工具了。"
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4884
 msgid "Thanks go to"
-msgstr ""
+msgstr "在这里要感谢"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4887
@@ -11630,6 +11620,9 @@ msgid ""
 "1.1.1 he contributed the ldi_*.php3-set (Import text-files) as well as a bug-"
 "report. Plus many smaller improvements."
 msgstr ""
+"Amalesh Kempf <ak-lsml_at_living-source.com> "
+"贡献了检查是否正在删除数据表或数据库的代码。同时他建议在 tbl_create.php3 中应该可以让用户设置主键。在 1.1.1 版本中他贡献了 "
+"ldi_*.php3-set (导入文本文件) 、缺陷报告以及许多小改进。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4893
@@ -11639,6 +11632,8 @@ msgid ""
 "authentication). For 1.4.1 he enhanced the table-dump feature. Plus bug-"
 "fixes and help."
 msgstr ""
+"Jan Legenhausen <jan_at_nrw.net>: 他对 1.3.0 中引进的功能作出许多改进 "
+"(包括诸如认证这样的重要功能)。他还增强了 1.4.1 中的数据表转储功能。以及缺陷修正及帮助。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4898
@@ -11647,6 +11642,8 @@ msgid ""
 "language-independent by outsourcing the strings to a separate file. He also "
 "contributed the French translation."
 msgstr ""
+"Marc Delisle <DelislMa_at_CollegeSherbrooke.qc.ca> 通过使用单独的语言文件使 "
+"phpMyAdmin 实现语言分离。他也对法语翻译作出了贡献。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4902
@@ -11654,6 +11651,8 @@ msgid ""
 "Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed tbl_select."
 "php3, a feature to display only some columns from a table."
 msgstr ""
+"Alexandr Bravo <abravo_at_hq.admiral.ru> 贡献了 "
+"tbl_select.php3,可以只显示一张表中的某些字段的功能。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4905
@@ -11662,27 +11661,29 @@ msgid ""
 "in tbl_change.php3. He also added the "Query by Example" feature "
 "in 2.0."
 msgstr ""
+"Chris Jackson <chrisj_at_ctel.net> 在 tbl_change.php3 中添加了对 MySQL "
+"函数的支持。在 2.0 中添加了 "依例查询" 功能。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4909
 msgid ""
 "Dave Walton <walton_at_nordicdms.com> added support for multiple "
 "servers and is a regular contributor for bug-fixes."
-msgstr ""
+msgstr "Dave Walton <walton_at_nordicdms.com> 添加了多服务器的支持并且经常贡献缺陷修正。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: orig-docs/Documentation.html:4912
 msgid ""
 "Gabriel Ash <ga244_at_is8.nyu.edu> contributed the random access "
 "features for 2.0.6."
-msgstr ""
+msgstr "Gabriel Ash <ga244_at_is8.nyu.edu> 贡献了 2.0.6 中的随机访问功能。"
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4917
 msgid ""
 "The following people have contributed minor changes, enhancements, bugfixes "
 "or support for a new language:"
-msgstr ""
+msgstr "感谢下列对小的修改、改进、缺陷修正以及新语言支持作出贡献的人们:"
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4921
@@ -11692,13 +11693,17 @@ msgid ""
 "Kettler, Joe Pruett, Renato Lins, Mark Kronsbein, Jannis Hermanns, G. "
 "Wieggers."
 msgstr ""
+"Jim Kraai, Jordi Bruguera, Miquel Obrador, Geert Lund, Thomas Kleemann, "
+"Alexander Leidinger, Kiko Albiol, Daniel C. Chao, Pavel Piankov, Sascha "
+"Kettler, Joe Pruett, Renato Lins, Mark Kronsbein, Jannis Hermanns, G. "
+"Wieggers."
 
 #. type: Content of: <html><body><div><p>
 #: orig-docs/Documentation.html:4927
 msgid ""
 "And thanks to everyone else who sent me email with suggestions, bug-reports "
 "and or just some feedback."
-msgstr ""
+msgstr "同时感谢所有给我们提出建议、意见、报告缺陷以及使用反馈的热心用户。"
 
 #. type: Content of: <html><body><div><h2>
 #: orig-docs/Documentation.html:4931
@@ -12462,24 +12467,21 @@ msgstr "-->"
 
 #. type: Title =
 #: orig-docs/INSTALL:2
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "phpMyAdmin - Installation"
-msgstr "phpMyAdmin - 安装\n"
+msgstr "phpMyAdmin - 安装"
 
 #. type: Plain text
 #: orig-docs/INSTALL:5
-#, fuzzy
 msgid ""
 "Please have a look to the Documentation.txt or Documentation.html files."
-msgstr ""
-"\t参见 Documentation.txt 或 \n"
-"\tDocumentation.html 文件。\n"
+msgstr "请参见 Documentation.txt 或 Documentation.html 文件。"
 
 #. type: Title =
 #: orig-docs/TODO:2
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "phpMyAdmin - Todo"
-msgstr "phpMyAdmin - 计划\n"
+msgstr "phpMyAdmin - 计划"
 
 #. type: Plain text
 #: orig-docs/TODO:5
@@ -12499,15 +12501,14 @@ msgstr "-- swix/20010704"
 
 #. type: Title =
 #: orig-docs/README:2
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "phpMyAdmin - Readme"
-msgstr "phpMyAdmin - 读我\n"
+msgstr "phpMyAdmin - 读我"
 
 #. type: Plain text
 #: orig-docs/README:5
-#, fuzzy
 msgid "Version @@VER@@"
-msgstr "版本"
+msgstr "版本 @@VER@@"
 
 #. type: Plain text
 #: orig-docs/README:7
@@ -12516,21 +12517,22 @@ msgstr "使用 PHP 编写,通过 web 管理 MySQL 的工具。"
 
 #. type: Plain text
 #: orig-docs/README:9
-#, fuzzy
 msgid "http://www.phpmyadmin.net/"
 msgstr "http://www.phpmyadmin.net/"
 
 #. type: Plain text
 #: orig-docs/README:15
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "Copyright (C) 1998-2000\n"
 "    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
-msgstr "Tobias Ratschiller <tobias_at_ratschiller.com>"
+msgstr ""
+"版权所有 (C) 1998-2000\n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 
 #. type: Plain text
 #: orig-docs/README:26
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "Copyright (C) 2001-2011\n"
 "    Marc Delisle <marc_at_infomarc.info>\n"
@@ -12543,9 +12545,7 @@ msgid ""
 "    Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "    [check Documentation.txt/.html file for more details]\n"
 msgstr ""
-"版权所有 (C) 1998-2000 \n"
-"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
-"版权所有 (C) 2001-2010 \n"
+"版权所有 (C) 2001-2011\n"
 "    Marc Delisle <marc_at_infomarc.info>\n"
 "    Olivier Müller <om_at_omnis.ch>\n"
 "    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
@@ -12560,7 +12560,7 @@ msgstr ""
 #: orig-docs/README:28
 #, no-wrap
 msgid "License"
-msgstr ""
+msgstr "授权"
 
 #. type: Plain text
 #: orig-docs/README:47
@@ -12579,19 +12579,16 @@ msgstr ""
 
 #. type: Title -
 #: orig-docs/README:51
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "Summary"
-msgstr "概要\n"
+msgstr "概要"
 
 #. type: Plain text
 #: orig-docs/README:55
-#, fuzzy
 msgid ""
 "phpMyAdmin is intended to handle the administration of MySQL over the web.  "
 "For a summary of features, please see the Documentation.txt/.html file."
-msgstr ""
-"phpMyAdmin 旨在通过 web 管理 MySQL 。  具体功能请参见 Documentation.txt/."
-"html 文件。"
+msgstr "phpMyAdmin 旨在通过 web 管理 MySQL 。  具体功能请参见 Documentation.txt/.html 文件。"
 
 #. type: Title -
 #: orig-docs/README:57
@@ -12601,79 +12598,61 @@ msgstr "下载"
 
 #. type: Plain text
 #: orig-docs/README:60
-#, fuzzy
 msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr "你可以在 http://www.phpmyadmin.net/ 获得最新版本。"
 
 #. type: Title -
 #: orig-docs/README:62
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "More Information"
-msgstr "信息"
+msgstr "更多信息"
 
 #. type: Plain text
 #: orig-docs/README:65
-#, fuzzy
 msgid "Please see the Documentation.txt/.html file."
-msgstr "参见 Documentation.txt/.html 文件。"
+msgstr "请见 Documentation.txt/.html 文件。"
 
 #. type: Title -
 #: orig-docs/README:67
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "Support"
-msgstr "支持\n"
+msgstr "支持"
 
 #. type: Plain text
 #: orig-docs/README:70
-#, fuzzy
 msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr "参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息"
 
 #. type: Title -
 #: orig-docs/README:73
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "Enjoy!"
-msgstr "尽情享受吧!\n"
+msgstr "尽情享受吧!"
 
 #. type: Plain text
 #: orig-docs/README:76
-#, fuzzy
 msgid "The phpMyAdmin Devel team"
 msgstr "phpMyAdmin 开发组"
 
 #. type: Plain text
 #: orig-docs/README:79
-#, fuzzy
 msgid "PS:"
-msgstr "EPS"
+msgstr "附:"
 
 #. type: Plain text
 #: orig-docs/README:82
-#, fuzzy
 msgid ""
 "Please, don't send us emails with question like \"How do I compile PHP with "
 "MySQL-support\". We just don't have the time to be your free help desk."
-msgstr ""
-"附: \n"
-"    请勿向我们发送邮件询问诸如 \"怎样编译\n"
-"    支持 MySQL 的 PHP\" 之类的问题。我们\n"
-"    没有时间为您做免费咨询。\n"
-"    请将您的问题发送到相应的邮件列表或论坛。\n"
-"    在联系我们之前,请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。\n"
+msgstr "请勿向我们发送邮件询问诸如 \"怎样编译支持 MySQL 的 PHP\" 之类的问题。我们没有时间为您提供免费咨询。"
 
 #. type: Plain text
 #: orig-docs/README:85
-#, fuzzy
 msgid ""
 "Please send your questions to the appropriate mailing lists / forums.  "
 "Before contacting us, please read the Documentation.html (esp. the FAQ part)."
 msgstr ""
-"附: \n"
-"    请勿向我们发送邮件询问诸如 \"怎样编译\n"
-"    支持 MySQL 的 PHP\" 之类的问题。我们\n"
-"    没有时间为您做免费咨询。\n"
-"    请将您的问题发送到相应的邮件列表或论坛。\n"
-"    在联系我们之前,请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。\n"
+"请将您的问题发送至对应的邮件列表/论坛。  在联系我们之前,请阅读 Documentation.html (特别是常见问题 (FAQ) 部分)。"
 
 #~ msgid "<a href=\"translators.html\">Translators</a>"
 #~ msgstr "<a href=\"translators.html\">翻译</a>"


hooks/post-receive
-- 
phpMyAdmin localized documentation




More information about the Git mailing list