[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14008-g7664fb3

Michal Čihař nijel at users.sourceforge.net
Wed Aug 10 10:43:23 CEST 2011


The branch, master has been updated
       via  7664fb30e94af952c0c11c63a47d656b43b9dbd6 (commit)
       via  083c85a9b3db9b1795207b0063fa3adeb03ac2eb (commit)
       via  384bb236297da3bab8bfe34cf7c3e4b6332d1645 (commit)
       via  9556e428328f26ac829202e1ba03388aea1a3e72 (commit)
       via  1d99b06245506635ad319a5905b5e9b680872b6e (commit)
       via  a42b79ca9bf96e71396b9b5559a6811dec697abe (commit)
       via  880abde28a99d77d46a96a334319fc44035be88e (commit)
       via  3a53d5450403cf94db92b9d0389a815db8cb6d9b (commit)
       via  5e959921da349301436caab4542cd7d26a2de825 (commit)
       via  0312d682de4d6614a04914afa3bf3f8cbb5fa277 (commit)
       via  a91743b5d086516893ec6a0792bcb32eb354e935 (commit)
       via  4a9407f9893d0d03f73a8fe7de3a476c9ae85b32 (commit)
       via  1fa877f7dd7b1cc141368d80f9472b399fc0c59a (commit)
       via  066a975d389256c8a720ca5c7c72b613871cdad8 (commit)
       via  2798c213695ebbd526be377629b10cd99375ed73 (commit)
       via  d05714fc7b4eb0ba3bc75153a24c6fe8b8f663a1 (commit)
       via  11955f86a34ddb10a24b95b69af4841d609703cd (commit)
       via  5a26afedeb17b9d85ee7c6c733a7d2dccdfd2f15 (commit)
       via  ada980375501b2533c15ed48bbb1c2b4b10ffd4c (commit)
       via  b691d95bc0b453a451b908a7181df34b40b5e36f (commit)
       via  1a077e1a889c2dbc1e359804d6f65bb46f4ca7bf (commit)
       via  cde437697058d1ad1af81412fad9e1ba54072e43 (commit)
       via  782f1f5da38741382df2d49d708af35b0636cbc6 (commit)
       via  f706abed75279f9ec8bfe65279d98113641ef72b (commit)
       via  34e89c646617b0d17d2e9b4a106455aaec7e8058 (commit)
       via  c760adcda4d09100385cb50f02534b90bf6b7036 (commit)
       via  13ab249ea8d33ed598203fccf17d56b890618081 (commit)
       via  93bacd1c9bf76f2eea54bac1f1f6dbef2d480b1b (commit)
       via  06b5af4c33e5ea70d4fd74676b4034f09ecfcc33 (commit)
       via  fc113efa7c92b34f35fd0cf8bf5c9304598f2206 (commit)
       via  87eadcedc7c53411c3cbedcd0a035f663a56a10c (commit)
       via  57337f6be0e789597bbadf3e430f5a5db969570a (commit)
       via  550a07dacd758094299d74e4ecf50f2ce6838a33 (commit)
       via  cb025beccd46997f924c8a96ce5c44e4885a207c (commit)
       via  faa13e284b59555adf92c7d80991f64541289062 (commit)
       via  5c2146781b6ae0ca2a61201f2ef676959517406f (commit)
       via  2a6f14e462968bf50b7a9abc7b56cbb121097b30 (commit)
       via  4f47f8e4622db03b13fc521695121e484cf1aba9 (commit)
       via  4ecc12f646b1d6ca11c886e93a082011e4d7c45c (commit)
       via  bf47fcbef4bed130ebbba8a54376d938066edadd (commit)
       via  89bf81ec71d8f9d5d615f390cd75a0d074aa98bd (commit)
       via  d59d086d4ce716cb83c6b6e49cafdd618f701db7 (commit)
       via  2820450b9c5ac14e9612806ec74307c295b5ce14 (commit)
       via  48df94ef681acedc49899e42730a8ea2e206035d (commit)
       via  540422c12d77151bf77ec9b2293d16bb0a044a3e (commit)
       via  b40976a5850448130a71d4a4ca8b3c5c3dcb471a (commit)
       via  5f1bd071653c09d5ee93a2c5f499c4d060ffe24e (commit)
       via  859099fb10075a855a24a4e029aab05c9c607352 (commit)
       via  4793ed9a1fd121a3da71669bd4fb0a61af3c22bc (commit)
       via  45a0ddbccaf8ada6665f98b16688d58bd02e0f16 (commit)
       via  99a242d3e44a6b7fdd6b362cf462779957b7d6bb (commit)
       via  3b2afae13a19749eda085a46db758a58c8285c51 (commit)
       via  9735c1db40da3c48dfb847e895f4ebba25e3feb8 (commit)
       via  9b765e147608addd6fc91fb7aea13d0ac9b5f0ca (commit)
       via  83dd3e4fcc2bca6e21a49e8ae48f338c99c05717 (commit)
       via  0e8c685e3686295eda1c705a44da3aa79a5f058e (commit)
       via  c200b8bd8bf211643ad0e52d0cfd2914fae04735 (commit)
       via  263489281aa522630e71096d5319b517c2c5c44b (commit)
       via  0961188ee46e76861eb7dead1317d8d480d855e1 (commit)
       via  fb96d27b5a00b33be250b66c4f58286166deace3 (commit)
       via  7cdedc2daeb15731259454e77df4afd71357e937 (commit)
       via  b5a9830c0890739dc4955612fb616da659578973 (commit)
       via  fd4516acd16a9c7111ac89c4f5ac299c207333ce (commit)
       via  603fef72ce2779d1346f21a153e6cd0d2bf6eb9e (commit)
       via  c1031a76ec603e9b20dfb06abaa57a4ff568db5f (commit)
       via  0d55156060ee34fcf04869f0c32e36b4e19c1dd9 (commit)
       via  2ca41f6e5607f7bd6d2f128c9280d93afa00a78f (commit)
       via  c58939a2ab10319003727a6e8f58134ada013b84 (commit)
       via  1a975064cd89ff19f7f20633a7331891b5471cfc (commit)
       via  a45b7bd2ea7a89109deb6e1979d0631ca468323f (commit)
       via  e7d43d4ecf0b655a043851972c9e59ff233154c3 (commit)
       via  348f88fbb526ef356bffba15e762a4fcab861deb (commit)
       via  433cddab048b5d1b35c26e17600c852b2f8e5d6e (commit)
       via  28c84415f3001aa1688c8a1a30b9f28961c003fb (commit)
       via  ca12180ab48c5bc5fb2d16c71f7a5ceb6514fa40 (commit)
       via  e01ca50876d17ba18b1ecb41a9d7726e7440ae08 (commit)
       via  7ab73d97529630af6fe606b9dfad0e9e660051d3 (commit)
       via  030655944cb89f75f7d4b3221400b28e579db667 (commit)
       via  6a605bf48c29f78e9c86d5c209e24116f97d5361 (commit)
       via  900a0b90e3d6bd45682a4517fa3b682bebe13ecc (commit)
       via  2fba85611a7e2f397173cfdf01a9a26a4fd802f2 (commit)
       via  cd7b54b519da533140d931f5d16fbfb7b8f77077 (commit)
       via  3733743c1a433773f7a3f67c90b3f420a0ab1ce9 (commit)
       via  f963b0cf2690b68439af3dbd3fe33d2e8723c8f3 (commit)
       via  7f98f2b28f8ffc4f5f9f27c2ab402967eeae0d44 (commit)
       via  90408830b3b9f6dedec73c1c4a2318ab00b0845f (commit)
       via  1fc2ddadce22caf198457f357bc29c254b80c6a7 (commit)
       via  ac5c307261b48ca350158cad595b292e5374d10e (commit)
       via  78ae1acfcbd2d2ac78e7edeaf6542c19f8666509 (commit)
       via  111bdcbe781413e8d0759e2671e37c1d3a46f837 (commit)
       via  3f103625385169e2a9a17a069d0d0f1305a1e0d2 (commit)
       via  3c689f2b8ae3c9903b02ea267396aeb042c2413a (commit)
       via  faee822379c3bed81fc353ee26c8fcb16782baea (commit)
       via  8be2aeb0276c27d2eed3aba1ecefdffca0d1c8ce (commit)
       via  d5f25e3d9d2b4aefd472faafce233df37359da87 (commit)
       via  33e1c1f7124c680677450f7d1448a65f384ffc0f (commit)
       via  d4f5524b1515c6fefbbad0815c3ff2b18bbd6200 (commit)
       via  e5bd1892dd70c9570bba33edfa1caa40a3e89585 (commit)
       via  13730892001e5c1dc2e808d9afffe02b17cb5c36 (commit)
       via  b2e79d77eb6c8d0a28893eb08bb0945b780a8cba (commit)
       via  5c15eeb1be1c5daeb454f1f9512a69b9a70916c0 (commit)
       via  bead53e397cf9e8279d4a45c5ba66e414334555b (commit)
       via  bba641b4ca4d48e138632934ebd6b5f5f2feb53a (commit)
       via  24c7336fddea85e718aa5f69253e98f5a7862bbf (commit)
       via  2058332bf1f5460ee92153e7096f03aacba7ca4e (commit)
       via  14831c8bf590911f3e9b3773fcd27b7d39ade911 (commit)
       via  da7f2b54869d233e5a0b407eb2e2b015b169fde3 (commit)
      from  b36ef2f5305e0852d1fedf3f01382da939ed9830 (commit)


- Log -----------------------------------------------------------------
commit 7664fb30e94af952c0c11c63a47d656b43b9dbd6
Merge: b36ef2f 083c85a
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Aug 10 10:43:02 2011 +0200

    Merge remote-tracking branch 'pootle/master'

commit 083c85a9b3db9b1795207b0063fa3adeb03ac2eb
Merge: 384bb23 f9e2218
Author: Pootle server <pootle at cihar.com>
Date:   Wed Aug 10 10:40:28 2011 +0200

    Merge remote-tracking branch 'origin/master'

commit 384bb236297da3bab8bfe34cf7c3e4b6332d1645
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:38:58 2011 +0200

    Translation update done using Pootle.

commit 9556e428328f26ac829202e1ba03388aea1a3e72
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:37:29 2011 +0200

    Translation update done using Pootle.

commit 1d99b06245506635ad319a5905b5e9b680872b6e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:37:08 2011 +0200

    Translation update done using Pootle.

commit a42b79ca9bf96e71396b9b5559a6811dec697abe
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:35:45 2011 +0200

    Translation update done using Pootle.

commit 880abde28a99d77d46a96a334319fc44035be88e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:35:40 2011 +0200

    Translation update done using Pootle.

commit 3a53d5450403cf94db92b9d0389a815db8cb6d9b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:35:29 2011 +0200

    Translation update done using Pootle.

commit 5e959921da349301436caab4542cd7d26a2de825
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:32:35 2011 +0200

    Translation update done using Pootle.

commit 0312d682de4d6614a04914afa3bf3f8cbb5fa277
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:32:21 2011 +0200

    Translation update done using Pootle.

commit a91743b5d086516893ec6a0792bcb32eb354e935
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:32:06 2011 +0200

    Translation update done using Pootle.

commit 4a9407f9893d0d03f73a8fe7de3a476c9ae85b32
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:31:21 2011 +0200

    Translation update done using Pootle.

commit 1fa877f7dd7b1cc141368d80f9472b399fc0c59a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:30:30 2011 +0200

    Translation update done using Pootle.

commit 066a975d389256c8a720ca5c7c72b613871cdad8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:29:50 2011 +0200

    Translation update done using Pootle.

commit 2798c213695ebbd526be377629b10cd99375ed73
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:29:22 2011 +0200

    Translation update done using Pootle.

commit d05714fc7b4eb0ba3bc75153a24c6fe8b8f663a1
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:26:47 2011 +0200

    Translation update done using Pootle.

commit 11955f86a34ddb10a24b95b69af4841d609703cd
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:26:23 2011 +0200

    Translation update done using Pootle.

commit 5a26afedeb17b9d85ee7c6c733a7d2dccdfd2f15
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:26:15 2011 +0200

    Translation update done using Pootle.

commit ada980375501b2533c15ed48bbb1c2b4b10ffd4c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:26:05 2011 +0200

    Translation update done using Pootle.

commit b691d95bc0b453a451b908a7181df34b40b5e36f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:24:05 2011 +0200

    Translation update done using Pootle.

commit 1a077e1a889c2dbc1e359804d6f65bb46f4ca7bf
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:22:16 2011 +0200

    Translation update done using Pootle.

commit cde437697058d1ad1af81412fad9e1ba54072e43
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:22:12 2011 +0200

    Translation update done using Pootle.

commit 782f1f5da38741382df2d49d708af35b0636cbc6
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:21:53 2011 +0200

    Translation update done using Pootle.

commit f706abed75279f9ec8bfe65279d98113641ef72b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:21:38 2011 +0200

    Translation update done using Pootle.

commit 34e89c646617b0d17d2e9b4a106455aaec7e8058
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:21:26 2011 +0200

    Translation update done using Pootle.

commit c760adcda4d09100385cb50f02534b90bf6b7036
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:20:52 2011 +0200

    Translation update done using Pootle.

commit 13ab249ea8d33ed598203fccf17d56b890618081
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:20:38 2011 +0200

    Translation update done using Pootle.

commit 93bacd1c9bf76f2eea54bac1f1f6dbef2d480b1b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:20:26 2011 +0200

    Translation update done using Pootle.

commit 06b5af4c33e5ea70d4fd74676b4034f09ecfcc33
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:20:00 2011 +0200

    Translation update done using Pootle.

commit fc113efa7c92b34f35fd0cf8bf5c9304598f2206
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:19:30 2011 +0200

    Translation update done using Pootle.

commit 87eadcedc7c53411c3cbedcd0a035f663a56a10c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:19:08 2011 +0200

    Translation update done using Pootle.

commit 57337f6be0e789597bbadf3e430f5a5db969570a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:18:37 2011 +0200

    Translation update done using Pootle.

commit 550a07dacd758094299d74e4ecf50f2ce6838a33
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:18:25 2011 +0200

    Translation update done using Pootle.

commit cb025beccd46997f924c8a96ce5c44e4885a207c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:18:11 2011 +0200

    Translation update done using Pootle.

commit faa13e284b59555adf92c7d80991f64541289062
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:17:59 2011 +0200

    Translation update done using Pootle.

commit 5c2146781b6ae0ca2a61201f2ef676959517406f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:14:55 2011 +0200

    Translation update done using Pootle.

commit 2a6f14e462968bf50b7a9abc7b56cbb121097b30
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:14:43 2011 +0200

    Translation update done using Pootle.

commit 4f47f8e4622db03b13fc521695121e484cf1aba9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:14:37 2011 +0200

    Translation update done using Pootle.

commit 4ecc12f646b1d6ca11c886e93a082011e4d7c45c
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:13:59 2011 +0200

    Translation update done using Pootle.

commit bf47fcbef4bed130ebbba8a54376d938066edadd
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:13:37 2011 +0200

    Translation update done using Pootle.

commit 89bf81ec71d8f9d5d615f390cd75a0d074aa98bd
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:13:07 2011 +0200

    Translation update done using Pootle.

commit d59d086d4ce716cb83c6b6e49cafdd618f701db7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:12:47 2011 +0200

    Translation update done using Pootle.

commit 2820450b9c5ac14e9612806ec74307c295b5ce14
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:12:28 2011 +0200

    Translation update done using Pootle.

commit 48df94ef681acedc49899e42730a8ea2e206035d
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:12:13 2011 +0200

    Translation update done using Pootle.

commit 540422c12d77151bf77ec9b2293d16bb0a044a3e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:11:48 2011 +0200

    Translation update done using Pootle.

commit b40976a5850448130a71d4a4ca8b3c5c3dcb471a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:10:10 2011 +0200

    Translation update done using Pootle.

commit 5f1bd071653c09d5ee93a2c5f499c4d060ffe24e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:07:34 2011 +0200

    Translation update done using Pootle.

commit 859099fb10075a855a24a4e029aab05c9c607352
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:07:18 2011 +0200

    Translation update done using Pootle.

commit 4793ed9a1fd121a3da71669bd4fb0a61af3c22bc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:07:06 2011 +0200

    Translation update done using Pootle.

commit 45a0ddbccaf8ada6665f98b16688d58bd02e0f16
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:06:51 2011 +0200

    Translation update done using Pootle.

commit 99a242d3e44a6b7fdd6b362cf462779957b7d6bb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:06:32 2011 +0200

    Translation update done using Pootle.

commit 3b2afae13a19749eda085a46db758a58c8285c51
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 10:06:19 2011 +0200

    Translation update done using Pootle.

commit 9735c1db40da3c48dfb847e895f4ebba25e3feb8
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:42:54 2011 +0200

    Translation update done using Pootle.

commit 9b765e147608addd6fc91fb7aea13d0ac9b5f0ca
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:42:19 2011 +0200

    Translation update done using Pootle.

commit 83dd3e4fcc2bca6e21a49e8ae48f338c99c05717
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:42:10 2011 +0200

    Translation update done using Pootle.

commit 0e8c685e3686295eda1c705a44da3aa79a5f058e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:40:51 2011 +0200

    Translation update done using Pootle.

commit c200b8bd8bf211643ad0e52d0cfd2914fae04735
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:39:34 2011 +0200

    Translation update done using Pootle.

commit 263489281aa522630e71096d5319b517c2c5c44b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:38:20 2011 +0200

    Translation update done using Pootle.

commit 0961188ee46e76861eb7dead1317d8d480d855e1
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:38:09 2011 +0200

    Translation update done using Pootle.

commit fb96d27b5a00b33be250b66c4f58286166deace3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:37:54 2011 +0200

    Translation update done using Pootle.

commit 7cdedc2daeb15731259454e77df4afd71357e937
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:37:24 2011 +0200

    Translation update done using Pootle.

commit b5a9830c0890739dc4955612fb616da659578973
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:37:15 2011 +0200

    Translation update done using Pootle.

commit fd4516acd16a9c7111ac89c4f5ac299c207333ce
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:36:46 2011 +0200

    Translation update done using Pootle.

commit 603fef72ce2779d1346f21a153e6cd0d2bf6eb9e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:36:02 2011 +0200

    Translation update done using Pootle.

commit c1031a76ec603e9b20dfb06abaa57a4ff568db5f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:34:56 2011 +0200

    Translation update done using Pootle.

commit 0d55156060ee34fcf04869f0c32e36b4e19c1dd9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:34:39 2011 +0200

    Translation update done using Pootle.

commit 2ca41f6e5607f7bd6d2f128c9280d93afa00a78f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:34:03 2011 +0200

    Translation update done using Pootle.

commit c58939a2ab10319003727a6e8f58134ada013b84
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:32:59 2011 +0200

    Translation update done using Pootle.

commit 1a975064cd89ff19f7f20633a7331891b5471cfc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:26:12 2011 +0200

    Translation update done using Pootle.

commit a45b7bd2ea7a89109deb6e1979d0631ca468323f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:25:34 2011 +0200

    Translation update done using Pootle.

commit e7d43d4ecf0b655a043851972c9e59ff233154c3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:25:21 2011 +0200

    Translation update done using Pootle.

commit 348f88fbb526ef356bffba15e762a4fcab861deb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:24:18 2011 +0200

    Translation update done using Pootle.

commit 433cddab048b5d1b35c26e17600c852b2f8e5d6e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:23:30 2011 +0200

    Translation update done using Pootle.

commit 28c84415f3001aa1688c8a1a30b9f28961c003fb
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:23:15 2011 +0200

    Translation update done using Pootle.

commit ca12180ab48c5bc5fb2d16c71f7a5ceb6514fa40
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:22:45 2011 +0200

    Translation update done using Pootle.

commit e01ca50876d17ba18b1ecb41a9d7726e7440ae08
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:22:23 2011 +0200

    Translation update done using Pootle.

commit 7ab73d97529630af6fe606b9dfad0e9e660051d3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:21:55 2011 +0200

    Translation update done using Pootle.

commit 030655944cb89f75f7d4b3221400b28e579db667
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:20:49 2011 +0200

    Translation update done using Pootle.

commit 6a605bf48c29f78e9c86d5c209e24116f97d5361
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:20:13 2011 +0200

    Translation update done using Pootle.

commit 900a0b90e3d6bd45682a4517fa3b682bebe13ecc
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:19:06 2011 +0200

    Translation update done using Pootle.

commit 2fba85611a7e2f397173cfdf01a9a26a4fd802f2
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:18:40 2011 +0200

    Translation update done using Pootle.

commit cd7b54b519da533140d931f5d16fbfb7b8f77077
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:17:42 2011 +0200

    Translation update done using Pootle.

commit 3733743c1a433773f7a3f67c90b3f420a0ab1ce9
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:15:58 2011 +0200

    Translation update done using Pootle.

commit f963b0cf2690b68439af3dbd3fe33d2e8723c8f3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:15:04 2011 +0200

    Translation update done using Pootle.

commit 7f98f2b28f8ffc4f5f9f27c2ab402967eeae0d44
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:13:59 2011 +0200

    Translation update done using Pootle.

commit 90408830b3b9f6dedec73c1c4a2318ab00b0845f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:13:15 2011 +0200

    Translation update done using Pootle.

commit 1fc2ddadce22caf198457f357bc29c254b80c6a7
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:11:54 2011 +0200

    Translation update done using Pootle.

commit ac5c307261b48ca350158cad595b292e5374d10e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:10:52 2011 +0200

    Translation update done using Pootle.

commit 78ae1acfcbd2d2ac78e7edeaf6542c19f8666509
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:10:36 2011 +0200

    Translation update done using Pootle.

commit 111bdcbe781413e8d0759e2671e37c1d3a46f837
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:09:33 2011 +0200

    Translation update done using Pootle.

commit 3f103625385169e2a9a17a069d0d0f1305a1e0d2
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 09:06:01 2011 +0200

    Translation update done using Pootle.

commit 3c689f2b8ae3c9903b02ea267396aeb042c2413a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:59:45 2011 +0200

    Translation update done using Pootle.

commit faee822379c3bed81fc353ee26c8fcb16782baea
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:59:39 2011 +0200

    Translation update done using Pootle.

commit 8be2aeb0276c27d2eed3aba1ecefdffca0d1c8ce
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:58:56 2011 +0200

    Translation update done using Pootle.

commit d5f25e3d9d2b4aefd472faafce233df37359da87
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:58:07 2011 +0200

    Translation update done using Pootle.

commit 33e1c1f7124c680677450f7d1448a65f384ffc0f
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:57:26 2011 +0200

    Translation update done using Pootle.

commit d4f5524b1515c6fefbbad0815c3ff2b18bbd6200
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:57:06 2011 +0200

    Translation update done using Pootle.

commit e5bd1892dd70c9570bba33edfa1caa40a3e89585
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:56:57 2011 +0200

    Translation update done using Pootle.

commit 13730892001e5c1dc2e808d9afffe02b17cb5c36
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:55:08 2011 +0200

    Translation update done using Pootle.

commit b2e79d77eb6c8d0a28893eb08bb0945b780a8cba
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:55:03 2011 +0200

    Translation update done using Pootle.

commit 5c15eeb1be1c5daeb454f1f9512a69b9a70916c0
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:53:49 2011 +0200

    Translation update done using Pootle.

commit bead53e397cf9e8279d4a45c5ba66e414334555b
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:52:57 2011 +0200

    Translation update done using Pootle.

commit bba641b4ca4d48e138632934ebd6b5f5f2feb53a
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:50:05 2011 +0200

    Translation update done using Pootle.

commit 24c7336fddea85e718aa5f69253e98f5a7862bbf
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:47:53 2011 +0200

    Translation update done using Pootle.

commit 2058332bf1f5460ee92153e7096f03aacba7ca4e
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:44:45 2011 +0200

    Translation update done using Pootle.

commit 14831c8bf590911f3e9b3773fcd27b7d39ade911
Merge: da7f2b5 d180636
Author: Pootle server <pootle at cihar.com>
Date:   Wed Aug 10 08:40:18 2011 +0200

    Merge remote-tracking branch 'origin/master'

commit da7f2b54869d233e5a0b407eb2e2b015b169fde3
Author: shanyan baishui <Siramizu at gmail.com>
Date:   Wed Aug 10 08:38:27 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/zh_CN.po |  256 ++++++++++++++++++++++++++---------------------------------
 1 files changed, 114 insertions(+), 142 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 990da83..fc3a41a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-08-09 16:45+0100\n"
-"PO-Revision-Date: 2011-08-10 08:23+0200\n"
+"PO-Revision-Date: 2011-08-10 10:38+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN at li.org>\n"
 "Language: zh_CN\n"
@@ -1092,12 +1092,12 @@ msgstr "连接 / 进程"
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
 msgid "Questions since last refresh"
-msgstr ""
+msgstr "自上次刷新起的内部查询"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "内部查询 (服务器执行的查询)"
 
 #: js/messages.php:91 server_status.php:649
 msgid "Query statistics"
@@ -1188,10 +1188,9 @@ msgstr "连接"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:118
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "版本"
+msgstr "内部查询"
 
 #: js/messages.php:119 server_status.php:949
 msgid "Traffic"
@@ -1203,24 +1202,22 @@ msgid "Settings"
 msgstr "设置"
 
 #: js/messages.php:121
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "删除数据库"
+msgstr "删除图表"
 
 #: js/messages.php:122
 msgid "Edit title and labels"
-msgstr ""
+msgstr "编辑标题和标签"
 
 #: js/messages.php:123
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "对齐网格"
+msgstr "添加图表"
 
 #: js/messages.php:125
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "请至少添加一个数据"
 
 #: js/messages.php:126 libraries/display_export.lib.php:308
 #: libraries/display_tbl.lib.php:567 libraries/export/sql.php:1052
@@ -1255,11 +1252,11 @@ msgstr "slow_query_log 和 general_log 已禁用。"
 
 #: js/messages.php:134
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output 未设置到 TABLE 。"
 
 #: js/messages.php:135
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output 已设置到 TABLE 。"
 
 #: js/messages.php:136
 #, php-format
@@ -1334,19 +1331,19 @@ msgstr "差异"
 #: js/messages.php:154
 #, php-format
 msgid "Divided by %s:"
-msgstr ""
+msgstr "除以 %s:"
 
 #: js/messages.php:156
 msgid "From slow log"
-msgstr ""
+msgstr "从慢查询日志"
 
 #: js/messages.php:157
 msgid "From general log"
-msgstr ""
+msgstr "从通用日志"
 
 #: js/messages.php:158
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "正在加载并分析日志。请稍候。"
 
 #: js/messages.php:159
 msgid ""
@@ -1360,28 +1357,26 @@ msgid ""
 "Since grouping of INSERTs queries has been selected, INSERT queries into the "
 "same table are also being grouped together, disregarding of the inserted "
 "data."
-msgstr ""
+msgstr "因选择了分组 INSERT 查询,相同表的 INSERT 查询将被分为一组,忽略数据。"
 
 #: js/messages.php:161
 msgid "Log data loaded. Queries executed in this time span:"
 msgstr ""
 
 #: js/messages.php:163
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "转到数据库"
+msgstr "转到日志表"
 
 #: js/messages.php:164
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "日志已分析,时间段内没有数据。"
 
 #. l10n: A collection of available filters
 #: js/messages.php:167
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
-msgstr "快速搜索"
+msgstr "过滤器"
 
 #. l10n: Filter as in "Start Filtering"
 #: js/messages.php:169 navigation.php:270
@@ -1390,29 +1385,26 @@ msgstr "快速搜索"
 
 #: js/messages.php:170
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "根据内容/正则表达式搜索:"
 
 #: js/messages.php:171
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "忽略 WHERE 语句中的变量值对查询分组"
 
 #: js/messages.php:172
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "插入的行数"
+msgstr "分组后的行数:"
 
 #: js/messages.php:173
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "总计"
+msgstr "总数:"
 
 #: js/messages.php:175
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "正在加载"
+msgstr "正在加载日志"
 
 #: js/messages.php:176
 msgid "Monitor refresh failed"
@@ -1428,24 +1420,23 @@ msgstr ""
 "面。"
 
 #: js/messages.php:178
-#, fuzzy
 #| msgid "Reload"
 msgid "Reload page"
-msgstr "重新载入"
+msgstr "重新载入页面"
 
 #: js/messages.php:180
 msgid "Affected rows: "
-msgstr ""
+msgstr "影响的行数: "
 
 #: js/messages.php:182
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
-msgstr ""
+msgstr "解析配置文件失败。它看上去不像有效的 JSON 代码"
 
 #: js/messages.php:183
 msgid ""
 "Failed building chart grid with imported config. Resetting to default "
 "config..."
-msgstr ""
+msgstr "导入配置失败。正在重设为默认设置..."
 
 #: js/messages.php:184 libraries/config/messages.inc.php:170
 #: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69
@@ -1519,16 +1510,14 @@ msgid "Insert Table"
 msgstr "使用表"
 
 #: js/messages.php:210
-#, fuzzy
 #| msgid "Add index"
 msgid "Hide indexes"
-msgstr "添加索引"
+msgstr "隐藏索引"
 
 #: js/messages.php:211
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "显示网格"
+msgstr "显示索引"
 
 #: js/messages.php:214
 msgid "Searching"
@@ -1552,7 +1541,7 @@ msgstr "正在删除"
 
 #: js/messages.php:221
 msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "函数定义中必须包含 RETURN 语句!"
 
 #: js/messages.php:224
 msgid ""
@@ -1595,10 +1584,9 @@ msgid "Change"
 msgstr "修改"
 
 #: js/messages.php:235
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "最长执行时间"
+msgstr "查询执行时间"
 
 #: js/messages.php:238
 msgid "Hide search criteria"
@@ -1614,7 +1602,6 @@ msgid "Ignore"
 msgstr "忽略"
 
 #: js/messages.php:245
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
 msgstr "添加字段"
@@ -1674,28 +1661,26 @@ msgid ", latest stable version:"
 msgstr ",最新稳定版本: "
 
 #: js/messages.php:269
-#, fuzzy
 #| msgid "Jump to database"
 msgid "up to date"
-msgstr "转到数据库"
+msgstr "已更新"
 
 #: js/messages.php:272
 msgid "Drag to reorder"
-msgstr ""
+msgstr "拖拽以调整顺序"
 
 #: js/messages.php:273
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "点击选中"
+msgstr "点击以排序"
 
 #: js/messages.php:274
 msgid "Click to mark/unmark"
-msgstr ""
+msgstr "点击以标记/取消标记"
 
 #: js/messages.php:275
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "点击下箭头以设置显示的字段"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:294
@@ -2084,22 +2069,19 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "插入了 %1$d 行。"
 
 #: libraries/RecentTable.class.php:107
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Could not save recent table"
-msgstr "无法保存设置"
+msgstr "无法保存最近访问的表"
 
 #: libraries/RecentTable.class.php:142
-#, fuzzy
 #| msgid "Count tables"
 msgid "Recent tables"
-msgstr "统计数据表"
+msgstr "最近访问的表"
 
 #: libraries/RecentTable.class.php:148
-#, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no recent tables"
-msgstr "没有配置好的服务器"
+msgstr "没有最近访问的表"
 
 #: libraries/StorageEngine.class.php:180
 msgid ""
@@ -2122,10 +2104,9 @@ msgid "This MySQL server does not support the %s storage engine."
 msgstr "此 MySQL 服务器不支持 %s 存储引擎。"
 
 #: libraries/Table.class.php:303
-#, fuzzy
 #| msgid "Show slave status"
 msgid "unknown table status: "
-msgstr "显示从服务器状态"
+msgstr "未知表状态: "
 
 #: libraries/Table.class.php:1034
 msgid "Invalid database"
@@ -2147,7 +2128,7 @@ msgstr "已将数据表 %s 改名为 %s"
 
 #: libraries/Table.class.php:1274
 msgid "Could not save table UI preferences"
-msgstr ""
+msgstr "无法保存表界面设置"
 
 #: libraries/Theme.class.php:144
 #, php-format
@@ -2179,7 +2160,7 @@ msgstr "找不到主题 %s 的路径"
 
 #: libraries/Theme_Manager.class.php:289 themes.php:20 themes.php:27
 msgid "Theme"
-msgstr ""
+msgstr "主题"
 
 #: libraries/auth/config.auth.lib.php:71
 msgid "Cannot connect: invalid settings."
@@ -2380,16 +2361,15 @@ msgid "Check Privileges"
 msgstr "检查权限"
 
 #: libraries/common.inc.php:588
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Failed to read configuration file"
-msgstr "无法保存设置"
+msgstr "读取配置文件失败"
 
 #: libraries/common.inc.php:589
 msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
-msgstr ""
+msgstr "这通常意味着文件中有语法错误,请检查下面显示出的错误。"
 
 #: libraries/common.inc.php:596
 #, php-format
@@ -2567,10 +2547,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s 天 %s 小时,%s 分 %s 秒"
 
 #: libraries/common.lib.php:1944
-#, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
-msgstr "常规"
+msgstr "缺少参数:"
 
 #: libraries/common.lib.php:2253 libraries/common.lib.php:2256
 #: libraries/display_tbl.lib.php:306
@@ -2599,10 +2578,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s 功能受到一个已知的缺陷 (bug) 影响,参见 %s"
 
 #: libraries/common.lib.php:2524
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
-msgstr "点击选中"
+msgstr "点击切换"
 
 #: libraries/common.lib.php:2853 libraries/common.lib.php:2860
 #: libraries/common.lib.php:3052 libraries/config/setup.forms.php:296
@@ -2657,7 +2635,7 @@ msgstr "没有可上传的文件"
 
 #: libraries/common.lib.php:3061 libraries/common.lib.php:3062
 msgid "Execute"
-msgstr ""
+msgstr "执行"
 
 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -2666,17 +2644,16 @@ msgstr "全部"
 
 #: libraries/config.values.php:47
 msgid "Nowhere"
-msgstr ""
+msgstr "无"
 
 #: libraries/config.values.php:47
 msgid "Left"
-msgstr ""
+msgstr "左侧"
 
 #: libraries/config.values.php:47
-#, fuzzy
 #| msgid "Height"
 msgid "Right"
-msgstr "高"
+msgstr "右侧"
 
 #: libraries/config.values.php:75
 msgid "Open"
@@ -3031,13 +3008,12 @@ msgstr "显示服务器为列表"
 msgid ""
 "Disable the table maintenance mass operations, like optimizing or repairing "
 "the selected tables of a database."
-msgstr ""
+msgstr "禁止大量表维护操作,例如优化或修复一个数据库中的选中表。"
 
 #: libraries/config/messages.inc.php:61
-#, fuzzy
 #| msgid "Table maintenance"
 msgid "Disable multi table maintenance"
-msgstr "表维护"
+msgstr "禁止多表维护"
 
 #: libraries/config/messages.inc.php:62
 msgid "Edit SQL queries in popup window"
@@ -3930,7 +3906,7 @@ msgstr "它们是编辑、快速编辑、复制和删除链接"
 
 #: libraries/config/messages.inc.php:320
 msgid "Where to show the table row links"
-msgstr ""
+msgstr "表中每行数据操作链接位置"
 
 #: libraries/config/messages.inc.php:321
 msgid "Use natural order for sorting table and database names"
@@ -6746,64 +6722,60 @@ msgstr "生成密码"
 #: libraries/rte/rte_routines.lib.php:1242
 #: libraries/rte/rte_triggers.lib.php:75 libraries/rte/rte_triggers.lib.php:80
 #: libraries/rte/rte_triggers.lib.php:103
-#, fuzzy, php-format
+#, php-format
 #| msgid "The following queries have been executed:"
 msgid "The following query has failed: \"%s\""
-msgstr "下列查询被执行:"
+msgstr "下列查询失败了: \"%s\""
 
 #: libraries/rte/rte_events.lib.php:116
 msgid "Sorry, we failed to restore the dropped event."
-msgstr ""
+msgstr "抱歉,恢复删除的事件失败。"
 
 #: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
 #: libraries/rte/rte_triggers.lib.php:90
 msgid "The backed up query was:"
-msgstr ""
+msgstr "已备份的查询为:"
 
 #: libraries/rte/rte_events.lib.php:121
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Event %1$s has been modified."
-msgstr "已删除字段 %s "
+msgstr "已修改事件 %1$s 。"
 
 #: libraries/rte/rte_events.lib.php:133
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Event %1$s has been created."
-msgstr "创建数据表 %1$s 成功。"
+msgstr "已创建事件 %1$s 。"
 
 #: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294
 #: libraries/rte/rte_triggers.lib.php:114
 msgid "<b>One or more errors have occured while processing your request:</b>"
-msgstr ""
+msgstr "<b>处理请求时发生错误:</b>"
 
 #: libraries/rte/rte_events.lib.php:185
-#, fuzzy
 #| msgid "Edit server"
 msgid "Edit event"
-msgstr "编辑服务器"
+msgstr "编辑事件"
 
 #: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370
 #: libraries/rte/rte_routines.lib.php:1264
 #: libraries/rte/rte_routines.lib.php:1300
 #: libraries/rte/rte_triggers.lib.php:187
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request"
-msgstr "处理请求时发生错误"
+msgstr "处理请求时的错误"
 
 #: libraries/rte/rte_events.lib.php:371 libraries/rte/rte_routines.lib.php:817
 #: libraries/rte/rte_triggers.lib.php:298
-#, fuzzy
 #| msgid "Details..."
 msgid "Details"
-msgstr "详细..."
+msgstr "详细"
 
 #: libraries/rte/rte_events.lib.php:374
-#, fuzzy
 #| msgid "Event type"
 msgid "Event name"
-msgstr "事件类型"
+msgstr "事件名称"
 
 #: libraries/rte/rte_events.lib.php:395 server_binlog.php:182
 msgid "Event type"
@@ -6817,24 +6789,22 @@ msgstr "修改"
 
 #: libraries/rte/rte_events.lib.php:422
 msgid "Execute at"
-msgstr ""
+msgstr "运行时间"
 
 #: libraries/rte/rte_events.lib.php:430
 msgid "Execute every"
-msgstr ""
+msgstr "运行周期"
 
 #: libraries/rte/rte_events.lib.php:449
-#, fuzzy
 #| msgid "Startup"
 msgid "Start"
-msgstr "起始页"
+msgstr "开始"
 
 #: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
 #: libraries/rte/rte_triggers.lib.php:352
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
-msgstr "说明"
+msgstr "定义"
 
 #: libraries/rte/rte_events.lib.php:471
 #, fuzzy
@@ -6845,48 +6815,48 @@ msgstr "完整插入"
 #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922
 #: libraries/rte/rte_triggers.lib.php:358
 msgid "Definer"
-msgstr ""
+msgstr "用户"
 
 #: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986
 #: libraries/rte/rte_triggers.lib.php:396
 msgid "The definer must be in the \"username at hostname\" format"
-msgstr ""
+msgstr "用户必须是 \"用户名@主机名\" 格式"
 
 #: libraries/rte/rte_events.lib.php:525
 msgid "You must provide an event name"
-msgstr ""
+msgstr "请输入事件名称"
 
 #: libraries/rte/rte_events.lib.php:537
 msgid "You must provide a valid interval value for the event."
-msgstr ""
+msgstr "请设置有效的运行周期。"
 
 #: libraries/rte/rte_events.lib.php:549
 msgid "You must provide a valid execution time for the event."
-msgstr ""
+msgstr "请设置有效的运行时间。"
 
 #: libraries/rte/rte_events.lib.php:553
 msgid "You must provide a valid type for the event."
-msgstr ""
+msgstr "请选择一个有效的事件类型。"
 
 #: libraries/rte/rte_events.lib.php:572
 msgid "You must provide an event definition."
-msgstr ""
+msgstr "请输入事件定义。"
 
 #: libraries/rte/rte_footer.lib.php:29
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #: libraries/rte/rte_footer.lib.php:91
 msgid "OFF"
-msgstr ""
+msgstr "关"
 
 #: libraries/rte/rte_footer.lib.php:96
 msgid "ON"
-msgstr ""
+msgstr "开"
 
 #: libraries/rte/rte_footer.lib.php:108
 msgid "Event scheduler status"
-msgstr ""
+msgstr "事件计划状态"
 
 #: libraries/rte/rte_list.lib.php:54
 #, fuzzy
@@ -7645,7 +7615,6 @@ msgid "PARTITION definition"
 msgstr "分区定义"
 
 #: libraries/tbl_properties.inc.php:762
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
 msgstr "+ 添加"
@@ -8734,10 +8703,9 @@ msgid "wildcard"
 msgstr "通配符"
 
 #: server_privileges.php:2382
-#, fuzzy
 #| msgid "View %s has been dropped"
 msgid "User has been added."
-msgstr "已删除视图 %s"
+msgstr "用户已添加。"
 
 #: server_replication.php:49
 msgid "Unknown error"
@@ -8979,52 +8947,46 @@ msgid "Runtime Information"
 msgstr "运行信息"
 
 #: server_status.php:650
-#, fuzzy
 #| msgid "See slave status table"
 msgid "All status variables"
-msgstr "查看从服务器状态"
+msgstr "所有状态变量"
 
 #: server_status.php:651
 msgid "Monitor"
-msgstr ""
+msgstr "监控"
 
 #: server_status.php:652
 msgid "Advisor"
-msgstr ""
+msgstr "建议"
 
 #: server_status.php:662 server_status.php:684
-#, fuzzy
 #| msgid "Refresh"
 msgid "Refresh rate: "
-msgstr "刷新"
+msgstr "刷新频率: "
 
 #: server_status.php:705
-#, fuzzy
 #| msgid "Do not change the password"
 msgid "Containing the word:"
-msgstr "保持原密码"
+msgstr "包含文字:"
 
 #: server_status.php:710
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show only alert values"
-msgstr "显示打开的表"
+msgstr "仅显示报警值"
 
 #: server_status.php:714
 msgid "Filter by category..."
-msgstr ""
+msgstr "按分类显示"
 
 #: server_status.php:727
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show unformatted values"
-msgstr "显示打开的表"
+msgstr "显示原始值"
 
 #: server_status.php:731
-#, fuzzy
 #| msgid "Related Links"
 msgid "Related links:"
-msgstr "相关链接"
+msgstr "相关链接:"
 
 #: server_status.php:765
 msgid ""
@@ -9040,13 +9002,17 @@ msgid ""
 "at a time, observe or benchmark your database, and\n"
 "        undo the change if there was no clearly measurable improvement."
 msgstr ""
+"建议系统可以通过分析服务器状态变量来提供建议。\n"
+"        请注意本系统的建议基于相当简单的规则和计算且可能不适用于你的系统。\n"
+"        在修改任何设置前,请确保你知道你在修改什么以及如何恢复。错误的修改可能导致截然相反的结果。\n"
+"        调整系统的最佳方式为一次只修改一个设置,然后检查并测试你的数据库,若没有显著的性能提升则恢复设置。"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:791
-#, fuzzy, php-format
+#, php-format
 #| msgid "Customize startup page"
 msgid "Questions since startup: %s"
-msgstr "自定义起始页"
+msgstr "自启动以来的内部查询: %s"
 
 #: server_status.php:797 server_status.php:832 server_status.php:950
 #: server_status.php:995
@@ -9068,18 +9034,18 @@ msgstr "说明"
 #. l10n: # = Amount of queries
 #: server_status.php:830
 msgid "#"
-msgstr ""
+msgstr "查询数量"
 
 #: server_status.php:898
 #, php-format
 msgid "Network traffic since startup: %s"
-msgstr ""
+msgstr "自启动以来的网络流量: %s"
 
 #: server_status.php:906
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "此 MySQL 服务器已经运行了 %s,启动时间为 %s。"
+msgstr "此 MySQL 服务器已运行 %s。启动时间为 %s 。"
 
 #: server_status.php:916
 msgid ""
@@ -9147,13 +9113,12 @@ msgstr "命令"
 msgid ""
 "The number of connections that were aborted because the client died without "
 "closing the connection properly."
-msgstr ""
+msgstr "因客户端没有关闭连接而中止的连接数。"
 
 #: server_status.php:1144
-#, fuzzy
 #| msgid "Whether to enable SSL for connection to MySQL server."
 msgid "The number of failed attempts to connect to the MySQL server."
-msgstr "设置连接到 MySQL 服务器时是否使用 SSL 安全连接。"
+msgstr "尝试连接到 MySQL 服务器但失败的连接数。"
 
 #: server_status.php:1145
 msgid ""
@@ -9171,7 +9136,7 @@ msgstr "事务所用的临时二进制日志缓存的数量。"
 #: server_status.php:1147
 msgid ""
 "The number of connection attempts (successful or not) to the MySQL server."
-msgstr ""
+msgstr "尝试连接到 MySQL 服务器的连接数 (不论成功或失败) 。"
 
 #: server_status.php:1148
 msgid ""
@@ -9558,7 +9523,7 @@ msgstr ""
 msgid ""
 "The maximum number of connections that have been in use simultaneously since "
 "the server started."
-msgstr ""
+msgstr "自服务器启动以来的最高并发连接数。"
 
 #: server_status.php:1219
 msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@@ -9587,7 +9552,7 @@ msgid ""
 "The number of free memory blocks in query cache. High numbers can indicate "
 "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE "
 "statement."
-msgstr ""
+msgstr "查询缓存中的空闲内存块。过多的空闲内存块可能产生碎片,可通过执行 FLUSH QUERY CACHE 语句解决。"
 
 #: server_status.php:1225
 msgid "The amount of free memory for query cache."
@@ -9822,6 +9787,8 @@ msgid ""
 "table is supported by MySQL 5.1.6 and onwards. You may still use the server "
 "charting features however."
 msgstr ""
+"很遗憾你的数据库服务器不支持日志记录到表,这是使用 phpMyAdmin 分析数据库日志的必要功能。MySQL 自 5.1.6 "
+"起有该功能。但你仍然可以使用服务器图表功能。"
 
 #: server_status.php:1458
 msgid ""
@@ -9834,6 +9801,9 @@ msgid ""
 "confirmed, this will load a table of grouped queries, there you may click on "
 "any occuring SELECT statements to further analyze them.</p>"
 msgstr ""
+"<b>使用监控:</b><br/> 现在我们可以开始了!当你点击 '开始监控' 时你的浏览器会以一定间隔时间刷新所有的图表。你可以通过 '设置' 添加图"
+"表或修改刷新频率,或通过图表各自的齿轮图标来移除图表。<p>要想显示日志所记录的查询,请在图表上通过按住鼠标左键的拖拽操作选择相应的时间段。确认后即可显"
+"示出分组后的查询,你可以通过点击其中的 SELECT 语句获得进一步分析。</p>"
 
 #: server_status.php:1463
 msgid ""
@@ -9843,6 +9813,8 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>请注意:</b> 启用 general_log 可能会增加5-15% "
+"的服务器负载。从日志中统计数据同样也是高负载的任务,建议选择一段小范围的时间并在用完监控后禁止 general_log 并清空它的表。"
 
 #: server_status.php:1475
 #| msgid "Usage"
@@ -9871,7 +9843,7 @@ msgstr "选择数据:"
 
 #: server_status.php:1488
 msgid "Commonly monitored"
-msgstr ""
+msgstr "常用监控"
 
 #: server_status.php:1503
 #| msgid "Invalid table name"


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list