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

Michal Čihař nijel at users.sourceforge.net
Wed Mar 3 10:07:12 CET 2010


The branch, master has been updated
       via  aa0115b794e10a72b76f8dbbee64bc67fe0efa7a (commit)
       via  83f4be2047a940a722ff9c0f1e323db4dc4371ba (commit)
       via  638544ca5def04ed5b95f40dc1faa48c0057a677 (commit)
       via  2043ba7dc6463d4ca3f47e8c8b3e03c892cdf76e (commit)
       via  c662b26629457d44fe1cd235be6cde411ca14ebd (commit)
       via  eee45ea7c078cb91405db6d0ca30912fd7d71e01 (commit)
       via  1e38031f370876bf0b5acc0269baf387b83121f8 (commit)
       via  ce2bb76155c27393f328c055f7171898c6f75553 (commit)
       via  d33f2e87068a2008be19d1f340c5419c23040a9e (commit)
       via  4a041061567a4fb347e1b9b59e03858ebaa3225c (commit)
       via  44604c6f19ff05f7983a6744dd8087b7cb7d3df5 (commit)
       via  3aea79a39bde967fb672a4ffdd95ab60336d6c83 (commit)
       via  f69fea9195e09ee57b63c647db3e5b87926f445a (commit)
       via  fe5b8d51be0b7261eace16751145120a65232d2c (commit)
       via  3e77869afbd59902ddfd1e8dc91bc87bfc28e8ef (commit)
       via  b40d789e126e803d378c7ac84f47d36ea52831aa (commit)
       via  b45580d92534b6606b90cb4aa07bffc01281896a (commit)
       via  39475ce30d6eed805b9af7a4b72c0714c02e904b (commit)
       via  50007ca06f54f5daa246926a29cb6a295137beba (commit)
       via  91f61b5a7db9e6a309795aeb39d4d9f69b7e4250 (commit)
       via  f072bb8fe77c051e0f15aff7969a9b47457150ba (commit)
       via  0cb425935e1a206ad6b5b70b63db226885b69f52 (commit)
       via  f97eeed5f76e698ec9de94d45f3718014a42ecf4 (commit)
       via  642b95a55b784c0775065bc308df2718f15b3d6f (commit)
       via  5801bc041d7ef8ed2f3ac712e9a723399a5b3013 (commit)
       via  02b6f27a7f2b8401fc5a900bb7cfa15f9ec9165f (commit)
       via  1e34b6fce6ea516b5c42c4469a774eed9cbab7e4 (commit)
       via  a5ec242268d23d98484e7b5922412b3626d9c842 (commit)
       via  bd18a9e2c23bca500cdb5fd77ea6803af1e738da (commit)
       via  4637ae76679859178a296ba07a015fcd5d5dbdc7 (commit)
       via  04a445575a28221c6bc21ce7d061e544e734d017 (commit)
       via  76877bc3ea919e012af7d205c0dc0c246826a4de (commit)
       via  d32c10c52d89e2a7a27bd494e80f4d597ec71782 (commit)
       via  c014eca967ea08f0912604458c4bb661a8a5c551 (commit)
       via  cc3a271c153985cdc1a353d6352981c40568f1d5 (commit)
       via  e02aa8d04c82ac1d19647fae71ffb9cf43905d6b (commit)
       via  01795f223633f79ec17a8e3b8a542b2c39e2a54c (commit)
       via  f6a2707a3ed97886df122dcae6dfe00d6c0eb97e (commit)
       via  9c4226c62b502e8e03e3c9320f4dc58c4326a4a9 (commit)
       via  b3a5bf22f17aa5e716662633172bc3d9a521b283 (commit)
       via  f4cd8705f2c8822c7ba9da1651e645bec19ffe7a (commit)
       via  c260009302e2dda7bb55d5df146c6c712ef32492 (commit)
       via  d097a88f04f160fa09c726c553ee5612a896aefc (commit)
       via  93ddfd65c90476a04eca357634dbc87ab5f8618d (commit)
       via  542c1397e575a6694727396a51e35e2c1a0aa083 (commit)
       via  d9c7668167adfcb227826394ff8f93597956307f (commit)
       via  f8c21cbfe0c393dcc80a0b1ffa81464def8e4fbc (commit)
       via  4ddc586d42d8c28e4adc6993135fdefdc3d1a31e (commit)
       via  ac5dc1e00a747411b40f74f7a7e2da7922890eec (commit)
       via  918ef7d3ec6a1b90b958ca7613fcb1175e842a88 (commit)
       via  0a4f0b15e1a722cd4fbaadc29c0a6d923754edaf (commit)
       via  0fffdeed855a1e831a4d40cdeee176e75cf39c6a (commit)
       via  fbf46166f7601b10c4c6b83046f7cdf0daad261e (commit)
       via  fb1a2e689570c5124126e1dbb9f5c16d9a5fe0be (commit)
       via  f9f7cb3ed0ed11fc6af1d89846edae53e00e3792 (commit)
       via  2880ae3caab49e4ec7bb5e712355c5d57cee8c80 (commit)
       via  1bd3713d7ee94a1419d5220064afd9c7cefa51a3 (commit)
       via  c3ef84e3dc7c623a498d5489884160f78e905c00 (commit)
       via  4e19c1898cad9d35d55d8ec857d46eb7da8ff1d8 (commit)
       via  407a18e2114300fb7afd616478f79b6bd6da73f7 (commit)
       via  4ad09849738a1ff9023256cb8f8ef9b81a3d47fc (commit)
       via  73a72b43559bfa54d6d4fe9d9705487c5aadf61a (commit)
       via  72c935c0e9646a6fcb56bf4e83263810a56258ab (commit)
       via  8464050ab42b339096f743e55b60dad1cdea90f3 (commit)
       via  6f901462d2bac6a636a239da8d190961076723e3 (commit)
       via  c2fe88eb6e3ca35e904c1e67954f506a33373902 (commit)
       via  15a020bf707e1534fa87ea9605efa9d122aca2d7 (commit)
       via  74095f6efcbd26d897284db3929a5def0af3cee9 (commit)
       via  6ab284d66788898a56c195310293a88bd722df47 (commit)
       via  90395d4a04b38a87c3095bbee354b13d6dc48be1 (commit)
       via  116622b1a2be6a3f7422ac97a6a59df5320da105 (commit)
       via  89adf03b70b841a2da775e45a0a67638bb32f6d4 (commit)
      from  b9c3d1e18b943bf468f13c131d8abb70a3ed396d (commit)


- Log -----------------------------------------------------------------
commit aa0115b794e10a72b76f8dbbee64bc67fe0efa7a
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Mar 3 10:06:52 2010 +0100

    Regenerated translated docs.

commit 83f4be2047a940a722ff9c0f1e323db4dc4371ba
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 07:17:24 2010 +0200

    Translation update done using Pootle.

commit 638544ca5def04ed5b95f40dc1faa48c0057a677
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 07:16:50 2010 +0200

    Translation update done using Pootle.

commit 2043ba7dc6463d4ca3f47e8c8b3e03c892cdf76e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 07:16:37 2010 +0200

    Translation update done using Pootle.

commit c662b26629457d44fe1cd235be6cde411ca14ebd
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 07:13:30 2010 +0200

    Translation update done using Pootle.

commit eee45ea7c078cb91405db6d0ca30912fd7d71e01
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:21:15 2010 +0200

    Translation update done using Pootle.

commit 1e38031f370876bf0b5acc0269baf387b83121f8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:21:01 2010 +0200

    Translation update done using Pootle.

commit ce2bb76155c27393f328c055f7171898c6f75553
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:20:42 2010 +0200

    Translation update done using Pootle.

commit d33f2e87068a2008be19d1f340c5419c23040a9e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:20:21 2010 +0200

    Translation update done using Pootle.

commit 4a041061567a4fb347e1b9b59e03858ebaa3225c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:17:42 2010 +0200

    Translation update done using Pootle.

commit 44604c6f19ff05f7983a6744dd8087b7cb7d3df5
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:16:59 2010 +0200

    Translation update done using Pootle.

commit 3aea79a39bde967fb672a4ffdd95ab60336d6c83
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:16:48 2010 +0200

    Translation update done using Pootle.

commit f69fea9195e09ee57b63c647db3e5b87926f445a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:16:15 2010 +0200

    Translation update done using Pootle.

commit fe5b8d51be0b7261eace16751145120a65232d2c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:15:28 2010 +0200

    Translation update done using Pootle.

commit 3e77869afbd59902ddfd1e8dc91bc87bfc28e8ef
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:15:10 2010 +0200

    Translation update done using Pootle.

commit b40d789e126e803d378c7ac84f47d36ea52831aa
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:14:53 2010 +0200

    Translation update done using Pootle.

commit b45580d92534b6606b90cb4aa07bffc01281896a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:14:40 2010 +0200

    Translation update done using Pootle.

commit 39475ce30d6eed805b9af7a4b72c0714c02e904b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 06:10:40 2010 +0200

    Translation update done using Pootle.

commit 50007ca06f54f5daa246926a29cb6a295137beba
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:52:12 2010 +0200

    Translation update done using Pootle.

commit 91f61b5a7db9e6a309795aeb39d4d9f69b7e4250
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:51:45 2010 +0200

    Translation update done using Pootle.

commit f072bb8fe77c051e0f15aff7969a9b47457150ba
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:49:32 2010 +0200

    Translation update done using Pootle.

commit 0cb425935e1a206ad6b5b70b63db226885b69f52
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:47:08 2010 +0200

    Translation update done using Pootle.

commit f97eeed5f76e698ec9de94d45f3718014a42ecf4
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:45:20 2010 +0200

    Translation update done using Pootle.

commit 642b95a55b784c0775065bc308df2718f15b3d6f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:44:04 2010 +0200

    Translation update done using Pootle.

commit 5801bc041d7ef8ed2f3ac712e9a723399a5b3013
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:41:06 2010 +0200

    Translation update done using Pootle.

commit 02b6f27a7f2b8401fc5a900bb7cfa15f9ec9165f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:39:39 2010 +0200

    Translation update done using Pootle.

commit 1e34b6fce6ea516b5c42c4469a774eed9cbab7e4
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:37:08 2010 +0200

    Translation update done using Pootle.

commit a5ec242268d23d98484e7b5922412b3626d9c842
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:35:25 2010 +0200

    Translation update done using Pootle.

commit bd18a9e2c23bca500cdb5fd77ea6803af1e738da
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:31:53 2010 +0200

    Translation update done using Pootle.

commit 4637ae76679859178a296ba07a015fcd5d5dbdc7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:31:12 2010 +0200

    Translation update done using Pootle.

commit 04a445575a28221c6bc21ce7d061e544e734d017
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:28:34 2010 +0200

    Translation update done using Pootle.

commit 76877bc3ea919e012af7d205c0dc0c246826a4de
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:23:33 2010 +0200

    Translation update done using Pootle.

commit d32c10c52d89e2a7a27bd494e80f4d597ec71782
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:23:10 2010 +0200

    Translation update done using Pootle.

commit c014eca967ea08f0912604458c4bb661a8a5c551
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:21:41 2010 +0200

    Translation update done using Pootle.

commit cc3a271c153985cdc1a353d6352981c40568f1d5
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:18:48 2010 +0200

    Translation update done using Pootle.

commit e02aa8d04c82ac1d19647fae71ffb9cf43905d6b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:18:11 2010 +0200

    Translation update done using Pootle.

commit 01795f223633f79ec17a8e3b8a542b2c39e2a54c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:17:48 2010 +0200

    Translation update done using Pootle.

commit f6a2707a3ed97886df122dcae6dfe00d6c0eb97e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:15:26 2010 +0200

    Translation update done using Pootle.

commit 9c4226c62b502e8e03e3c9320f4dc58c4326a4a9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:15:04 2010 +0200

    Translation update done using Pootle.

commit b3a5bf22f17aa5e716662633172bc3d9a521b283
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:14:04 2010 +0200

    Translation update done using Pootle.

commit f4cd8705f2c8822c7ba9da1651e645bec19ffe7a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:12:39 2010 +0200

    Translation update done using Pootle.

commit c260009302e2dda7bb55d5df146c6c712ef32492
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:12:13 2010 +0200

    Translation update done using Pootle.

commit d097a88f04f160fa09c726c553ee5612a896aefc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:11:29 2010 +0200

    Translation update done using Pootle.

commit 93ddfd65c90476a04eca357634dbc87ab5f8618d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:11:09 2010 +0200

    Translation update done using Pootle.

commit 542c1397e575a6694727396a51e35e2c1a0aa083
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:11:02 2010 +0200

    Translation update done using Pootle.

commit d9c7668167adfcb227826394ff8f93597956307f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:10:07 2010 +0200

    Translation update done using Pootle.

commit f8c21cbfe0c393dcc80a0b1ffa81464def8e4fbc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:09:52 2010 +0200

    Translation update done using Pootle.

commit 4ddc586d42d8c28e4adc6993135fdefdc3d1a31e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:05:47 2010 +0200

    Translation update done using Pootle.

commit ac5dc1e00a747411b40f74f7a7e2da7922890eec
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:04:28 2010 +0200

    Translation update done using Pootle.

commit 918ef7d3ec6a1b90b958ca7613fcb1175e842a88
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 05:04:05 2010 +0200

    Translation update done using Pootle.

commit 0a4f0b15e1a722cd4fbaadc29c0a6d923754edaf
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:59:02 2010 +0200

    Translation update done using Pootle.

commit 0fffdeed855a1e831a4d40cdeee176e75cf39c6a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:58:49 2010 +0200

    Translation update done using Pootle.

commit fbf46166f7601b10c4c6b83046f7cdf0daad261e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:53:11 2010 +0200

    Translation update done using Pootle.

commit fb1a2e689570c5124126e1dbb9f5c16d9a5fe0be
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:53:00 2010 +0200

    Translation update done using Pootle.

commit f9f7cb3ed0ed11fc6af1d89846edae53e00e3792
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:52:46 2010 +0200

    Translation update done using Pootle.

commit 2880ae3caab49e4ec7bb5e712355c5d57cee8c80
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:52:02 2010 +0200

    Translation update done using Pootle.

commit 1bd3713d7ee94a1419d5220064afd9c7cefa51a3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:51:49 2010 +0200

    Translation update done using Pootle.

commit c3ef84e3dc7c623a498d5489884160f78e905c00
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:51:15 2010 +0200

    Translation update done using Pootle.

commit 4e19c1898cad9d35d55d8ec857d46eb7da8ff1d8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:47:13 2010 +0200

    Translation update done using Pootle.

commit 407a18e2114300fb7afd616478f79b6bd6da73f7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:46:40 2010 +0200

    Translation update done using Pootle.

commit 4ad09849738a1ff9023256cb8f8ef9b81a3d47fc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:45:14 2010 +0200

    Translation update done using Pootle.

commit 73a72b43559bfa54d6d4fe9d9705487c5aadf61a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:45:04 2010 +0200

    Translation update done using Pootle.

commit 72c935c0e9646a6fcb56bf4e83263810a56258ab
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:44:35 2010 +0200

    Translation update done using Pootle.

commit 8464050ab42b339096f743e55b60dad1cdea90f3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:42:57 2010 +0200

    Translation update done using Pootle.

commit 6f901462d2bac6a636a239da8d190961076723e3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:40:14 2010 +0200

    Translation update done using Pootle.

commit c2fe88eb6e3ca35e904c1e67954f506a33373902
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:39:45 2010 +0200

    Translation update done using Pootle.

commit 15a020bf707e1534fa87ea9605efa9d122aca2d7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:39:30 2010 +0200

    Translation update done using Pootle.

commit 74095f6efcbd26d897284db3929a5def0af3cee9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:37:59 2010 +0200

    Translation update done using Pootle.

commit 6ab284d66788898a56c195310293a88bd722df47
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:37:44 2010 +0200

    Translation update done using Pootle.

commit 90395d4a04b38a87c3095bbee354b13d6dc48be1
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:36:02 2010 +0200

    Translation update done using Pootle.

commit 116622b1a2be6a3f7422ac97a6a59df5320da105
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:35:11 2010 +0200

    Translation update done using Pootle.

commit 89adf03b70b841a2da775e45a0a67638bb32f6d4
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Mar 3 04:21:23 2010 +0200

    Translation update done using Pootle.

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

Summary of changes:
 output/zh_CN/Documentation.html |  243 ++++++++++++++++-----------------------
 po/zh_CN.po                     |  145 +++++++++++++++++------
 2 files changed, 206 insertions(+), 182 deletions(-)

diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html
index 9eaca89..78f8c2d 100644
--- a/output/zh_CN/Documentation.html
+++ b/output/zh_CN/Documentation.html
@@ -457,12 +457,11 @@ href="http://phpmyadmin.net/auth_key">http://phpmyadmin.net/auth_key
 <!-- CONFIGURATION -->
 <h2 id="config">设置</h2>
 
-<p> <span class="important">Warning for <acronym title="Apple
-Macintosh">Mac</acronym> users:</span> PHP does not seem to like <acronym
-title="Apple Macintosh">Mac</acronym> end of lines character
-("<tt>\r</tt>"). So ensure you choose the option that allows to
-use the *nix end of line character ("<tt>\n</tt>") in your text
-editor before saving a script you have modified.</p>
+<p> <span class="important"><acronym title="苹果麦金塔 (Apple
+Macintosh)">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title="苹果麦金塔
+(Apple Macintosh)">Mac</acronym> 式的换行符
+("<tt>\r</tt>")。所以在保存你所修改的文件之前,请确保你的文本编辑器使用 *nix 式的换行符 ("<tt>
+</tt>")。</p>
 
 <p> <span class="important">注意:</span> 几乎所有设置都在 <tt>config.inc.php</tt>
 文件中定义。如果此文件不存在,请参考<a href="#setup">快速安装</a>一节创建该文件。你只需要设置不同于
@@ -1015,99 +1014,73 @@ Protocol)">IP</abbr> 地址范围)<br />
         也不支持互联网协议第六版 (IPv6) 的地址。
     </dd>
     <dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span> 布尔</dt>
-    <dd>Disable using <tt>INFORMATION_SCHEMA</tt> to retrieve information (use
-<tt>SHOW</tt> commands instead), because of speed issues when many databases
-are present. Currently used in some parts of the code, more to come.
+    <dd>设置是否禁止通过 <tt>INFORMATION_SCHEMA</tt> 来获取信息 (用 <tt>SHOW</tt>
+命令代替),若不禁止且数据库很多时可能会造成性能下降。目前仅部分代码实现此功能,持续增加中。
     </dd>
     <dt><span
 id="cfg_Servers_ShowDatabasesCommand">$cfg['Servers'][$i]['ShowDatabasesCommand']</span>
-string</dt>
-    <dd>On a server with a huge number of databases, the default <tt>SHOW
-DATABASES</tt> command used to fetch the name of available databases will
-probably be too slow, so it can be replaced by faster commands (see
-<tt>libraries/config.default.php</tt> for examples).
+字符串</dt>
+    <dd>在有相当数量数据库的服务器上,通过默认的 <tt>SHOW DATABASES</tt>
+命令来查询可用数据库的名字可能会很慢,你可以用更快的命令来代替它 (参见 <tt>libraries/config.default.php</tt>
+文件中的例子)。
     </dd>
     <dt><span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span>
-boolean</dt>
-    <dd>Whether to count the number of tables for each database when preparing the
-list of databases for the navigation frame.
+布尔</dt>
+    <dd>设置是否在导航框架的数据库列表中显示每个数据库中数据表的总数。
     </dd>
     <dt><span
 id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span>
-string</dt>
-    <dd>Name of session which will be used for signon authentication method.
+字符串</dt>
+    <dd>signon 认证所用的会话名。
     </dd>
-    <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span>
-string</dt>
-    <dd>URL where user will be redirected to log in for signon authentication
-method. Should be absolute including protocol.
+    <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> 字符串</dt>
+    <dd>使用 signon 认证时用户将转到登录的 URL 。应为包含协议的绝对地址。
     </dd>
-    <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span>
-string</dt>
-    <dd>URL where user will be redirected after logout (doesn't affect config
-authentication method). Should be absolute including protocol.
+    <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span> 字符串</dt>
+    <dd>使用 signon 认证时用户退出后将转到的 URL (config 认证无效)。应为包含协议的绝对地址。
     </dd>
 
-    <dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt>
-    <dd>If you have more than one server configured, you can set
-<tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to that
-server when phpMyAdmin is started, or set it to 0 to be given a list of
-servers without logging in.<br />
-        If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST
-be set to that server.</dd>
-
-    <dt id="cfg_MaxDbList">$cfg['MaxDbList'] integer</dt>
-    <dd>The maximum number of database names to be displayed in the navigation frame
-and the database list.</dd>
-
-    <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt>
-    <dd>The maximum number of table names to be displayed in the main panel's list
-(except on the Export page). This limit is also enforced in the navigation
-panel when in Light mode.</dd>
-
-    <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] integer</dt>
-    <dd>The maximum number of characters when a SQL query is displayed. The default
-limit of 1000 should be correct to avoid the display of tons of hexadecimal
-codes that represent BLOBs, but some users have real SQL queries that are
-longer than 1000 characters. Also, if a query's length exceeds this limit,
-this query is not saved in the history.</dd>
-
-    <dt id="cfg_OBGzip">$cfg['OBGzip'] string/boolean</dt>
-    <dd>Defines whether to use GZip output buffering for increased speed in <abbr
-title="HyperText Transfer Protocol">HTTP</abbr> transfers.<br />
-        Set to true/false for enabling/disabling. When set to 'auto' (string),
-phpMyAdmin tries to enable output buffering and will automatically disable
-it if your browser has some problems with buffering. IE6 with a certain
-patch is known to cause data corruption when having enabled buffering.</dd>
-
-    <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] boolean</dt>
-    <dd>Whether persistent connections should be used or not (mysql_connect or
-mysql_pconnect).</dd>
-
-    <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt>
-    <dd>Whether to force using https while accessing phpMyAdmin.</dd>
-
-    <dt id="cfg_ExecTimeLimit">$cfg['ExecTimeLimit'] integer [number of seconds]</dt>
-    <dd>Set the number of seconds a script is allowed to run. If seconds is set to
-zero, no time limit is imposed.<br />
-        This setting is used while importing/exporting dump files and in the
-Synchronize feature but has no effect when PHP is running in safe mode.</dd>
-
-    <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] string</dt>
-    <dd>Path for storing session data (<a
-href="http://php.net/session_save_path">session_save_path PHP
-parameter</a>).</dd>
-
-    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt>
-    <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no
-limit is imposed.<br />
-        This setting is used while importing/exporting dump files and at some other
-places in phpMyAdmin so you definitely don't want to put here a too low
-value. It has no effect when PHP is running in safe mode.<br />
-        You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit
-the suffix (16 means 16 bytes!)</dd>
-
-    <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] boolean</dt>
+    <dt id="cfg_ServerDefault">$cfg['ServerDefault'] 整数</dt>
+    <dd>如果有多个服务器设置,你可以设置 <tt>$cfg['ServerDefault']</tt> 为其中之一,phpMyAdmin 将会自动连接,若设为
+0 则将在登录页面显示服务器列表。<br />
+        如果只有一个服务器设置,<tt>$cfg['ServerDefault']</tt> 必须设为那台服务器。</dd>
+
+    <dt id="cfg_MaxDbList">$cfg['MaxDbList'] 整数</dt>
+    <dd>导航框架和数据库列表中所显示数据库的最大数量。</dd>
+
+    <dt id="cfg_MaxTableList">$cfg['MaxTableList'] 整数</dt>
+    <dd>轻量级模式导航框架和主框架列表 (除导出页) 中所显示数据表的最大数量。</dd>
+
+    <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] 整数</dt>
+    <dd>显示 SQL 查询的最大字数。默认值 1000 通常可以避免 BLOB 字段中十六进制内容的显示,但有些用户确实有超过 1000 字的 SQL
+查询。另外,如果一个查询超过了这个限制,也将不会保存在查询历史中。</dd>
+
+    <dt id="cfg_OBGzip">$cfg['OBGzip'] 字符串/布尔</dt>
+    <dd>设置是否使用 GZip 压缩输出缓冲来加速 <abbr title="超文本转移协议 (HyperText Transfer
+Protocol)">HTTP</abbr> 传输。<br />
+        设为 true/false 以启/禁用。当设为 'auto' (字符串) 时,phpMyAdmin
+将尝试启用输出缓冲并在浏览器对缓冲支持有问题时自动禁用。已知具有特定补丁的 IE6 会在启用缓冲时导致数据损坏。</dd>
+
+    <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] 布尔</dt>
+    <dd>设置是否使用持久连接 (mysql_connect 还是 mysql_pconnect) 。</dd>
+
+    <dt id="cfg_ForceSSL">$cfg['ForceSSL'] 布尔</dt>
+    <dd>设置在访问 phpMyAdmin 时是否强制使用 https 安全连接。</dd>
+
+    <dt id="cfg_ExecTimeLimit">$cfg['ExecTimeLimit'] 整数 [单位: 秒]</dt>
+    <dd>设置脚本可以运行的时间。若设为 0 则无限制。<br />
+        本设置用于导入/导出转储文件以及同步功能中,若 PHP 运行于安全模式则无效。</dd>
+
+    <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] 字符串</dt>
+    <dd>保存会话数据的路径 (<a href="http://php.net/session_save_path">PHP 参数
+session_save_path (外链,英语)</a>)。</dd>
+
+    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] 整数 [单位: 字节]</dt>
+    <dd>设置脚本运行的可使用的内存。若设为 0 则无限制。<br />
+        本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能,所以显然不要设置一个很小的值。若 PHP 运行于安全模式则无效。<br />
+        同样可以设置为 php.ini 中可以识别的字符串,如 '16M' 。请确保没有丢掉后缀 (16 表示 16 字节!)</dd>
+
+    <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] 布尔</dt>
     <dd>Mark used tables and make it possible to show databases with locked tables
 (since MySQL 3.23.30).</dd>
 
@@ -4275,45 +4248,30 @@ synchronize</a>
 
 
 <!-- DEVELOPERS -->
-<h2 id="developers">Developers Information</h2>
-
-<p> phpMyAdmin is Open Source, so you're invited to contribute to it. Many great
-features have been written by other people and you too can help to make
-phpMyAdmin a useful tool.</p>
-
-<p> If you're planning to contribute source, please read the following
-information:</p>
-
-<ul><li>All files include <i>libraries/header.inc.php</i> (layout),.
-<i>libraries/common.lib.php</i> (common functions) and
-<i>config.inc.php</i>.<br />
-        Only configuration data should go in <i>config.inc.php</i>. Please keep it
-free from other code.<br />
-        Commonly used functions should be added to <i>libraries/common.lib.php</i>
-and more specific ones may be added within a library stored into the
-<i>libraries</i> sub-directory.</li>
-    <li>Obviously, you're free to use whatever coding style you want. But please try
-to keep your code as simple as possible: beginners are using phpMyAdmin as
-an example application.<br />
-        As far as possible, we want the scripts to be XHTML1.0 and CSS2 compliant on
-one hand, they fit the <a href="http://pear.php.net/"> <abbr title="PHP
-Extension and Application Repository">PEAR</abbr> coding standards</a> on
-the other hand. Please pay attention to this.</li>
-    <li>Please try to keep up the file-naming conventions. Table-related stuff goes
-to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related
-tools to <i>server_*.php</i> and so on.</li>
-    <li>Please don't put message strings in your code, instead add the string (at
-least) to <i>english-utf-8.inc.php</i> and print() it out.</li>
-    <li>If you want to be really helpful, write an entry for the ChangeLog.</li>
+<h2 id="developers">开发信息</h2>
+
+<p> phpMyAdmin 是开源的,我们欢迎您的参与。很多优秀的功能都不是我们写的,你同样可以帮助 phpMyAdmin 变成更加实用的工具。</p>
+
+<p> 如果您正打算贡献源代码,请阅读以下信息:</p>
+
+<ul><li>所有文件包括 <i>libraries/header.inc.php</i> (布局)、<i>libraries/common.lib.php</i>
+(公共函数) 以及 <i>config.inc.php</i> 。<br />
+        <i>config.inc.php</i> 中应只存放设置。请勿在其中加入其他代码。<br />
+        公共函数应添加在 <i>libraries/common.lib.php</i> 中,特定功能的函数可以单独的函数库文件形式放在
+<i>libraries</i> 子目录中。</li>
+    <li>您可以使用任何喜欢的格式书写代码。但请尽量保持代码简洁: 初学者经常使用 phpMyAdmin 作为范例来学习。<br />
+        此外,我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href="http://pear.php.net/"> <abbr
+title="PHP 扩展和应用程序库 (PHP Extension and Application Repository)">PEAR</abbr>
+代码标准</a>。请尽量注意。</li>
+    <li>请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>,数据库相关的用 <i>db_*.php</i>,服务器相关的用
+<i>server_*.php</i> 等。</li>
+    <li>请将消息字符串 (至少) 放在<i>english-utf-8.inc.php</i> 中然后用 print() 函数输出,而不是直接写在代码中。</li>
+    <li>如果您写一份更新记录,这将会更加有帮助。</li>
     <li id="developersdbg">
-        The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP Debugger DBG</a>) is
-now supported by phpMyAdmin for developers to better debug and profile their
-code.<br />
-        Please see the <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a>
-configuration options for more information.<br />
-        This is in memoriam of the Space Shuttle Columbia (STS-107) which was lost
-during its re-entry into Earth's atmosphere and in memory of the brave men
-and women who gave their lives for the people of Earth.</li>
+        phpMyAdmin 现在已经支持 DBG 扩展 (<a href="http://dd.cron.ru/dbg/">PHP 调试器 DBG
+(外链,英语)</a>) 以便开发者能更好地调试以及测试他们的代码。<br />
+        更多信息请参见 <a href="#cfg_DBG" class="configrule">$cfg['DBG']*</a> 设置选项。<br />
+        纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人民牺牲的勇敢的人们。</li>
 </ul>
 
 <h2 id="copyright">版权</h2>
@@ -4355,34 +4313,33 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 <li>Tobias Ratschiller <tobias_at_ratschiller.com>
 <ul>
   <li>phpmyadmin 项目创始人</li>
-  <li>maintainer from 1998 to summer 2000</li>
+  <li>1998 至 2000 年夏季的主要维护人</li>
 </ul></li>
 
 <li>Marc Delisle <marc_at_infomarc.info>
 <ul>
-  <li>multi-language version</li>
-  <li>various fixes and improvements</li>
-  <li><abbr title="structured query language">SQL</abbr> analyser (most of it)</li>
-  <li>current project maintainer</li>
+  <li>多语言版本</li>
+  <li>许多修正和改进</li>
+  <li><abbr title="结构化查询语言 (structured query language)">SQL</abbr> 分析器 (大部分)</li>
+  <li>目前的主要维护人</li>
 </ul></li>
 
 <li>Olivier Müller <om_at_omnis.ch>
 <ul>
-  <li>started SourceForge phpMyAdmin project in March 2001</li>
-  <li>sync'ed different existing CVS trees with new features and bugfixes</li>
-  <li>multi-language improvements, dynamic language selection</li>
-  <li>current project maintainer</li>
-  <li>many bugfixes and improvements</li>
+  <li>于 2001 年 3 月在 SourceForge 启动 phpMyAdmin 项目</li>
+  <li>同步新功能和缺陷修正到不同的 CVS</li>
+  <li>改进多语言,动态语言选择</li>
+  <li>目前的主要维护人</li>
+  <li>许多缺陷修正和改进</li>
 </ul></li>
 
 <li>Loïc Chapeaux <lolo_at_phpheaven.net>
 <ul>
-  <li>rewrote and optimized javascript, DHTML and DOM stuff</li>
-  <li>rewrote the scripts so they fit the <abbr title="PHP Extension and
-Application Repository">PEAR</abbr> coding standards and generate XHTML1.0
-and CSS2 compliant codes</li>
-  <li>improved the language detection system</li>
-  <li>many bugfixes and improvements</li>
+  <li>重写并优化 javascript、DHTML 和 DOM</li>
+  <li>重写脚本使其符合 <abbr title="PHP 扩展和应用程序库 (PHP Extension and Application
+Repository)">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范</li>
+  <li>改进语言识别系统</li>
+  <li>许多缺陷修正和改进</li>
 </ul></li>
 
 <li>Robin Johnson <robbat2_at_users.sourceforge.net>
@@ -4393,7 +4350,7 @@ and CSS2 compliant codes</li>
   <li>DB-based configuration (Not completed)</li>
   <li><abbr title="structured query language">SQL</abbr> parser and pretty-printer</li>
   <li><abbr title="structured query language">SQL</abbr> validator</li>
-  <li>many bugfixes and improvements</li>
+  <li>许多缺陷修正和改进</li>
 </ul></li>
 
 <li>Armel Fauveau <armel.fauveau_at_globalis-ms.com>
@@ -4525,7 +4482,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
 <li>Marcel Tschopp <ne0x_at_users.sourceforge.net>
 <ul>
   <li>mysqli support</li>
-  <li>many bugfixes and improvements</li>
+  <li>许多缺陷修正和改进</li>
 </ul></li>
 
 <li>Michael Keck <mkkeck_at_users.sourceforge.net>
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba4e31f..cc04521 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: 2010-03-01 08:21+0100\n"
-"PO-Revision-Date: 2010-03-02 08:32+0200\n"
+"PO-Revision-Date: 2010-03-03 07:17+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -1455,6 +1455,12 @@ msgid ""
 "of line character ("<tt>\\n</tt>") in your text editor before "
 "saving a script you have modified."
 msgstr ""
+"<span class=\"important\"><acronym title=\"苹果麦金塔 (Apple Macintosh)"
+"\">Mac</acronym> 用户注意:</span> PHP 似乎不支持 <acronym title=\"苹果麦金塔 "
+"(Apple Macintosh)\">Mac</acronym> 式的换行符 ("<tt>\r</tt>")。所以"
+"在保存你所修改的文件之前,请确保你的文本编辑器使用 *nix 式的换行符 (""
+"<tt>\n"
+"</tt>")。"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:577
@@ -3073,6 +3079,9 @@ msgid ""
 "<tt>SHOW</tt> commands instead), because of speed issues when many databases "
 "are present. Currently used in some parts of the code, more to come."
 msgstr ""
+"设置是否禁止通过 <tt>INFORMATION_SCHEMA</tt> 来获取信息 (用 <tt>SHOW</tt> 命"
+"令代替),若不禁止且数据库很多时可能会造成性能下降。目前仅部分代码实现此功能,"
+"持续增加中。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1248
@@ -3080,6 +3089,8 @@ msgid ""
 "<span id=\"cfg_Servers_ShowDatabasesCommand\">$cfg['Servers'][$i]"
 "['ShowDatabasesCommand']</span> string"
 msgstr ""
+"<span id=\"cfg_Servers_ShowDatabasesCommand\">$cfg['Servers'][$i]"
+"['ShowDatabasesCommand']</span> 字符串"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1249
@@ -3089,6 +3100,9 @@ msgid ""
 "too slow, so it can be replaced by faster commands (see <tt>libraries/config."
 "default.php</tt> for examples)."
 msgstr ""
+"在有相当数量数据库的服务器上,通过默认的 <tt>SHOW DATABASES</tt> 命令来查询可"
+"用数据库的名字可能会很慢,你可以用更快的命令来代替它 (参见 <tt>libraries/"
+"config.default.php</tt> 文件中的例子)。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1254
@@ -3096,13 +3110,15 @@ msgid ""
 "<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</"
 "span> boolean"
 msgstr ""
+"<span id=\"cfg_Servers_CountTables\">$cfg['Servers'][$i]['CountTables']</"
+"span> 布尔"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1255
 msgid ""
 "Whether to count the number of tables for each database when preparing the "
 "list of databases for the navigation frame."
-msgstr ""
+msgstr "设置是否在导航框架的数据库列表中显示每个数据库中数据表的总数。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1257
@@ -3110,11 +3126,13 @@ msgid ""
 "<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</"
 "span> string"
 msgstr ""
+"<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</"
+"span> 字符串"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1258
 msgid "Name of session which will be used for signon authentication method."
-msgstr ""
+msgstr "signon 认证所用的会话名。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1260
@@ -3122,13 +3140,15 @@ msgid ""
 "<span id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span> "
 "string"
 msgstr ""
+"<span id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span> 字"
+"符串"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1261
 msgid ""
 "URL where user will be redirected to log in for signon authentication "
 "method. Should be absolute including protocol."
-msgstr ""
+msgstr "使用 signon 认证时用户将转到登录的 URL 。应为包含协议的绝对地址。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1263
@@ -3136,6 +3156,8 @@ msgid ""
 "<span id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span> "
 "string"
 msgstr ""
+"<span id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span> 字"
+"符串"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1264
@@ -3143,11 +3165,13 @@ msgid ""
 "URL where user will be redirected after logout (doesn't affect config "
 "authentication method). Should be absolute including protocol."
 msgstr ""
+"使用 signon 认证时用户退出后将转到的 URL (config 认证无效)。应为包含协议的绝"
+"对地址。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1267
 msgid "$cfg['ServerDefault'] integer"
-msgstr ""
+msgstr "$cfg['ServerDefault'] 整数"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1268
@@ -3157,6 +3181,8 @@ msgid ""
 "phpMyAdmin is started, or set it to 0 to be given a list of servers without "
 "logging in."
 msgstr ""
+"如果有多个服务器设置,你可以设置 <tt>$cfg['ServerDefault']</tt> 为其中之一,"
+"phpMyAdmin 将会自动连接,若设为 0 则将在登录页面显示服务器列表。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1272
@@ -3164,23 +3190,24 @@ msgid ""
 "If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST "
 "be set to that server."
 msgstr ""
+"如果只有一个服务器设置,<tt>$cfg['ServerDefault']</tt> 必须设为那台服务器。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1275
 msgid "$cfg['MaxDbList'] integer"
-msgstr ""
+msgstr "$cfg['MaxDbList'] 整数"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1276
 msgid ""
 "The maximum number of database names to be displayed in the navigation frame "
 "and the database list."
-msgstr ""
+msgstr "导航框架和数据库列表中所显示数据库的最大数量。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1279
 msgid "$cfg['MaxTableList'] integer"
-msgstr ""
+msgstr "$cfg['MaxTableList'] 整数"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1280
@@ -3188,12 +3215,12 @@ msgid ""
 "The maximum number of table names to be displayed in the main panel's list "
 "(except on the Export page). This limit is also enforced in the navigation "
 "panel when in Light mode."
-msgstr ""
+msgstr "轻量级模式导航框架和主框架列表 (除导出页) 中所显示数据表的最大数量。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1284
 msgid "$cfg['MaxCharactersInDisplayedSQL'] integer"
-msgstr ""
+msgstr "$cfg['MaxCharactersInDisplayedSQL'] 整数"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1285
@@ -3204,11 +3231,14 @@ msgid ""
 "longer than 1000 characters. Also, if a query's length exceeds this limit, "
 "this query is not saved in the history."
 msgstr ""
+"显示 SQL 查询的最大字数。默认值 1000 通常可以避免 BLOB 字段中十六进制内容的显"
+"示,但有些用户确实有超过 1000 字的 SQL 查询。另外,如果一个查询超过了这个限"
+"制,也将不会保存在查询历史中。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1291
 msgid "$cfg['OBGzip'] string/boolean"
-msgstr ""
+msgstr "$cfg['OBGzip'] 字符串/布尔"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1292
@@ -3216,6 +3246,8 @@ msgid ""
 "Defines whether to use GZip output buffering for increased speed in <abbr "
 "title=\"HyperText Transfer Protocol\">HTTP</abbr> transfers."
 msgstr ""
+"设置是否使用 GZip 压缩输出缓冲来加速 <abbr title=\"超文本转移协议 (HyperText "
+"Transfer Protocol)\">HTTP</abbr> 传输。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1294
@@ -3225,40 +3257,43 @@ msgid ""
 "it if your browser has some problems with buffering. IE6 with a certain "
 "patch is known to cause data corruption when having enabled buffering."
 msgstr ""
+"设为 true/false 以启/禁用。当设为 'auto' (字符串) 时,phpMyAdmin 将尝试启用输"
+"出缓冲并在浏览器对缓冲支持有问题时自动禁用。已知具有特定补丁的 IE6 会在启用缓"
+"冲时导致数据损坏。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1299
 msgid "$cfg['PersistentConnections'] boolean"
-msgstr ""
+msgstr "$cfg['PersistentConnections'] 布尔"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1300
 msgid ""
 "Whether persistent connections should be used or not (mysql_connect or "
 "mysql_pconnect)."
-msgstr ""
+msgstr "设置是否使用持久连接 (mysql_connect 还是 mysql_pconnect) 。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1303
 msgid "$cfg['ForceSSL'] boolean"
-msgstr ""
+msgstr "$cfg['ForceSSL'] 布尔"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1304
 msgid "Whether to force using https while accessing phpMyAdmin."
-msgstr ""
+msgstr "设置在访问 phpMyAdmin 时是否强制使用 https 安全连接。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1306
 msgid "$cfg['ExecTimeLimit'] integer [number of seconds]"
-msgstr ""
+msgstr "$cfg['ExecTimeLimit'] 整数 [单位: 秒]"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1307
 msgid ""
 "Set the number of seconds a script is allowed to run. If seconds is set to "
 "zero, no time limit is imposed."
-msgstr ""
+msgstr "设置脚本可以运行的时间。若设为 0 则无限制。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1309
@@ -3266,11 +3301,12 @@ msgid ""
 "This setting is used while importing/exporting dump files and in the "
 "Synchronize feature but has no effect when PHP is running in safe mode."
 msgstr ""
+"本设置用于导入/导出转储文件以及同步功能中,若 PHP 运行于安全模式则无效。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1312
 msgid "$cfg['SessionSavePath'] string"
-msgstr ""
+msgstr "$cfg['SessionSavePath'] 字符串"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1313
@@ -3278,18 +3314,20 @@ msgid ""
 "Path for storing session data (<a href=\"http://php.net/session_save_path"
 "\">session_save_path PHP parameter</a>)."
 msgstr ""
+"保存会话数据的路径 (<a href=\"http://php.net/session_save_path\">PHP 参数 "
+"session_save_path (外链,英语)</a>)。"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1316
 msgid "$cfg['MemoryLimit'] integer [number of bytes]"
-msgstr ""
+msgstr "$cfg['MemoryLimit'] 整数 [单位: 字节]"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1317
 msgid ""
 "Set the number of bytes a script is allowed to allocate. If set to zero, no "
 "limit is imposed."
-msgstr ""
+msgstr "设置脚本运行的可使用的内存。若设为 0 则无限制。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1319
@@ -3298,6 +3336,8 @@ msgid ""
 "places in phpMyAdmin so you definitely don't want to put here a too low "
 "value. It has no effect when PHP is running in safe mode."
 msgstr ""
+"本设置用于导入/导出转储文件以及 phpMyAdmin 的其他功能,所以显然不要设置一个很"
+"小的值。若 PHP 运行于安全模式则无效。"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1322
@@ -3305,11 +3345,13 @@ msgid ""
 "You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit "
 "the suffix (16 means 16 bytes!)"
 msgstr ""
+"同样可以设置为 php.ini 中可以识别的字符串,如 '16M' 。请确保没有丢掉后缀 (16 "
+"表示 16 字节!)"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:1325
 msgid "$cfg['SkipLockedTables'] boolean"
-msgstr ""
+msgstr "$cfg['SkipLockedTables'] 布尔"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:1326
@@ -9929,7 +9971,7 @@ msgstr ""
 #. type: Content of: <html><body><div><h2>
 #: ../phpmyadmin/Documentation.html:4415
 msgid "Developers Information"
-msgstr ""
+msgstr "开发信息"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4417
@@ -9938,13 +9980,15 @@ msgid ""
 "features have been written by other people and you too can help to make "
 "phpMyAdmin a useful tool."
 msgstr ""
+"phpMyAdmin 是开源的,我们欢迎您的参与。很多优秀的功能都不是我们写的,你同样可"
+"以帮助 phpMyAdmin 变成更加实用的工具。"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4421
 msgid ""
 "If you're planning to contribute source, please read the following "
 "information:"
-msgstr ""
+msgstr "如果您正打算贡献源代码,请阅读以下信息:"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4424
@@ -9952,13 +9996,15 @@ msgid ""
 "All files include <i>libraries/header.inc.php</i> (layout),.  <i>libraries/"
 "common.lib.php</i> (common functions) and <i>config.inc.php</i>."
 msgstr ""
+"所有文件包括 <i>libraries/header.inc.php</i> (布局)、<i>libraries/common.lib."
+"php</i> (公共函数) 以及 <i>config.inc.php</i> 。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4427
 msgid ""
 "Only configuration data should go in <i>config.inc.php</i>. Please keep it "
 "free from other code."
-msgstr ""
+msgstr "<i>config.inc.php</i> 中应只存放设置。请勿在其中加入其他代码。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4429
@@ -9967,6 +10013,8 @@ msgid ""
 "and more specific ones may be added within a library stored into the "
 "<i>libraries</i> sub-directory."
 msgstr ""
+"公共函数应添加在 <i>libraries/common.lib.php</i> 中,特定功能的函数可以单独的"
+"函数库文件形式放在 <i>libraries</i> 子目录中。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4432
@@ -9975,6 +10023,8 @@ msgid ""
 "to keep your code as simple as possible: beginners are using phpMyAdmin as "
 "an example application."
 msgstr ""
+"您可以使用任何喜欢的格式书写代码。但请尽量保持代码简洁: 初学者经常使用 "
+"phpMyAdmin 作为范例来学习。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4435
@@ -9984,6 +10034,9 @@ msgid ""
 "Extension and Application Repository\">PEAR</abbr> coding standards</a> on "
 "the other hand. Please pay attention to this."
 msgstr ""
+"此外,我们希望能兼容 XHTML1.0 和 CSS2 并且符合 <a href=\"http://pear.php.net/"
+"\"> <abbr title=\"PHP 扩展和应用程序库 (PHP Extension and Application "
+"Repository)\">PEAR</abbr> 代码标准</a>。请尽量注意。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4441
@@ -9992,6 +10045,8 @@ msgid ""
 "to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related "
 "tools to <i>server_*.php</i> and so on."
 msgstr ""
+"请尽量保持文件命名约定。数据表相关的用 <i>tbl_*.php</i>,数据库相关的用 "
+"<i>db_*.php</i>,服务器相关的用 <i>server_*.php</i> 等。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4444
@@ -9999,11 +10054,13 @@ msgid ""
 "Please don't put message strings in your code, instead add the string (at "
 "least) to <i>english-utf-8.inc.php</i> and print() it out."
 msgstr ""
+"请将消息字符串 (至少) 放在<i>english-utf-8.inc.php</i> 中然后用 print() 函数"
+"输出,而不是直接写在代码中。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4446
 msgid "If you want to be really helpful, write an entry for the ChangeLog."
-msgstr ""
+msgstr "如果您写一份更新记录,这将会更加有帮助。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4448
@@ -10012,6 +10069,8 @@ msgid ""
 "is now supported by phpMyAdmin for developers to better debug and profile "
 "their code."
 msgstr ""
+"phpMyAdmin 现在已经支持 DBG 扩展 (<a href=\"http://dd.cron.ru/dbg/\">PHP 调试"
+"器 DBG (外链,英语)</a>) 以便开发者能更好地调试以及测试他们的代码。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4451
@@ -10019,6 +10078,8 @@ msgid ""
 "Please see the <a href=\"#cfg_DBG\" class=\"configrule\">$cfg['DBG']*</a> "
 "configuration options for more information."
 msgstr ""
+"更多信息请参见 <a href=\"#cfg_DBG\" class=\"configrule\">$cfg['DBG']*</a> 设"
+"置选项。"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4454
@@ -10027,6 +10088,8 @@ msgid ""
 "during its re-entry into Earth's atmosphere and in memory of the brave men "
 "and women who gave their lives for the people of Earth."
 msgstr ""
+"纪念哥伦比亚号航天飞机 (STS-107) 在重新进入地球大气层时爆炸以及纪念为了地球人"
+"民牺牲的勇敢的人们。"
 
 #. type: Content of: <html><body><div><h2>
 #: ../phpmyadmin/Documentation.html:4459
@@ -10114,69 +10177,71 @@ msgstr "phpmyadmin 项目创始人"
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4503
 msgid "maintainer from 1998 to summer 2000"
-msgstr ""
+msgstr "1998 至 2000 年夏季的主要维护人"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4506
 msgid "Marc Delisle <marc_at_infomarc.info>"
-msgstr ""
+msgstr "Marc Delisle <marc_at_infomarc.info>"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4508
 msgid "multi-language version"
-msgstr ""
+msgstr "多语言版本"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4509
 msgid "various fixes and improvements"
-msgstr ""
+msgstr "许多修正和改进"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4510
 msgid ""
 "<abbr title=\"structured query language\">SQL</abbr> analyser (most of it)"
 msgstr ""
+"<abbr title=\"结构化查询语言 (structured query language)\">SQL</abbr> 分析器 "
+"(大部分)"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4511 ../phpmyadmin/Documentation.html:4519
 msgid "current project maintainer"
-msgstr ""
+msgstr "目前的主要维护人"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4514
 msgid "Olivier Müller <om_at_omnis.ch>"
-msgstr ""
+msgstr "Olivier Müller <om_at_omnis.ch>"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4516
 msgid "started SourceForge phpMyAdmin project in March 2001"
-msgstr ""
+msgstr "于 2001 年 3 月在 SourceForge 启动 phpMyAdmin 项目"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4517
 msgid "sync'ed different existing CVS trees with new features and bugfixes"
-msgstr ""
+msgstr "同步新功能和缺陷修正到不同的 CVS"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4518
 msgid "multi-language improvements, dynamic language selection"
-msgstr ""
+msgstr "改进多语言,动态语言选择"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4520 ../phpmyadmin/Documentation.html:4529
 #: ../phpmyadmin/Documentation.html:4540 ../phpmyadmin/Documentation.html:4667
 msgid "many bugfixes and improvements"
-msgstr ""
+msgstr "许多缺陷修正和改进"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4523
 msgid "Loïc Chapeaux <lolo_at_phpheaven.net>"
-msgstr ""
+msgstr "Loïc Chapeaux <lolo_at_phpheaven.net>"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4525
 msgid "rewrote and optimized javascript, DHTML and DOM stuff"
-msgstr ""
+msgstr "重写并优化 javascript、DHTML 和 DOM"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4526
@@ -10185,16 +10250,18 @@ msgid ""
 "Application Repository\">PEAR</abbr> coding standards and generate XHTML1.0 "
 "and CSS2 compliant codes"
 msgstr ""
+"重写脚本使其符合 <abbr title=\"PHP 扩展和应用程序库 (PHP Extension and "
+"Application Repository)\">PEAR</abbr> 代码标准以及 XHTML1.0 和 CSS2 规范"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4528
 msgid "improved the language detection system"
-msgstr ""
+msgstr "改进语言识别系统"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4532
 msgid "Robin Johnson <robbat2_at_users.sourceforge.net>"
-msgstr ""
+msgstr "Robin Johnson <robbat2_at_users.sourceforge.net>"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4534


hooks/post-receive
-- 
phpMyAdmin localized documentation




More information about the Git mailing list