August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14013-gaf6954f
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via af6954fe826a0c6c4abf67cb51b209ce6b01dd83 (commit) from e3306f098d5d46ad327e5aa4234ad767414ddc7f (commit) - Log ----------------------------------------------------------------- commit af6954fe826a0c6c4abf67cb51b209ce6b01dd83 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 11:31:48 2011 +0200 Add testcase for PMA_File::getContent ----------------------------------------------------------------------- Summary of changes: test/classes/PMA_File_test.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php index b43135c..63bf80a 100644 --- a/test/classes/PMA_File_test.php +++ b/test/classes/PMA_File_test.php @@ -48,6 +48,16 @@ class PMA_File_test extends PHPUnit_Framework_TestCase } } + /** + * @dataProvider compressedFiles + */ + public function testBinaryContent($file, $mime) + { + $data = '0x' . bin2hex(file_get_contents($file)); + $file = new PMA_File($file); + $this->assertEquals($data, $file->getContent()); + } + public function compressedFiles() { return array( array('./test/test_data/test.gz', 'application/gzip'), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14012-ge3306f0
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via e3306f098d5d46ad327e5aa4234ad767414ddc7f (commit) via 9b4128ed6e6703bb188a385261dae06c77c64a4b (commit) via 0c965a91adea145a2a7dbbc9f0626f40aded585f (commit) from 79c5b6b0e269f8bfa153f9bc6e61325804f99cc0 (commit) - Log ----------------------------------------------------------------- commit e3306f098d5d46ad327e5aa4234ad767414ddc7f Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 11:28:39 2011 +0200 Make test not dependending on set/non set variables commit 9b4128ed6e6703bb188a385261dae06c77c64a4b Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 11:26:29 2011 +0200 Make test not dependending on set/non set token commit 0c965a91adea145a2a7dbbc9f0626f40aded585f Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 11:25:13 2011 +0200 Make test not dependending on set/non set variables ----------------------------------------------------------------------- Summary of changes: test/libraries/PMA_sanitize_test.php | 7 ++++++- test/libraries/common/PMA_getDbLink_test.php | 15 +++++++++++---- test/libraries/core/PMA_getLinks_test.php | 13 +++++++++++-- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index d6f8556..3f0cbf1 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -15,6 +15,11 @@ require_once 'libraries/core.lib.php'; class PMA_sanitize_test extends PHPUnit_Framework_TestCase { + function setUp() + { + $_SESSION[' PMA_token '] = 'token'; + } + /** * Tests for proper escaping of XSS. */ @@ -31,7 +36,7 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase { unset($GLOBALS['server']); unset($GLOBALS['lang']); - $this->assertEquals('<a href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F" target="target">link</a>', + $this->assertEquals('<a href="./url.php?url=http%3A%2F%2Fwww.phpmyadmin.net%2F&token=token" target="target">link</a>', PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]')); } diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php index 00053e1..eba4ec2 100644 --- a/test/libraries/common/PMA_getDbLink_test.php +++ b/test/libraries/common/PMA_getDbLink_test.php @@ -11,14 +11,21 @@ /* * Include to test. */ +require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; +require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/php-gettext/gettext.inc'; class PMA_getDbLink_test extends PHPUnit_Framework_TestCase { function setUp() { global $cfg; + require_once 'libraries/vendor_config.php'; require 'libraries/config.default.php'; + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['lang'] = 'en'; + $GLOBALS['server'] = 99; } function testGetDbLinkEmpty() @@ -33,7 +40,7 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase $GLOBALS['db'] = 'test_db'; $database = $GLOBALS['db']; $this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database - . '&server=server&lang=en" title="Jump to database "' . htmlspecialchars($database) . '".">' + . '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '</a>',PMA_getDbLink()); } @@ -42,7 +49,7 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase global $cfg; $database = 'test_database'; $this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . $database - . '&server=server&lang=en" title="Jump to database "' . htmlspecialchars($database) . '".">' + . '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '</a>',PMA_getDbLink($database)); } @@ -51,7 +58,7 @@ class PMA_getDbLink_test extends PHPUnit_Framework_TestCase global $cfg; $database = 'test&data\'base'; $this->assertEquals('<a href="' . $cfg['DefaultTabDatabase'] . '?db=' . htmlspecialchars(urlencode($database)) - . '&server=server&lang=en" title="Jump to database "' . htmlspecialchars($database) . '".">' + . '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '</a>',PMA_getDbLink($database)); } -} \ No newline at end of file +} diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php index 59aac3e..5930608 100644 --- a/test/libraries/core/PMA_getLinks_test.php +++ b/test/libraries/core/PMA_getLinks_test.php @@ -11,9 +11,18 @@ */ require_once 'libraries/core.lib.php'; require_once 'libraries/url_generating.lib.php'; +require_once 'libraries/php-gettext/gettext.inc'; class PMA_getLinks_test extends PHPUnit_Framework_TestCase { + function setUp() + { + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['lang'] = 'en'; + $GLOBALS['server'] = 99; + $GLOBALS['cfg']['ServerDefault'] = 0; + } + public function testPMA_getPHPDocLink() { $lang = _pgettext('PHP documentation language', 'en'); @@ -22,8 +31,8 @@ class PMA_getLinks_test extends PHPUnit_Framework_TestCase public function providerLinkURL(){ return array( - array('http://wiki.phpmyadmin.net', './url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net&lang=en'), - array('https://wiki.phpmyadmin.net', './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net&lang=en'), + array('http://wiki.phpmyadmin.net', './url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net&server=99&lang=en&token=token'), + array('https://wiki.phpmyadmin.net', './url.php?url=https%3A%2F%2Fwiki.phpmyadmin.net&server=99&lang=en&token=token'), array('wiki.phpmyadmin.net', 'wiki.phpmyadmin.net'), array('index.php?db=phpmyadmin', 'index.php?db=phpmyadmin') ); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14008-g7664fb3
by Michal Čihař 10 Aug '11

10 Aug '11

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(a)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(a)cihar.com> Date: Wed Aug 10 10:40:28 2011 +0200 Merge remote-tracking branch 'origin/master' commit 384bb236297da3bab8bfe34cf7c3e4b6332d1645 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:38:58 2011 +0200 Translation update done using Pootle. commit 9556e428328f26ac829202e1ba03388aea1a3e72 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:37:29 2011 +0200 Translation update done using Pootle. commit 1d99b06245506635ad319a5905b5e9b680872b6e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:37:08 2011 +0200 Translation update done using Pootle. commit a42b79ca9bf96e71396b9b5559a6811dec697abe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:35:45 2011 +0200 Translation update done using Pootle. commit 880abde28a99d77d46a96a334319fc44035be88e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:35:40 2011 +0200 Translation update done using Pootle. commit 3a53d5450403cf94db92b9d0389a815db8cb6d9b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:35:29 2011 +0200 Translation update done using Pootle. commit 5e959921da349301436caab4542cd7d26a2de825 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:32:35 2011 +0200 Translation update done using Pootle. commit 0312d682de4d6614a04914afa3bf3f8cbb5fa277 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:32:21 2011 +0200 Translation update done using Pootle. commit a91743b5d086516893ec6a0792bcb32eb354e935 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:32:06 2011 +0200 Translation update done using Pootle. commit 4a9407f9893d0d03f73a8fe7de3a476c9ae85b32 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:31:21 2011 +0200 Translation update done using Pootle. commit 1fa877f7dd7b1cc141368d80f9472b399fc0c59a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:30:30 2011 +0200 Translation update done using Pootle. commit 066a975d389256c8a720ca5c7c72b613871cdad8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:29:50 2011 +0200 Translation update done using Pootle. commit 2798c213695ebbd526be377629b10cd99375ed73 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:29:22 2011 +0200 Translation update done using Pootle. commit d05714fc7b4eb0ba3bc75153a24c6fe8b8f663a1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:26:47 2011 +0200 Translation update done using Pootle. commit 11955f86a34ddb10a24b95b69af4841d609703cd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:26:23 2011 +0200 Translation update done using Pootle. commit 5a26afedeb17b9d85ee7c6c733a7d2dccdfd2f15 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:26:15 2011 +0200 Translation update done using Pootle. commit ada980375501b2533c15ed48bbb1c2b4b10ffd4c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:26:05 2011 +0200 Translation update done using Pootle. commit b691d95bc0b453a451b908a7181df34b40b5e36f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:24:05 2011 +0200 Translation update done using Pootle. commit 1a077e1a889c2dbc1e359804d6f65bb46f4ca7bf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:22:16 2011 +0200 Translation update done using Pootle. commit cde437697058d1ad1af81412fad9e1ba54072e43 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:22:12 2011 +0200 Translation update done using Pootle. commit 782f1f5da38741382df2d49d708af35b0636cbc6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:21:53 2011 +0200 Translation update done using Pootle. commit f706abed75279f9ec8bfe65279d98113641ef72b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:21:38 2011 +0200 Translation update done using Pootle. commit 34e89c646617b0d17d2e9b4a106455aaec7e8058 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:21:26 2011 +0200 Translation update done using Pootle. commit c760adcda4d09100385cb50f02534b90bf6b7036 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:20:52 2011 +0200 Translation update done using Pootle. commit 13ab249ea8d33ed598203fccf17d56b890618081 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:20:38 2011 +0200 Translation update done using Pootle. commit 93bacd1c9bf76f2eea54bac1f1f6dbef2d480b1b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:20:26 2011 +0200 Translation update done using Pootle. commit 06b5af4c33e5ea70d4fd74676b4034f09ecfcc33 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:20:00 2011 +0200 Translation update done using Pootle. commit fc113efa7c92b34f35fd0cf8bf5c9304598f2206 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:19:30 2011 +0200 Translation update done using Pootle. commit 87eadcedc7c53411c3cbedcd0a035f663a56a10c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:19:08 2011 +0200 Translation update done using Pootle. commit 57337f6be0e789597bbadf3e430f5a5db969570a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:18:37 2011 +0200 Translation update done using Pootle. commit 550a07dacd758094299d74e4ecf50f2ce6838a33 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:18:25 2011 +0200 Translation update done using Pootle. commit cb025beccd46997f924c8a96ce5c44e4885a207c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:18:11 2011 +0200 Translation update done using Pootle. commit faa13e284b59555adf92c7d80991f64541289062 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:17:59 2011 +0200 Translation update done using Pootle. commit 5c2146781b6ae0ca2a61201f2ef676959517406f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:14:55 2011 +0200 Translation update done using Pootle. commit 2a6f14e462968bf50b7a9abc7b56cbb121097b30 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:14:43 2011 +0200 Translation update done using Pootle. commit 4f47f8e4622db03b13fc521695121e484cf1aba9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:14:37 2011 +0200 Translation update done using Pootle. commit 4ecc12f646b1d6ca11c886e93a082011e4d7c45c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:13:59 2011 +0200 Translation update done using Pootle. commit bf47fcbef4bed130ebbba8a54376d938066edadd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:13:37 2011 +0200 Translation update done using Pootle. commit 89bf81ec71d8f9d5d615f390cd75a0d074aa98bd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:13:07 2011 +0200 Translation update done using Pootle. commit d59d086d4ce716cb83c6b6e49cafdd618f701db7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:12:47 2011 +0200 Translation update done using Pootle. commit 2820450b9c5ac14e9612806ec74307c295b5ce14 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:12:28 2011 +0200 Translation update done using Pootle. commit 48df94ef681acedc49899e42730a8ea2e206035d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:12:13 2011 +0200 Translation update done using Pootle. commit 540422c12d77151bf77ec9b2293d16bb0a044a3e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:11:48 2011 +0200 Translation update done using Pootle. commit b40976a5850448130a71d4a4ca8b3c5c3dcb471a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:10:10 2011 +0200 Translation update done using Pootle. commit 5f1bd071653c09d5ee93a2c5f499c4d060ffe24e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:07:34 2011 +0200 Translation update done using Pootle. commit 859099fb10075a855a24a4e029aab05c9c607352 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:07:18 2011 +0200 Translation update done using Pootle. commit 4793ed9a1fd121a3da71669bd4fb0a61af3c22bc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:07:06 2011 +0200 Translation update done using Pootle. commit 45a0ddbccaf8ada6665f98b16688d58bd02e0f16 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:06:51 2011 +0200 Translation update done using Pootle. commit 99a242d3e44a6b7fdd6b362cf462779957b7d6bb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:06:32 2011 +0200 Translation update done using Pootle. commit 3b2afae13a19749eda085a46db758a58c8285c51 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 10:06:19 2011 +0200 Translation update done using Pootle. commit 9735c1db40da3c48dfb847e895f4ebba25e3feb8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:42:54 2011 +0200 Translation update done using Pootle. commit 9b765e147608addd6fc91fb7aea13d0ac9b5f0ca Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:42:19 2011 +0200 Translation update done using Pootle. commit 83dd3e4fcc2bca6e21a49e8ae48f338c99c05717 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:42:10 2011 +0200 Translation update done using Pootle. commit 0e8c685e3686295eda1c705a44da3aa79a5f058e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:40:51 2011 +0200 Translation update done using Pootle. commit c200b8bd8bf211643ad0e52d0cfd2914fae04735 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:39:34 2011 +0200 Translation update done using Pootle. commit 263489281aa522630e71096d5319b517c2c5c44b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:38:20 2011 +0200 Translation update done using Pootle. commit 0961188ee46e76861eb7dead1317d8d480d855e1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:38:09 2011 +0200 Translation update done using Pootle. commit fb96d27b5a00b33be250b66c4f58286166deace3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:37:54 2011 +0200 Translation update done using Pootle. commit 7cdedc2daeb15731259454e77df4afd71357e937 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:37:24 2011 +0200 Translation update done using Pootle. commit b5a9830c0890739dc4955612fb616da659578973 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:37:15 2011 +0200 Translation update done using Pootle. commit fd4516acd16a9c7111ac89c4f5ac299c207333ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:36:46 2011 +0200 Translation update done using Pootle. commit 603fef72ce2779d1346f21a153e6cd0d2bf6eb9e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:36:02 2011 +0200 Translation update done using Pootle. commit c1031a76ec603e9b20dfb06abaa57a4ff568db5f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:34:56 2011 +0200 Translation update done using Pootle. commit 0d55156060ee34fcf04869f0c32e36b4e19c1dd9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:34:39 2011 +0200 Translation update done using Pootle. commit 2ca41f6e5607f7bd6d2f128c9280d93afa00a78f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:34:03 2011 +0200 Translation update done using Pootle. commit c58939a2ab10319003727a6e8f58134ada013b84 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:32:59 2011 +0200 Translation update done using Pootle. commit 1a975064cd89ff19f7f20633a7331891b5471cfc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:26:12 2011 +0200 Translation update done using Pootle. commit a45b7bd2ea7a89109deb6e1979d0631ca468323f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:25:34 2011 +0200 Translation update done using Pootle. commit e7d43d4ecf0b655a043851972c9e59ff233154c3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:25:21 2011 +0200 Translation update done using Pootle. commit 348f88fbb526ef356bffba15e762a4fcab861deb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:24:18 2011 +0200 Translation update done using Pootle. commit 433cddab048b5d1b35c26e17600c852b2f8e5d6e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:23:30 2011 +0200 Translation update done using Pootle. commit 28c84415f3001aa1688c8a1a30b9f28961c003fb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:23:15 2011 +0200 Translation update done using Pootle. commit ca12180ab48c5bc5fb2d16c71f7a5ceb6514fa40 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:22:45 2011 +0200 Translation update done using Pootle. commit e01ca50876d17ba18b1ecb41a9d7726e7440ae08 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:22:23 2011 +0200 Translation update done using Pootle. commit 7ab73d97529630af6fe606b9dfad0e9e660051d3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:21:55 2011 +0200 Translation update done using Pootle. commit 030655944cb89f75f7d4b3221400b28e579db667 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:20:49 2011 +0200 Translation update done using Pootle. commit 6a605bf48c29f78e9c86d5c209e24116f97d5361 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:20:13 2011 +0200 Translation update done using Pootle. commit 900a0b90e3d6bd45682a4517fa3b682bebe13ecc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:19:06 2011 +0200 Translation update done using Pootle. commit 2fba85611a7e2f397173cfdf01a9a26a4fd802f2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:18:40 2011 +0200 Translation update done using Pootle. commit cd7b54b519da533140d931f5d16fbfb7b8f77077 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:17:42 2011 +0200 Translation update done using Pootle. commit 3733743c1a433773f7a3f67c90b3f420a0ab1ce9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:15:58 2011 +0200 Translation update done using Pootle. commit f963b0cf2690b68439af3dbd3fe33d2e8723c8f3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:15:04 2011 +0200 Translation update done using Pootle. commit 7f98f2b28f8ffc4f5f9f27c2ab402967eeae0d44 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:13:59 2011 +0200 Translation update done using Pootle. commit 90408830b3b9f6dedec73c1c4a2318ab00b0845f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:13:15 2011 +0200 Translation update done using Pootle. commit 1fc2ddadce22caf198457f357bc29c254b80c6a7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:11:54 2011 +0200 Translation update done using Pootle. commit ac5c307261b48ca350158cad595b292e5374d10e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:10:52 2011 +0200 Translation update done using Pootle. commit 78ae1acfcbd2d2ac78e7edeaf6542c19f8666509 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:10:36 2011 +0200 Translation update done using Pootle. commit 111bdcbe781413e8d0759e2671e37c1d3a46f837 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:09:33 2011 +0200 Translation update done using Pootle. commit 3f103625385169e2a9a17a069d0d0f1305a1e0d2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 09:06:01 2011 +0200 Translation update done using Pootle. commit 3c689f2b8ae3c9903b02ea267396aeb042c2413a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:59:45 2011 +0200 Translation update done using Pootle. commit faee822379c3bed81fc353ee26c8fcb16782baea Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:59:39 2011 +0200 Translation update done using Pootle. commit 8be2aeb0276c27d2eed3aba1ecefdffca0d1c8ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:58:56 2011 +0200 Translation update done using Pootle. commit d5f25e3d9d2b4aefd472faafce233df37359da87 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:58:07 2011 +0200 Translation update done using Pootle. commit 33e1c1f7124c680677450f7d1448a65f384ffc0f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:57:26 2011 +0200 Translation update done using Pootle. commit d4f5524b1515c6fefbbad0815c3ff2b18bbd6200 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:57:06 2011 +0200 Translation update done using Pootle. commit e5bd1892dd70c9570bba33edfa1caa40a3e89585 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:56:57 2011 +0200 Translation update done using Pootle. commit 13730892001e5c1dc2e808d9afffe02b17cb5c36 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:55:08 2011 +0200 Translation update done using Pootle. commit b2e79d77eb6c8d0a28893eb08bb0945b780a8cba Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:55:03 2011 +0200 Translation update done using Pootle. commit 5c15eeb1be1c5daeb454f1f9512a69b9a70916c0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:53:49 2011 +0200 Translation update done using Pootle. commit bead53e397cf9e8279d4a45c5ba66e414334555b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:52:57 2011 +0200 Translation update done using Pootle. commit bba641b4ca4d48e138632934ebd6b5f5f2feb53a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:50:05 2011 +0200 Translation update done using Pootle. commit 24c7336fddea85e718aa5f69253e98f5a7862bbf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:47:53 2011 +0200 Translation update done using Pootle. commit 2058332bf1f5460ee92153e7096f03aacba7ca4e Author: shanyan baishui <Siramizu(a)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(a)cihar.com> Date: Wed Aug 10 08:40:18 2011 +0200 Merge remote-tracking branch 'origin/master' commit da7f2b54869d233e5a0b407eb2e2b015b169fde3 Author: shanyan baishui <Siramizu(a)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(a)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(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)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@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

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13900-gf9e2218
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via f9e2218d9622f7184b4b1a42b96618f082da76c2 (commit) from 096d06eda002b6f47a455e4d144538355ce66274 (commit) - Log ----------------------------------------------------------------- commit f9e2218d9622f7184b4b1a42b96618f082da76c2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 10:09:02 2011 +0200 Fix doc ----------------------------------------------------------------------- Summary of changes: test/classes/PMA_List_Database_test.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/PMA_List_Database_test.php index 00691e8..6eb3e7e 100644 --- a/test/classes/PMA_List_Database_test.php +++ b/test/classes/PMA_List_Database_test.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * tests for PMA_List class + * tests for PMA_List_Database class * * @package phpMyAdmin-test */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13899-g096d06e
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via 096d06eda002b6f47a455e4d144538355ce66274 (commit) via f1e2897da00c035c6ec9c725cac8817f719f9606 (commit) via 2df16b3187c06272e2b82e63e59ba91e36ceb091 (commit) from d180636168ee95d4b4629b71b18875aba3c6adeb (commit) - Log ----------------------------------------------------------------- commit 096d06eda002b6f47a455e4d144538355ce66274 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 10:06:54 2011 +0200 Move class tests to test/classes commit f1e2897da00c035c6ec9c725cac8817f719f9606 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 10:04:17 2011 +0200 Return true on succsess commit 2df16b3187c06272e2b82e63e59ba91e36ceb091 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 09:48:42 2011 +0200 Start testcases for PMA_File class ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 2 +- test/classes/PMA_File_test.php | 59 ++++++++++++++++++++ .../PMA_List_Database_test.php | 0 .../PMA_Theme_Manager_test.php | 0 test/test_data/test.bz2 | Bin 0 -> 49 bytes test/test_data/test.file | 1 + test/test_data/test.gz | Bin 0 -> 40 bytes test/test_data/test.zip | Bin 0 -> 178 bytes 8 files changed, 61 insertions(+), 1 deletions(-) create mode 100644 test/classes/PMA_File_test.php rename test/{libraries => classes}/PMA_List_Database_test.php (100%) rename test/{libraries => classes}/PMA_Theme_Manager_test.php (100%) create mode 100644 test/test_data/test.bz2 create mode 100644 test/test_data/test.file create mode 100644 test/test_data/test.gz create mode 100644 test/test_data/test.zip diff --git a/libraries/File.class.php b/libraries/File.class.php index 5a6d59f..332c8ea 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -643,7 +643,7 @@ class PMA_File break; } - + return true; } function getCharset() diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php new file mode 100644 index 0000000..b43135c --- /dev/null +++ b/test/classes/PMA_File_test.php @@ -0,0 +1,59 @@ + +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * tests for PMA_File class + * + * @package phpMyAdmin-test + */ + +/* + * Include to test. + */ +require_once 'libraries/common.lib.php'; +require_once 'libraries/File.class.php'; + +class PMA_File_test extends PHPUnit_Framework_TestCase +{ + public function setup() + { + $GLOBALS['cfg']['BZipDump'] = true; + $GLOBALS['cfg']['GZipDump'] = true; + $GLOBALS['cfg']['ZipDump'] = true; + $GLOBALS['charset_conversion'] = false; + } + + /** + * @dataProvider compressedFiles + */ + public function testMIME($file, $mime) + { + $arr = new PMA_File($file); + $this->assertEquals($mime, $arr->getCompression()); + } + + /** + * @dataProvider compressedFiles + */ + public function testContent($file, $mime) + { + $orig = file_get_contents('./test/test_data/test.file'); + $file = new PMA_File($file); + $file->setDecompressContent(true); + $this->assertTrue($file->open()); + if ($mime == 'application/zip') { + $this->assertEquals($orig, $file->content_uncompressed); + } else { + $this->assertEquals($orig, $file->getNextChunk()); + } + } + + public function compressedFiles() { + return array( + array('./test/test_data/test.gz', 'application/gzip'), + array('./test/test_data/test.bz2', 'application/bzip2'), + array('./test/test_data/test.zip', 'application/zip'), + ); + } +} +?> diff --git a/test/libraries/PMA_List_Database_test.php b/test/classes/PMA_List_Database_test.php similarity index 100% rename from test/libraries/PMA_List_Database_test.php rename to test/classes/PMA_List_Database_test.php diff --git a/test/libraries/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php similarity index 100% rename from test/libraries/PMA_Theme_Manager_test.php rename to test/classes/PMA_Theme_Manager_test.php diff --git a/test/test_data/test.bz2 b/test/test_data/test.bz2 new file mode 100644 index 0000000..971a078 Binary files /dev/null and b/test/test_data/test.bz2 differ diff --git a/test/test_data/test.file b/test/test_data/test.file new file mode 100644 index 0000000..fafd745 --- /dev/null +++ b/test/test_data/test.file @@ -0,0 +1 @@ +TEST FILE diff --git a/test/test_data/test.gz b/test/test_data/test.gz new file mode 100644 index 0000000..6d25ca8 Binary files /dev/null and b/test/test_data/test.gz differ diff --git a/test/test_data/test.zip b/test/test_data/test.zip new file mode 100644 index 0000000..bee8c35 Binary files /dev/null and b/test/test_data/test.zip differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13896-gd180636
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via d180636168ee95d4b4629b71b18875aba3c6adeb (commit) via c85317a668a159ebd1b362c3782b3656b1cea457 (commit) via bb8bbb9e291b224db100bad0cb9f12725c39b727 (commit) via c5386c379c2347adef9622ca69cf81453500e7f8 (commit) via 0ecf7f6bf84051ea3268d293c330305b2c814dcc (commit) via 912540c478418c5382699802b4263845b3d77f7f (commit) via e6255d796e9ac780ea3e51084572fd4865bcc02a (commit) via 4159ff25152526d78ab4862003be1d5f7fe86a8a (commit) via f6525a7a3cb930b557bb866a6782138d385459c5 (commit) via f654bd7a5270088fe078cca0a6578ceb25c4dfcc (commit) via 6a622ed417cc79231849f53b21707ce9d49160a2 (commit) via e5ae047c3da931b1260a82e3f83deb4935c8a69e (commit) via 18eb288698fffdcdfe4f64e32cc942222180bec8 (commit) via 66725ef0ca87b5ff60de8770d1e9086b19e71e20 (commit) via 9776fa49ff2ad6ce8ca826d5fece66c6c98e96cc (commit) via 7e6c15647a4036f6c82d00e88fa2ae5adb787924 (commit) via 95cd27de674bf954f0aa401abcdb8a9e9075998c (commit) via ce84be6ce197f36e472aed069a0608cb5a257d47 (commit) via 2b713c4248576d9c7512a27f88f987e4f3020bdc (commit) via 566a4b5c3989ab2dc0ad690546dfc589a62e3bdc (commit) via 12b53a404380b8d71fad25f9b75b693e61886947 (commit) via 70d63d4d9c4b62351844946079d4c5de65faf6bd (commit) via 7387bcffb4b416fd6a7d9d3f67a29b5b1f9da52a (commit) via b7d5d6257c25f521396b653a48567f78b1a14681 (commit) via f997cef3981489bc4f4c0360c5a99471e1450586 (commit) via e8690c5ce0e43ff6030d14a2df5c27db5b1e0679 (commit) via 66fa6c11d95a820ab33c5303ea3f9a6f0af3907c (commit) via 61e0e941accf109fee71dc7f11ce4247a34febee (commit) via fb2b7fc55ad6f521d9786b30d685f5ae1b11aea8 (commit) via f4a006ff596cff9c62e6e8cc7f01a54f29a934f6 (commit) via cdb7aec644caab616f9d8bd79bbf6039fa0278c7 (commit) via 07cfe8d83553d9493a04b3ec71c00474d64c8354 (commit) via 9ff83de28e7effc301e0b5a04d6f3efbf07ae22a (commit) via 1f5a278465c07b70184833cb1a9398c571d12893 (commit) via c0aa1e1da2ae99f8f12fea0ada9042cce43e1f6f (commit) via 46f741444b8defaafeab09c49a459c233bc9ddfe (commit) via b57c4d47f4fe5199980a6c457dc41703fc07aa8b (commit) via 05020ec4dc50036d0d75d6454d2a0574b6b25f5d (commit) via f622e4589c36cddfb3e467443e21cd7e33c3046c (commit) via 5e0d50bc3466203851e09e3d3d11e8b2c2bc0fda (commit) via 5d9ea94d9d1231807e495cc432c0d808b5274921 (commit) via 9f2cb8d93ae7c632302c30c4f76200c0193808fc (commit) via 125d882cdeb629e0b22be56863ee09a9fd146020 (commit) via 2ec2812b69f7838729c50d99fb346e90e56ef1a5 (commit) via 9f5445e93c4e7c577f77dc43c02f3c1e83a56a1a (commit) via 04e80871d9c585580c78fcd8bfbf3623f911ea7f (commit) via 4285ece56e880b407f50380513e70fc8e729ef04 (commit) via 2222a8c79a949b53fef58ea672e39db973b0730b (commit) via d383d48a28f3808f3e6bb397f3f0fb85c04e4c94 (commit) via 63a58e49d9e678160640030061ca3ce1b6969da0 (commit) via 65c551fd29aacb25f00e21c19a9070dd350ccb2a (commit) via b23dfb74d7261ec4057b7ff35fadb02a01d734dd (commit) via 3b8c8f0f64fee05e46a2c7e5d0532c75fd997e80 (commit) via 95d17bdcc86c0f86d30a450c53f01615915071b3 (commit) via 73aea457467685597c8b7830b4e0ff173cd6d294 (commit) via aacecd4f2e140cb22c71efb0226debb21a3e6a2f (commit) via e16a8b955dcfd42efb816f32a846bd6485760db2 (commit) via 5460602dc02f1e9efbfe05eb9a54da3ac2b575fe (commit) via 2d5a1b09a6be5426bb8dbd6cc98a3410c0ca60c2 (commit) via 3857e31598d8fbeb84486433cf7d6453b1d81c52 (commit) via 242fad1b4a0c4c974da9ecd93d64cea4089d6e53 (commit) via be227c2e8d92b2ad4fe71f426e3d280548acd794 (commit) from 0e53f3bf835cbab761adccb2c15324e3481e005b (commit) - Log ----------------------------------------------------------------- commit d180636168ee95d4b4629b71b18875aba3c6adeb Merge: 0e53f3b c85317a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 08:23:46 2011 +0200 Merge remote-tracking branch 'pootle/master' commit c85317a668a159ebd1b362c3782b3656b1cea457 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:23:12 2011 +0200 Translation update done using Pootle. commit bb8bbb9e291b224db100bad0cb9f12725c39b727 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:22:31 2011 +0200 Translation update done using Pootle. commit c5386c379c2347adef9622ca69cf81453500e7f8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:19:56 2011 +0200 Translation update done using Pootle. commit 0ecf7f6bf84051ea3268d293c330305b2c814dcc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:19:45 2011 +0200 Translation update done using Pootle. commit 912540c478418c5382699802b4263845b3d77f7f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:19:22 2011 +0200 Translation update done using Pootle. commit e6255d796e9ac780ea3e51084572fd4865bcc02a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:13:31 2011 +0200 Translation update done using Pootle. commit 4159ff25152526d78ab4862003be1d5f7fe86a8a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:12:06 2011 +0200 Translation update done using Pootle. commit f6525a7a3cb930b557bb866a6782138d385459c5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:11:52 2011 +0200 Translation update done using Pootle. commit f654bd7a5270088fe078cca0a6578ceb25c4dfcc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:11:07 2011 +0200 Translation update done using Pootle. commit 6a622ed417cc79231849f53b21707ce9d49160a2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:10:37 2011 +0200 Translation update done using Pootle. commit e5ae047c3da931b1260a82e3f83deb4935c8a69e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:10:27 2011 +0200 Translation update done using Pootle. commit 18eb288698fffdcdfe4f64e32cc942222180bec8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:10:17 2011 +0200 Translation update done using Pootle. commit 66725ef0ca87b5ff60de8770d1e9086b19e71e20 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:09:47 2011 +0200 Translation update done using Pootle. commit 9776fa49ff2ad6ce8ca826d5fece66c6c98e96cc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:09:26 2011 +0200 Translation update done using Pootle. commit 7e6c15647a4036f6c82d00e88fa2ae5adb787924 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:01:37 2011 +0200 Translation update done using Pootle. commit 95cd27de674bf954f0aa401abcdb8a9e9075998c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:01:20 2011 +0200 Translation update done using Pootle. commit ce84be6ce197f36e472aed069a0608cb5a257d47 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 08:00:20 2011 +0200 Translation update done using Pootle. commit 2b713c4248576d9c7512a27f88f987e4f3020bdc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:59:35 2011 +0200 Translation update done using Pootle. commit 566a4b5c3989ab2dc0ad690546dfc589a62e3bdc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:56:22 2011 +0200 Translation update done using Pootle. commit 12b53a404380b8d71fad25f9b75b693e61886947 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:56:11 2011 +0200 Translation update done using Pootle. commit 70d63d4d9c4b62351844946079d4c5de65faf6bd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:56:02 2011 +0200 Translation update done using Pootle. commit 7387bcffb4b416fd6a7d9d3f67a29b5b1f9da52a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:54:47 2011 +0200 Translation update done using Pootle. commit b7d5d6257c25f521396b653a48567f78b1a14681 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:49:58 2011 +0200 Translation update done using Pootle. commit f997cef3981489bc4f4c0360c5a99471e1450586 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:49:51 2011 +0200 Translation update done using Pootle. commit e8690c5ce0e43ff6030d14a2df5c27db5b1e0679 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:49:40 2011 +0200 Translation update done using Pootle. commit 66fa6c11d95a820ab33c5303ea3f9a6f0af3907c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:48:17 2011 +0200 Translation update done using Pootle. commit 61e0e941accf109fee71dc7f11ce4247a34febee Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:47:30 2011 +0200 Translation update done using Pootle. commit fb2b7fc55ad6f521d9786b30d685f5ae1b11aea8 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:46:55 2011 +0200 Translation update done using Pootle. commit f4a006ff596cff9c62e6e8cc7f01a54f29a934f6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:46:35 2011 +0200 Translation update done using Pootle. commit cdb7aec644caab616f9d8bd79bbf6039fa0278c7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:46:26 2011 +0200 Translation update done using Pootle. commit 07cfe8d83553d9493a04b3ec71c00474d64c8354 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:46:20 2011 +0200 Translation update done using Pootle. commit 9ff83de28e7effc301e0b5a04d6f3efbf07ae22a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:45:17 2011 +0200 Translation update done using Pootle. commit 1f5a278465c07b70184833cb1a9398c571d12893 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:44:57 2011 +0200 Translation update done using Pootle. commit c0aa1e1da2ae99f8f12fea0ada9042cce43e1f6f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:44:11 2011 +0200 Translation update done using Pootle. commit 46f741444b8defaafeab09c49a459c233bc9ddfe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:43:48 2011 +0200 Translation update done using Pootle. commit b57c4d47f4fe5199980a6c457dc41703fc07aa8b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:42:22 2011 +0200 Translation update done using Pootle. commit 05020ec4dc50036d0d75d6454d2a0574b6b25f5d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:42:07 2011 +0200 Translation update done using Pootle. commit f622e4589c36cddfb3e467443e21cd7e33c3046c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:41:58 2011 +0200 Translation update done using Pootle. commit 5e0d50bc3466203851e09e3d3d11e8b2c2bc0fda Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:41:31 2011 +0200 Translation update done using Pootle. commit 5d9ea94d9d1231807e495cc432c0d808b5274921 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:41:19 2011 +0200 Translation update done using Pootle. commit 9f2cb8d93ae7c632302c30c4f76200c0193808fc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:39:30 2011 +0200 Translation update done using Pootle. commit 125d882cdeb629e0b22be56863ee09a9fd146020 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:38:56 2011 +0200 Translation update done using Pootle. commit 2ec2812b69f7838729c50d99fb346e90e56ef1a5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:26:24 2011 +0200 Translation update done using Pootle. commit 9f5445e93c4e7c577f77dc43c02f3c1e83a56a1a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:26:23 2011 +0200 Translation update done using Pootle. commit 04e80871d9c585580c78fcd8bfbf3623f911ea7f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:25:58 2011 +0200 Translation update done using Pootle. commit 4285ece56e880b407f50380513e70fc8e729ef04 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:25:46 2011 +0200 Translation update done using Pootle. commit 2222a8c79a949b53fef58ea672e39db973b0730b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:25:17 2011 +0200 Translation update done using Pootle. commit d383d48a28f3808f3e6bb397f3f0fb85c04e4c94 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:24:30 2011 +0200 Translation update done using Pootle. commit 63a58e49d9e678160640030061ca3ce1b6969da0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:24:18 2011 +0200 Translation update done using Pootle. commit 65c551fd29aacb25f00e21c19a9070dd350ccb2a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:23:06 2011 +0200 Translation update done using Pootle. commit b23dfb74d7261ec4057b7ff35fadb02a01d734dd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:22:50 2011 +0200 Translation update done using Pootle. commit 3b8c8f0f64fee05e46a2c7e5d0532c75fd997e80 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 07:22:03 2011 +0200 Translation update done using Pootle. commit 95d17bdcc86c0f86d30a450c53f01615915071b3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:38:39 2011 +0200 Translation update done using Pootle. commit 73aea457467685597c8b7830b4e0ff173cd6d294 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:36:16 2011 +0200 Translation update done using Pootle. commit aacecd4f2e140cb22c71efb0226debb21a3e6a2f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:35:44 2011 +0200 Translation update done using Pootle. commit e16a8b955dcfd42efb816f32a846bd6485760db2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:28:47 2011 +0200 Translation update done using Pootle. commit 5460602dc02f1e9efbfe05eb9a54da3ac2b575fe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:28:38 2011 +0200 Translation update done using Pootle. commit 2d5a1b09a6be5426bb8dbd6cc98a3410c0ca60c2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:28:25 2011 +0200 Translation update done using Pootle. commit 3857e31598d8fbeb84486433cf7d6453b1d81c52 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:28:22 2011 +0200 Translation update done using Pootle. commit 242fad1b4a0c4c974da9ecd93d64cea4089d6e53 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:28:08 2011 +0200 Translation update done using Pootle. commit be227c2e8d92b2ad4fe71f426e3d280548acd794 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Aug 10 04:27:27 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 163 +++++++++++++++++++++++------------------------------------ 1 files changed, 63 insertions(+), 100 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 517c3c4..990da83 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-09 16:45+0100\n" -"PO-Revision-Date: 2011-08-09 09:37+0200\n" +"PO-Revision-Date: 2011-08-10 08:23+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -555,28 +555,26 @@ msgid "Search in database" msgstr "在数据库中搜索" #: db_search.php:269 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "要查找的文字或数值 (通配符：“%”)：" +msgstr "要查找的内容 (通配符: \"%\"):" #: db_search.php:274 msgid "Find:" -msgstr "查找：" +msgstr "查找:" #: db_search.php:278 db_search.php:279 msgid "Words are separated by a space character (\" \")." -msgstr "每个单词用空格 (“ ”) 分隔。" +msgstr "每个单词用空格 (\" \") 分隔。" #: db_search.php:292 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" -msgstr "于以下表：" +msgstr "于下列表:" #: db_search.php:322 msgid "Inside column:" -msgstr "包含字段：" +msgstr "包含字段:" #: db_structure.php:61 msgid "No tables found in database" @@ -1132,10 +1130,9 @@ msgid "Average load" msgstr "平均负载" #: js/messages.php:101 -#, fuzzy #| msgid "Log file count" msgid "Total memory" -msgstr "日志文件总数" +msgstr "内存总数" #: js/messages.php:102 msgid "Cached memory" @@ -9755,65 +9752,57 @@ msgid "The number of threads that are not sleeping." msgstr "非睡眠状态的线程数量。" #: server_status.php:1392 -#, fuzzy #| msgid "Textarea rows" msgid "Start Monitor" -msgstr "文本框行" +msgstr "启动监控" #: server_status.php:1400 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "介绍" +msgstr "说明/设置" #: server_status.php:1404 msgid "Done rearranging/editing charts" -msgstr "" +msgstr "完成排列/编辑图表" #: server_status.php:1411 -#, fuzzy #| msgid "Add prefix" msgid "Add chart" -msgstr "添加前缀" +msgstr "添加图表" #: server_status.php:1413 msgid "Rearrange/edit charts" -msgstr "" +msgstr "排列/编辑图表" #: server_status.php:1416 -#, fuzzy msgid "Refresh rate" -msgstr "刷新" +msgstr "刷新频率" #: server_status.php:1419 -#, fuzzy #| msgid "Textarea columns" msgid "Chart columns" -msgstr "文本框列" +msgstr "每行图表个数" #: server_status.php:1435 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "错误管理:" +msgstr "图表排列" #: server_status.php:1435 msgid "" "The arrangement of the charts is stored to the browsers local storage. You " "may want to export it if you have a complicated set up." -msgstr "" +msgstr "图表排列存储在浏览器本地存储。如果你设置了一个复杂的排列，请导出该设置。" #: server_status.php:1436 -#, fuzzy #| msgid "Restore default value" msgid "Reset to default" -msgstr "还原默认值" +msgstr "恢复默认" #: server_status.php:1440 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "介绍" +msgstr "监控说明" #: server_status.php:1441 msgid "" @@ -9823,6 +9812,8 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%" msgstr "" +"phpMyAdmin 监控可以帮助你优化服务期配置并追踪特定查询。要实现追踪查询功能，你需要将 log_output 设置为 'TABLE' 并启用 " +"slow_query_log 或 general_log 功能。请注意，general_log 会产生很多数据并可能增加服务器负载多达 15%" #: server_status.php:1446 msgid "" @@ -9854,118 +9845,107 @@ msgid "" msgstr "" #: server_status.php:1475 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "已用" +msgstr "CPU 使用" #: server_status.php:1478 -#, fuzzy #| msgid "2. Usage" msgid "Memory Usage" -msgstr "2. 使用" +msgstr "内存使用" #: server_status.php:1481 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "已用" +msgstr "交换空间使用" #: server_status.php:1484 -#, fuzzy #| msgid "See slave status table" msgid "Status variable(s)" -msgstr "查看从服务器状态" +msgstr "状态变量" #: server_status.php:1486 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "选择表" +msgstr "选择数据:" #: server_status.php:1488 msgid "Commonly monitored" msgstr "" #: server_status.php:1503 -#, fuzzy #| msgid "Invalid table name" msgid "or type variable name:" -msgstr "无效的数据表名" +msgstr "或输入变量名:" #: server_status.php:1507 msgid "Display as differential value" -msgstr "" +msgstr "独立显示" #: server_status.php:1509 msgid "Apply a divisor" -msgstr "" +msgstr "应用除数" #: server_status.php:1516 msgid "Append unit to data values" -msgstr "" +msgstr "在值后附加单位" #: server_status.php:1522 -#, fuzzy #| msgid "Add a new server" msgid "Add this series" -msgstr "添加服务器" +msgstr "添加该数据" #: server_status.php:1524 msgid "Clear series" -msgstr "" +msgstr "清除所有数据" #: server_status.php:1527 -#, fuzzy #| msgid "SQL queries" msgid "Series in Chart:" -msgstr "SQL 查询" +msgstr "图表中的数据:" #: server_status.php:1539 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "显示统计" +msgstr "日志统计" #: server_status.php:1540 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "选择页" +msgstr "选择时间范围:" #: server_status.php:1545 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "仅统计 SELECT、INSERT、UPDATE 和 DELETE 语句" #: server_status.php:1550 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "去除 INSERT 语句中的变量值以获得更好的分组" #: server_status.php:1553 msgid "" "<p>Choose from which log you want the statistics to be generated from.</p> " "Results are grouped by query text." -msgstr "" +msgstr "<p>请选择生成统计的来源日志。</p>结果将根据查询语句分组。" #: server_status.php:1556 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "查询方式" +msgstr "查询分析器" #: server_status.php:1593 -#, fuzzy, php-format +#, php-format #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "秒" +msgstr[0] "%d 秒" #: server_status.php:1595 -#, fuzzy, php-format +#, php-format #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "分" +msgstr[0] "%d 分" #: server_synchronize.php:92 msgid "Could not connect to the source" @@ -10050,9 +10030,8 @@ msgid "Target database has been synchronized with source database" msgstr "已根据源数据库同步目标数据库" #: server_synchronize.php:951 -#, fuzzy msgid "Executed queries" -msgstr "SQL 查询" +msgstr "已执行的查询" #: server_synchronize.php:1076 msgid "Enter manually" @@ -10079,7 +10058,7 @@ msgstr "目标数据库将完全根据源数据库同步。源数据库将保持 #: server_variables.php:58 msgid "Setting variable failed" -msgstr "" +msgstr "设置变量失败" #: server_variables.php:77 msgid "Server variables and settings" @@ -10494,10 +10473,9 @@ msgid "Line" msgstr "折线图" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "内联" +msgstr "曲线图" #: tbl_chart.php:89 msgid "Pie" @@ -10508,50 +10486,43 @@ msgid "Stacked" msgstr "堆叠" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "报告标题：" +msgstr "图表标题" #: tbl_chart.php:100 msgid "X-Axis:" -msgstr "" +msgstr "横坐标:" #: tbl_chart.php:114 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL 查询" +msgstr "数据:" #: tbl_chart.php:116 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "文本框列" +msgstr "其余字段" #: tbl_chart.php:129 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "水平轴标签" +msgstr "横坐标名称:" #: tbl_chart.php:130 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "值" +msgstr "横值" #: tbl_chart.php:131 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "竖直轴标签" +msgstr "纵坐标名称:" #: tbl_chart.php:131 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "值" +msgstr "纵值" #: tbl_create.php:30 #, php-format @@ -10568,10 +10539,9 @@ msgid "View dump (schema) of table" msgstr "查看数据表的转存(大纲)。" #: tbl_gis_visualization.php:111 -#, fuzzy #| msgid "Display servers selection" msgid "Display GIS Visualization" -msgstr "显示服务器选择" +msgstr "显示可视化 GIS" #: tbl_gis_visualization.php:157 msgid "Width" @@ -10582,42 +10552,37 @@ msgid "Height" msgstr "高" #: tbl_gis_visualization.php:165 -#, fuzzy #| msgid "Textarea columns" msgid "Label column" -msgstr "文本框列" +msgstr "名称字段" #: tbl_gis_visualization.php:167 -#, fuzzy #| msgid "- none -" msgid "-- None --" -msgstr "- 无 -" +msgstr "-- 无 --" #: tbl_gis_visualization.php:180 -#, fuzzy #| msgid "Log file count" msgid "Spatial column" -msgstr "日志文件总数" +msgstr "空间字段" #: tbl_gis_visualization.php:201 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "以 OpenStreetMaps 为背景" #: tbl_gis_visualization.php:204 msgid "Redraw" msgstr "重绘" #: tbl_gis_visualization.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save to file" -msgstr "另存为文件" +msgstr "保存文件" #: tbl_gis_visualization.php:207 -#, fuzzy #| msgid "Table name" msgid "File name" -msgstr "数据表名" +msgstr "文件名" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" @@ -10854,7 +10819,7 @@ msgstr "显示顺序：" #: tbl_structure.php:156 tbl_structure.php:161 tbl_structure.php:578 msgid "Spatial" -msgstr "" +msgstr "空间" #: tbl_structure.php:163 tbl_structure.php:167 msgid "Browse distinct values" @@ -10873,10 +10838,9 @@ msgid "Add unique index" msgstr "添加唯一键" #: tbl_structure.php:174 tbl_structure.php:175 -#, fuzzy #| msgid "Add index" msgid "Add SPATIAL index" -msgstr "添加索引" +msgstr "添加空间索引" #: tbl_structure.php:176 tbl_structure.php:177 msgid "Add FULLTEXT index" @@ -10909,10 +10873,9 @@ msgid "Show more actions" msgstr "显示更多操作" #: tbl_structure.php:603 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "打印预览" +msgstr "编辑视图" #: tbl_structure.php:620 msgid "Relation view" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13834-g0e53f3b
by Michal Čihař 10 Aug '11

10 Aug '11

The branch, master has been updated via 0e53f3bf835cbab761adccb2c15324e3481e005b (commit) from ea8b7f0176564d79858893c7d4d015c46c47634d (commit) - Log ----------------------------------------------------------------- commit 0e53f3bf835cbab761adccb2c15324e3481e005b Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Aug 10 08:21:43 2011 +0200 Fix codemirror syntax highlighting ----------------------------------------------------------------------- Summary of changes: js/codemirror/mode/mysql/mysql.js | 25 ++-- themes/original/css/theme_right.css.php | 251 +++++++++++++++---------------- themes/pmahomme/css/theme_right.css.php | 23 ++-- 3 files changed, 148 insertions(+), 151 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index fd53d6c..657942d 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -24,11 +24,11 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { return chain(stream, state, tokenString(ch)); // is it one of the special signs []{}().,;? Seperator? else if (/[\[\]{},;\.]/.test(ch)) - return ret(ch); + return ret(ch, "separator"); // start of a number value? else if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/) - return ret("number", "mysql-number"); + stream.eatWhile(/[\w\.]/); + return ret("number", "number"); } // multi line comment or simple operator? else if (ch == "/") { @@ -37,41 +37,41 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { } else { stream.eatWhile(isOperatorChar); - return ret("operator", "mysql-operator"); + return ret("operator", "operator"); } } // single line comment or simple operator? else if (ch == "-") { if (stream.eat("-")) { stream.skipToEnd(); - return ret("comment", "mysql-comment"); + return ret("comment", "comment"); } else { stream.eatWhile(isOperatorChar); - return ret("operator", "mysql-operator"); + return ret("operator", "operator"); } } // pl/sql variable? else if (ch == "@" || ch == "$") { stream.eatWhile(/[\w\d\$_]/); - return ret("word", "mysql-var"); + return ret("word", "variable"); } // is it a operator? else if (isOperatorChar.test(ch)) { stream.eatWhile(isOperatorChar); - return ret("operator", "mysql-operator"); + return ret("operator", "operator"); } else { // get the whole word stream.eatWhile(/[\w\$_]/); // is it one of the listed keywords? - if (keywords && keywords.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "mysql-keyword"); + if (keywords && keywords.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "keyword"); // is it one of the listed functions? - if (functions && functions.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "mysql-function"); + if (functions && functions.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "builtin"); // is it one of the listed types? - if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "mysql-type"); + if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-2"); // is it one of the listed attributes? - if (attributes && attributes.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "mysql-attribute"); + if (attributes && attributes.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-3"); // default: just a "word" return ret("word", "mysql-word"); } @@ -108,7 +108,6 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { startState: function(basecolumn) { return { tokenize: tokenBase, - indented: 0, startOfLine: true }; }, diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 710ec0d..862f85f 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -158,131 +158,131 @@ button { background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left; } -.ic_b_bookmark { background-position: 0 0; } -.ic_b_browse { background-position: 0 -18px; } -.ic_b_calendar { background-position: 0 -36px; } -.ic_b_chart { background-position: 0 -54px; } -.ic_b_close { background-position: 0 -72px; } -.ic_b_comment { background-position: 0 -90px; } -.ic_b_dbstatistics { background-position: 0 -108px; } -.ic_b_deltbl { background-position: 0 -126px; } -.ic_b_docs { background-position: 0 -144px; } -.ic_b_drop { background-position: 0 -162px; } -.ic_b_edit { background-position: 0 -180px; } -.ic_b_empty { background-position: 0 -198px; } -.ic_b_engine { background-position: 0 -216px; } -.ic_b_event_add { background-position: 0 -234px; } -.ic_b_events { background-position: 0 -252px; } -.ic_b_export { background-position: 0 -270px; } -.ic_b_ftext { background-position: 0 -288px; } -.ic_b_globe { background-position: 0 -306px; } -.ic_b_help { background-position: 0 -324px; width: 11px; height: 11px; } -.ic_b_home { background-position: 0 -337px; } -.ic_b_import { background-position: 0 -355px; } -.ic_b_index { background-position: 0 -373px; } -.ic_b_info { background-position: 0 -391px; width: 11px; height: 11px; } -.ic_b_inline_edit { background-position: 0 -404px; } -.ic_b_insrow { background-position: 0 -422px; } -.ic_b_minus { background-position: 0 -440px; width: 9px; height: 9px; } -.ic_b_more { background-position: 0 -451px; } -.ic_b_newdb { background-position: 0 -469px; } -.ic_b_newtbl { background-position: 0 -487px; } -.ic_b_nextpage, .ic_play { background-position: 0 -505px; } -.ic_b_plus { background-position: 0 -523px; width: 9px; height: 9px; } -.ic_b_primary { background-position: 0 -534px; } -.ic_b_print { background-position: 0 -552px; } -.ic_b_props { background-position: 0 -570px; } -.ic_b_relations { background-position: 0 -588px; } -.ic_b_routine_add { background-position: 0 -606px; } -.ic_b_routines { background-position: 0 -624px; } -.ic_b_save { background-position: 0 -642px; } -.ic_b_sbrowse { background-position: 0 -660px; width: 10px; height: 10px; } -.ic_b_search { background-position: 0 -672px; } -.ic_b_selboard { background-position: 0 -690px; } -.ic_b_select { background-position: 0 -708px; } -.ic_b_snewtbl { background-position: 0 -726px; width: 10px; height: 10px; } -.ic_b_spatial { background-position: 0 -738px; } -.ic_b_sql { background-position: 0 -756px; } -.ic_b_sqlhelp { background-position: 0 -774px; } -.ic_b_tblanalyse { background-position: 0 -792px; } -.ic_b_tblexport { background-position: 0 -810px; } -.ic_b_tblimport { background-position: 0 -828px; } -.ic_b_tblops { background-position: 0 -846px; } -.ic_b_tbloptimize { background-position: 0 -864px; } -.ic_b_tipp { background-position: 0 -882px; } -.ic_b_trigger_add { background-position: 0 -900px; } -.ic_b_triggers { background-position: 0 -918px; } -.ic_b_unique { background-position: 0 -936px; } -.ic_b_usradd { background-position: 0 -954px; } -.ic_b_usrcheck { background-position: 0 -972px; } -.ic_b_usrdrop { background-position: 0 -990px; } -.ic_b_usredit { background-position: 0 -1008px; } -.ic_b_usrlist { background-position: 0 -1026px; } -.ic_b_view { background-position: 0 -1044px; } -.ic_b_views { background-position: 0 -1062px; } -.ic_bd_browse { background-position: 0 -1080px; } -.ic_bd_deltbl { background-position: 0 -1098px; } -.ic_bd_drop { background-position: 0 -1116px; } -.ic_bd_edit { background-position: 0 -1134px; } -.ic_bd_empty { background-position: 0 -1152px; } -.ic_bd_export { background-position: 0 -1170px; } -.ic_bd_ftext { background-position: 0 -1188px; } -.ic_bd_index { background-position: 0 -1206px; } -.ic_bd_insrow { background-position: 0 -1224px; } -.ic_bd_nextpage { background-position: 0 -1242px; width: 8px; height: 13px; } -.ic_bd_primary { background-position: 0 -1257px; } -.ic_bd_sbrowse { background-position: 0 -1275px; width: 10px; height: 10px; } -.ic_bd_select { background-position: 0 -1287px; } -.ic_bd_spatial { background-position: 0 -1305px; } -.ic_bd_unique { background-position: 0 -1323px; } -.ic_col_drop { background-position: 0 -1341px; } -.ic_eye { background-position: 0 -1359px; } -.ic_eye_grey { background-position: 0 -1377px; } -.ic_item_ltr { background-position: 0 -1395px; width: 5px; height: 9px; } -.ic_item_rtl { background-position: 0 -1406px; width: 5px; height: 9px; } -.ic_more { background-position: 0 -1417px; width: 13px; height: 8px; } -.ic_pause { background-position: 0 -1427px; } -.ic_s_asc { background-position: 0 -1445px; width: 11px; height: 9px; } -.ic_s_asci { background-position: 0 -1456px; } -.ic_s_cancel { background-position: 0 -1474px; } -.ic_s_cog { background-position: 0 -1492px; } -.ic_s_db { background-position: 0 -1510px; } -.ic_s_desc { background-position: 0 -1528px; width: 11px; height: 9px; } -.ic_s_error { background-position: 0 -1539px; } -.ic_s_error2 { background-position: 0 -1557px; width: 11px; height: 11px; } -.ic_s_host { background-position: 0 -1570px; } -.ic_s_lang { background-position: 0 -1588px; } -.ic_s_loggoff { background-position: 0 -1606px; } -.ic_s_notice { background-position: 0 -1624px; } -.ic_s_passwd { background-position: 0 -1642px; } -.ic_s_really { background-position: 0 -1660px; width: 11px; height: 11px; } -.ic_s_reload { background-position: 0 -1673px; } -.ic_s_replication { background-position: 0 -1691px; } -.ic_s_rights { background-position: 0 -1709px; } -.ic_s_sortable { background-position: 0 -1727px; } -.ic_s_status { background-position: 0 -1745px; } -.ic_s_success { background-position: 0 -1763px; } -.ic_s_sync { background-position: 0 -1781px; } -.ic_s_tbl { background-position: 0 -1799px; } -.ic_s_theme { background-position: 0 -1817px; } -.ic_s_vars { background-position: 0 -1835px; } -.ic_s_views { background-position: 0 -1853px; width: 10px; height: 10px; } -.ic_window-new { background-position: 0 -1865px; } +.ic_b_bookmark { background-position: 0 0; } +.ic_b_browse { background-position: 0 -18px; } +.ic_b_calendar { background-position: 0 -36px; } +.ic_b_chart { background-position: 0 -54px; } +.ic_b_close { background-position: 0 -72px; } +.ic_b_comment { background-position: 0 -90px; } +.ic_b_dbstatistics { background-position: 0 -108px; } +.ic_b_deltbl { background-position: 0 -126px; } +.ic_b_docs { background-position: 0 -144px; } +.ic_b_drop { background-position: 0 -162px; } +.ic_b_edit { background-position: 0 -180px; } +.ic_b_empty { background-position: 0 -198px; } +.ic_b_engine { background-position: 0 -216px; } +.ic_b_event_add { background-position: 0 -234px; } +.ic_b_events { background-position: 0 -252px; } +.ic_b_export { background-position: 0 -270px; } +.ic_b_ftext { background-position: 0 -288px; } +.ic_b_globe { background-position: 0 -306px; } +.ic_b_help { background-position: 0 -324px; width: 11px; height: 11px; } +.ic_b_home { background-position: 0 -337px; } +.ic_b_import { background-position: 0 -355px; } +.ic_b_index { background-position: 0 -373px; } +.ic_b_info { background-position: 0 -391px; width: 11px; height: 11px; } +.ic_b_inline_edit { background-position: 0 -404px; } +.ic_b_insrow { background-position: 0 -422px; } +.ic_b_minus { background-position: 0 -440px; width: 9px; height: 9px; } +.ic_b_more { background-position: 0 -451px; } +.ic_b_newdb { background-position: 0 -469px; } +.ic_b_newtbl { background-position: 0 -487px; } +.ic_b_nextpage, .ic_play { background-position: 0 -505px; } +.ic_b_plus { background-position: 0 -523px; width: 9px; height: 9px; } +.ic_b_primary { background-position: 0 -534px; } +.ic_b_print { background-position: 0 -552px; } +.ic_b_props { background-position: 0 -570px; } +.ic_b_relations { background-position: 0 -588px; } +.ic_b_routine_add { background-position: 0 -606px; } +.ic_b_routines { background-position: 0 -624px; } +.ic_b_save { background-position: 0 -642px; } +.ic_b_sbrowse { background-position: 0 -660px; width: 10px; height: 10px; } +.ic_b_search { background-position: 0 -672px; } +.ic_b_selboard { background-position: 0 -690px; } +.ic_b_select { background-position: 0 -708px; } +.ic_b_snewtbl { background-position: 0 -726px; width: 10px; height: 10px; } +.ic_b_spatial { background-position: 0 -738px; } +.ic_b_sql { background-position: 0 -756px; } +.ic_b_sqlhelp { background-position: 0 -774px; } +.ic_b_tblanalyse { background-position: 0 -792px; } +.ic_b_tblexport { background-position: 0 -810px; } +.ic_b_tblimport { background-position: 0 -828px; } +.ic_b_tblops { background-position: 0 -846px; } +.ic_b_tbloptimize { background-position: 0 -864px; } +.ic_b_tipp { background-position: 0 -882px; } +.ic_b_trigger_add { background-position: 0 -900px; } +.ic_b_triggers { background-position: 0 -918px; } +.ic_b_unique { background-position: 0 -936px; } +.ic_b_usradd { background-position: 0 -954px; } +.ic_b_usrcheck { background-position: 0 -972px; } +.ic_b_usrdrop { background-position: 0 -990px; } +.ic_b_usredit { background-position: 0 -1008px; } +.ic_b_usrlist { background-position: 0 -1026px; } +.ic_b_view { background-position: 0 -1044px; } +.ic_b_views { background-position: 0 -1062px; } +.ic_bd_browse { background-position: 0 -1080px; } +.ic_bd_deltbl { background-position: 0 -1098px; } +.ic_bd_drop { background-position: 0 -1116px; } +.ic_bd_edit { background-position: 0 -1134px; } +.ic_bd_empty { background-position: 0 -1152px; } +.ic_bd_export { background-position: 0 -1170px; } +.ic_bd_ftext { background-position: 0 -1188px; } +.ic_bd_index { background-position: 0 -1206px; } +.ic_bd_insrow { background-position: 0 -1224px; } +.ic_bd_nextpage { background-position: 0 -1242px; width: 8px; height: 13px; } +.ic_bd_primary { background-position: 0 -1257px; } +.ic_bd_sbrowse { background-position: 0 -1275px; width: 10px; height: 10px; } +.ic_bd_select { background-position: 0 -1287px; } +.ic_bd_spatial { background-position: 0 -1305px; } +.ic_bd_unique { background-position: 0 -1323px; } +.ic_col_drop { background-position: 0 -1341px; } +.ic_eye { background-position: 0 -1359px; } +.ic_eye_grey { background-position: 0 -1377px; } +.ic_item_ltr { background-position: 0 -1395px; width: 5px; height: 9px; } +.ic_item_rtl { background-position: 0 -1406px; width: 5px; height: 9px; } +.ic_more { background-position: 0 -1417px; width: 13px; height: 8px; } +.ic_pause { background-position: 0 -1427px; } +.ic_s_asc { background-position: 0 -1445px; width: 11px; height: 9px; } +.ic_s_asci { background-position: 0 -1456px; } +.ic_s_cancel { background-position: 0 -1474px; } +.ic_s_cog { background-position: 0 -1492px; } +.ic_s_db { background-position: 0 -1510px; } +.ic_s_desc { background-position: 0 -1528px; width: 11px; height: 9px; } +.ic_s_error { background-position: 0 -1539px; } +.ic_s_error2 { background-position: 0 -1557px; width: 11px; height: 11px; } +.ic_s_host { background-position: 0 -1570px; } +.ic_s_lang { background-position: 0 -1588px; } +.ic_s_loggoff { background-position: 0 -1606px; } +.ic_s_notice { background-position: 0 -1624px; } +.ic_s_passwd { background-position: 0 -1642px; } +.ic_s_really { background-position: 0 -1660px; width: 11px; height: 11px; } +.ic_s_reload { background-position: 0 -1673px; } +.ic_s_replication { background-position: 0 -1691px; } +.ic_s_rights { background-position: 0 -1709px; } +.ic_s_sortable { background-position: 0 -1727px; } +.ic_s_status { background-position: 0 -1745px; } +.ic_s_success { background-position: 0 -1763px; } +.ic_s_sync { background-position: 0 -1781px; } +.ic_s_tbl { background-position: 0 -1799px; } +.ic_s_theme { background-position: 0 -1817px; } +.ic_s_vars { background-position: 0 -1835px; } +.ic_s_views { background-position: 0 -1853px; width: 10px; height: 10px; } +.ic_window-new { background-position: 0 -1865px; } /* Same as s_notice */ -.ic_s_attention { background-position: 0 -1624px; } +.ic_s_attention { background-position: 0 -1624px; } /* Same as ic_b_help, but applied to place where width=11, height=11 attributes were used */ -.ic_b_help_s { background-position: -324px 0; width: 11px; height: 11px; } +.ic_b_help_s { background-position: -324px 0; width: 11px; height: 11px; } /* Same as ic_s_sortable */ img.sortableIcon { background-position: -1727px 0; } /* Same as s_asc */ -th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } +th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } /* Same as s_desc */ -th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } +th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } /******************************************************************************/ /* classes */ @@ -2260,38 +2260,37 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} - -span.mysql-keyword { +span.cm-keyword { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; } -span.mysql-var { +span.cm-variable { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier']; ?>; } -span.mysql-comment { +span.cm-comment { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['comment']; ?>; } -span.mysql-string { +span.cm-mysql-string { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['quote']; ?>; } -span.mysql-operator { +span.cm-operator { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; } -span.mysql-word { +span.cm-mysql-word { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha']; ?>; } -span.mysql-function { +span.cm-builtin { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName']; ?>; } -span.mysql-type { +span.cm-variable-2 { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType']; ?>; } -span.mysql-attribute { +span.cm-variable-3 { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib']; ?>; } -span.mysql-separator { +span.cm-separator { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; } -span.mysql-number { +span.cm-number { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer']; ?>; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index f7089af..fc114ce 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2677,38 +2677,37 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} - -span.mysql-keyword { +span.cm-keyword { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; } -span.mysql-var { +span.cm-variable { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_identifier']; ?>; } -span.mysql-comment { +span.cm-comment { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['comment']; ?>; } -span.mysql-string { +span.cm-mysql-string { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['quote']; ?>; } -span.mysql-operator { +span.cm-operator { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; } -span.mysql-word { +span.cm-mysql-word { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha']; ?>; } -span.mysql-function { +span.cm-builtin { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_functionName']; ?>; } -span.mysql-type { +span.cm-variable-2 { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnType']; ?>; } -span.mysql-attribute { +span.cm-variable-3 { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_columnAttrib']; ?>; } -span.mysql-separator { +span.cm-separator { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['punct']; ?>; } -span.mysql-number { +span.cm-number { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['digit_integer']; ?>; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13833-gea8b7f0
by Rouslan Placella 09 Aug '11

09 Aug '11

The branch, master has been updated via ea8b7f0176564d79858893c7d4d015c46c47634d (commit) via 2ebf0702f1ff2829f4b07430f27b83d473788244 (commit) via 64ae406cfdb55e100874c26136fd4ac14fbff029 (commit) from dd18e6c8aa20f17b24d35e7a3d0705009c4a29f6 (commit) - Log ----------------------------------------------------------------- commit ea8b7f0176564d79858893c7d4d015c46c47634d Merge: 2ebf070 dd18e6c Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 22:41:26 2011 +0100 Merge remote-tracking branch 'origin/master' commit 2ebf0702f1ff2829f4b07430f27b83d473788244 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 22:40:57 2011 +0100 Fixed trigger editor unit test commit 64ae406cfdb55e100874c26136fd4ac14fbff029 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 22:40:40 2011 +0100 Do not fetch views instead of filtering them out, when generating the trigger editor ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_triggers.lib.php | 18 ++++++++++-------- test/libraries/rte/PMA_TRI_getEditorForm_test.php | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 64b8b85..b4e5d40 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -286,6 +286,10 @@ function PMA_TRI_getEditorForm($mode, $item) $original_data = "<input name='item_original_name' " . "type='hidden' value='{$item['item_original_name']}'/>\n"; } + $query = "SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES` "; + $query .= "WHERE `TABLE_SCHEMA`='" . PMA_sqlAddSlashes($db) . "' "; + $query .= "AND `TABLE_TYPE`='BASE TABLE'"; + $tables = PMA_DBI_fetch_result($query); // Create the output $retval = ""; @@ -306,16 +310,14 @@ function PMA_TRI_getEditorForm($mode, $item) $retval .= " <td>" . __('Table') . "</td>\n"; $retval .= " <td>\n"; $retval .= " <select name='item_table'>\n"; - foreach (PMA_DBI_get_tables($db) as $key => $value) { + foreach ($tables as $key => $value) { $selected = ""; - if (! PMA_Table::isView($db, $value)) { - if ($mode == 'add' && $value == $table) { - $selected = " selected='selected'"; - } else if ($mode == 'edit' && $value == $item['item_table']) { - $selected = " selected='selected'"; - } - $retval .= " <option$selected>$value</option>\n"; + if ($mode == 'add' && $value == $table) { + $selected = " selected='selected'"; + } else if ($mode == 'edit' && $value == $item['item_table']) { + $selected = " selected='selected'"; } + $retval .= " <option$selected>$value</option>\n"; } $retval .= " </select>\n"; $retval .= " </td>\n"; diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php index 53dc510..411a535 100644 --- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php +++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php @@ -17,8 +17,8 @@ class PMA_TRI_getEditorForm_test extends PHPUnit_Framework_TestCase { public function setUp() { - if (! function_exists('PMA_DBI_get_tables')) { - function PMA_DBI_get_tables($db) + if (! function_exists('PMA_DBI_fetch_result')) { + function PMA_DBI_fetch_result($query) { return array('table1', 'table`2'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13830-gdd18e6c
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via dd18e6c8aa20f17b24d35e7a3d0705009c4a29f6 (commit) via 7b34c08991ad7cd4a315b68655b0ceb06ee67218 (commit) via ec43984591535b87c8b69ea0c0ecc39c5f495488 (commit) via e0552da2de05d3d4e6c35b03772b0a28895df63e (commit) via 5460101e1c47d858dc6862016db082edd4c55fee (commit) via d88ce5188fbc1c5470eabc9d5a56a2a1fc0b8180 (commit) via 51ee48bc6ea07eddc3fd3fcabeb46cfb3378786a (commit) via 8b3ef38ffa5e2dfa1636df8a63ab8f7b5b39e0c9 (commit) via a461b485affdcf42917e3d460b7502b2eaa06e21 (commit) via 12b793228f8f392f1b091ac958a9a4a4268e0470 (commit) via 7f03e3f484bde45acb82582a9bb869ebadba95b6 (commit) via a62df759be806fb9efaed886189504e8e0f76d43 (commit) via b05abd497ca220370907a55212426e3ceb235d51 (commit) via f69c6b85ffa0676ae1448602395b9ad9a719bd54 (commit) via 1109bce075ee0cdf974ea0eaf530ff3f8ddfbf5d (commit) via 5b3a69dda4404e700f672505375cb5035321cbb9 (commit) via fe6265dd9fcb08a54f9eedc37d833561ac50d7d9 (commit) via 635a1e8ec07762e3b3ab0fc727061eab905dce38 (commit) via 97324aa80c123538579a483d78d24d4f3835e277 (commit) via f68ee266ab3d16f77a8603f931266d328651cd5d (commit) via fb987669254e0e55bab93eb857b7d430ecd8c14c (commit) via 6781815cd535e5ccbaed0b774d8e8529c1e66bf6 (commit) via fd62e17a5c94e65385f71e7f6f61a30b0436f15b (commit) via 6e81ba78a94afe6a57ca2394971cfbaaee025e44 (commit) via 620f85ae55137051d4174ffa6e7d76efecff048c (commit) via bc949260cd936252f4d1a8f771a88c4f77f3fbd7 (commit) via 23a86261a898660a576415faf052b22ca851b374 (commit) via 2057d4432f48347e0195a4a94baf04df35a313b1 (commit) via f0ffa93ec4e0fe2ed819730881a9442b71864841 (commit) via 0314cada97cf9b24ed22f6b39f54039df2d10da6 (commit) via 3b774d8a5bff7c6c741c649e39b064cd68a29557 (commit) via 4bf0d8d1acef8505a78f58b93602265eec85a59f (commit) via 5a509ce727645b213e31c10d03211fa74c91a37a (commit) via f971bbc6bc38f70bd91767c3e439b5cf357569e3 (commit) via ed08357c25428e1ea95027c2a2aefbf51e653c37 (commit) via 61de53800524a6586e2c1e2e9414037e5337ee92 (commit) via d9a5ecc33137c7571ea3de03ca829e47127277a8 (commit) from 3339c7e9e3303467420616b2908424d66e772dc0 (commit) - Log ----------------------------------------------------------------- commit dd18e6c8aa20f17b24d35e7a3d0705009c4a29f6 Merge: 7b34c08 ec43984 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 22:13:27 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 7b34c08991ad7cd4a315b68655b0ceb06ee67218 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 22:13:20 2011 +0200 Cleanup commit ec43984591535b87c8b69ea0c0ecc39c5f495488 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:26:42 2011 +0200 Translation update done using Pootle. commit e0552da2de05d3d4e6c35b03772b0a28895df63e Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:26:25 2011 +0200 Translation update done using Pootle. commit 5460101e1c47d858dc6862016db082edd4c55fee Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:25:40 2011 +0200 Translation update done using Pootle. commit d88ce5188fbc1c5470eabc9d5a56a2a1fc0b8180 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:25:23 2011 +0200 Translation update done using Pootle. commit 51ee48bc6ea07eddc3fd3fcabeb46cfb3378786a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:24:52 2011 +0200 Translation update done using Pootle. commit 8b3ef38ffa5e2dfa1636df8a63ab8f7b5b39e0c9 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:24:42 2011 +0200 Translation update done using Pootle. commit a461b485affdcf42917e3d460b7502b2eaa06e21 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:24:01 2011 +0200 Translation update done using Pootle. commit 12b793228f8f392f1b091ac958a9a4a4268e0470 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:23:44 2011 +0200 Translation update done using Pootle. commit 7f03e3f484bde45acb82582a9bb869ebadba95b6 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:23:30 2011 +0200 Translation update done using Pootle. commit a62df759be806fb9efaed886189504e8e0f76d43 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:23:24 2011 +0200 Translation update done using Pootle. commit b05abd497ca220370907a55212426e3ceb235d51 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:22:49 2011 +0200 Translation update done using Pootle. commit f69c6b85ffa0676ae1448602395b9ad9a719bd54 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:22:27 2011 +0200 Translation update done using Pootle. commit 1109bce075ee0cdf974ea0eaf530ff3f8ddfbf5d Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:22:05 2011 +0200 Translation update done using Pootle. commit 5b3a69dda4404e700f672505375cb5035321cbb9 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:21:51 2011 +0200 Translation update done using Pootle. commit fe6265dd9fcb08a54f9eedc37d833561ac50d7d9 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:21:43 2011 +0200 Translation update done using Pootle. commit 635a1e8ec07762e3b3ab0fc727061eab905dce38 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:12:08 2011 +0200 Translation update done using Pootle. commit 97324aa80c123538579a483d78d24d4f3835e277 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:58 2011 +0200 Translation update done using Pootle. commit f68ee266ab3d16f77a8603f931266d328651cd5d Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:48 2011 +0200 Translation update done using Pootle. commit fb987669254e0e55bab93eb857b7d430ecd8c14c Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:43 2011 +0200 Translation update done using Pootle. commit 6781815cd535e5ccbaed0b774d8e8529c1e66bf6 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:33 2011 +0200 Translation update done using Pootle. commit fd62e17a5c94e65385f71e7f6f61a30b0436f15b Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:26 2011 +0200 Translation update done using Pootle. commit 6e81ba78a94afe6a57ca2394971cfbaaee025e44 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:18 2011 +0200 Translation update done using Pootle. commit 620f85ae55137051d4174ffa6e7d76efecff048c Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:11:04 2011 +0200 Translation update done using Pootle. commit bc949260cd936252f4d1a8f771a88c4f77f3fbd7 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:10:53 2011 +0200 Translation update done using Pootle. commit 23a86261a898660a576415faf052b22ca851b374 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:10:46 2011 +0200 Translation update done using Pootle. commit 2057d4432f48347e0195a4a94baf04df35a313b1 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:10:40 2011 +0200 Translation update done using Pootle. commit f0ffa93ec4e0fe2ed819730881a9442b71864841 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:09:56 2011 +0200 Translation update done using Pootle. commit 0314cada97cf9b24ed22f6b39f54039df2d10da6 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:09:43 2011 +0200 Translation update done using Pootle. commit 3b774d8a5bff7c6c741c649e39b064cd68a29557 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:09:26 2011 +0200 Translation update done using Pootle. commit 4bf0d8d1acef8505a78f58b93602265eec85a59f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:09:09 2011 +0200 Translation update done using Pootle. commit 5a509ce727645b213e31c10d03211fa74c91a37a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:09:01 2011 +0200 Translation update done using Pootle. commit f971bbc6bc38f70bd91767c3e439b5cf357569e3 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:08:35 2011 +0200 Translation update done using Pootle. commit ed08357c25428e1ea95027c2a2aefbf51e653c37 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:08:24 2011 +0200 Translation update done using Pootle. commit 61de53800524a6586e2c1e2e9414037e5337ee92 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:08:00 2011 +0200 Translation update done using Pootle. commit d9a5ecc33137c7571ea3de03ca829e47127277a8 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Tue Aug 9 19:07:30 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ar.po | 2 - po/be.po | 1 - po/be(a)latin.po | 3 -- po/br.po | 77 +++++++++++++++++++++++++------------------------------ po/ca.po | 3 -- po/cy.po | 3 -- po/et.po | 1 - po/fi.po | 3 -- po/gl.po | 3 -- po/hi.po | 3 -- po/hr.po | 1 - po/hu.po | 1 - po/id.po | 3 -- po/ka.po | 1 - po/lt.po | 2 - po/mn.po | 3 -- po/nb.po | 3 -- po/nl.po | 3 -- po/pl.po | 1 - po/pt_BR.po | 2 - po/ro.po | 1 - po/ru.po | 2 - po/si.po | 2 - po/sr.po | 1 - po/sr(a)latin.po | 1 - po/ta.po | 1 - po/te.po | 3 -- po/ug.po | 3 -- po/uk.po | 3 -- po/ur.po | 3 -- po/uz.po | 3 -- po/uz(a)latin.po | 3 -- po/zh_CN.po | 3 -- po/zh_TW.po | 3 -- 34 files changed, 35 insertions(+), 116 deletions(-) diff --git a/po/ar.po b/po/ar.po index 969d4e4..0067bef 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11121,7 +11121,6 @@ msgid "Rename view to" msgstr "أعد تسمية العرض الـ" #, fuzzy -#~| msgid "Create" #~ msgid "Create event" #~ msgstr "تكوين" @@ -11129,7 +11128,6 @@ msgstr "أعد تسمية العرض الـ" #~ msgstr "إنشاء إجراء" #, fuzzy -#~| msgid "Create" #~ msgid "Create trigger" #~ msgstr "تكوين" diff --git a/po/be.po b/po/be.po index 560f3ed..632edaa 100644 --- a/po/be.po +++ b/po/be.po @@ -11779,7 +11779,6 @@ msgstr "Перайменаваць табліцу ў" #~ msgstr "Стварыць сувязь" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Стварыць сувязь" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 6856539..aab77ce 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -11741,17 +11741,14 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Create" #~ msgid "Create event" #~ msgstr "Stvaryć" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Stvaryć suviaź" #, fuzzy -#~| msgid "Create" #~ msgid "Create trigger" #~ msgstr "Stvaryć" diff --git a/po/br.po b/po/br.po index 5ac7806..72eeb75 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-09 16:45+0100\n" -"PO-Revision-Date: 2011-07-17 21:41+0200\n" +"PO-Revision-Date: 2011-08-09 19:26+0200\n" "Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -1118,15 +1118,14 @@ msgstr "Kevreadennoù/Argerzhioù" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 -#, fuzzy #| msgid "Connections since last refresh" msgid "Questions since last refresh" -msgstr "Kevreadennoù abaoe ar freskadenn ziwezhañ" +msgstr "Goulennnoù abaoe ar freskadenn ziwezhañ" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Goulennoù (lavarennoù sevenet gant ar servijer)" #: js/messages.php:91 server_status.php:649 msgid "Query statistics" @@ -1134,15 +1133,15 @@ msgstr "Stadegoù war ar rekedoù" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Implij CPU ar reizhiad" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Memor reizhiad" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Takad eskemm reizhiad (swap)" #. l10n: shortcuts for Megabyte #: js/messages.php:97 libraries/common.lib.php:1303 server_status.php:1512 @@ -1156,132 +1155,128 @@ msgstr "Kio" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Karg keitat" #: js/messages.php:101 -#, fuzzy #| msgid "Total count" msgid "Total memory" -msgstr "Sammad hollek" +msgstr "Memor hollek" #: js/messages.php:102 msgid "Cached memory" -msgstr "" +msgstr "Memor krubuilh" #: js/messages.php:103 msgid "Buffered memory" -msgstr "" +msgstr "Memor skurzer" #: js/messages.php:104 msgid "Free memory" -msgstr "" +msgstr "Memor vak" #: js/messages.php:105 msgid "Used memory" -msgstr "" +msgstr "Memor implijet" #: js/messages.php:107 -#, fuzzy #| msgid "Total" msgid "Total Swap" -msgstr "Hollad" +msgstr "Takad eskemm klok" #: js/messages.php:108 msgid "Cached Swap" -msgstr "" +msgstr "Takad eskemm krubuilhet" #: js/messages.php:109 msgid "Used Swap" -msgstr "" +msgstr "Takad eskemm implijet" #: js/messages.php:110 msgid "Free Swap" -msgstr "" +msgstr "Takad eskemm vak" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "Oktedoù kaset" #: js/messages.php:113 msgid "Bytes received" -msgstr "" +msgstr "Oktedoù resevet" #: js/messages.php:114 server_status.php:994 msgid "Connections" -msgstr "" +msgstr "Kevreadennoù" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:118 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "Stummoù" +msgstr "Goulennoù" #: js/messages.php:119 server_status.php:949 msgid "Traffic" -msgstr "" +msgstr "Tremenerezh" #: js/messages.php:120 libraries/server_links.inc.php:73 #: server_status.php:1396 msgid "Settings" -msgstr "" +msgstr "Arventennoù" #: js/messages.php:121 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Dilemel an diaz roadennoù" +msgstr "Dilemel ar grafik" #: js/messages.php:122 msgid "Edit title and labels" -msgstr "" +msgstr "Kemmañ an titl hag an tikedennoù" #: js/messages.php:123 msgid "Add chart to grid" -msgstr "" +msgstr "Ouzhpennañ ur grafik d'ar gael" #: js/messages.php:125 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Ouzhpennit da nebeutañ unan eus an argemennoù d'an heuliad" #: js/messages.php:126 libraries/display_export.lib.php:308 #: libraries/display_tbl.lib.php:567 libraries/export/sql.php:1052 #: libraries/tbl_properties.inc.php:544 pmd_general.php:510 #: server_privileges.php:2042 server_status.php:1109 server_status.php:1529 msgid "None" -msgstr "" +msgstr "Hini" #: js/messages.php:127 msgid "Resume monitor" -msgstr "" +msgstr "Adkregiñ gant an evezhiañ" #: js/messages.php:128 msgid "Pause monitor" -msgstr "" +msgstr "Paouez gant an evezhiañ" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "Gweredekaet eo general_log ha slow_query_log." #: js/messages.php:131 msgid "general_log is enabled." -msgstr "" +msgstr "Gweredekaet eo general_log." #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "" +msgstr "Gweredekaet eo slow_query_log." #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "Diweredekaet eo general_log ha slow_query_log." #: js/messages.php:134 msgid "log_output is not set to TABLE." -msgstr "" +msgstr "N'eo ket bet lakaet log_output da TABLE." #: js/messages.php:135 msgid "log_output is set to TABLE." -msgstr "" +msgstr "Lakaet eo bet log_output da TABLE." #: js/messages.php:136 #, php-format @@ -10761,7 +10756,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Create Table" #~ msgid "Create event" #~ msgstr "Krouiñ un daolenn" @@ -10769,7 +10763,6 @@ msgstr "" #~ msgstr "Krouiñ un argerzh" #, fuzzy -#~| msgid "Create routine" #~ msgid "Create trigger" #~ msgstr "Krouiñ un argerzh" diff --git a/po/ca.po b/po/ca.po index 21150da..36595df 100644 --- a/po/ca.po +++ b/po/ca.po @@ -11636,17 +11636,14 @@ msgid "Rename view to" msgstr "Reanomena la vista a" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "Crea una vista" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Crea una relació" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "Crea una vista" diff --git a/po/cy.po b/po/cy.po index c212e53..9e697d1 100644 --- a/po/cy.po +++ b/po/cy.po @@ -11157,17 +11157,14 @@ msgid "Rename view to" msgstr "Ailenwch golwg i" #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "Crëwch fersiwn" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Crëwch berthynas" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "Crëwch fersiwn" diff --git a/po/et.po b/po/et.po index 4f01bf4..be6b6af 100644 --- a/po/et.po +++ b/po/et.po @@ -11633,7 +11633,6 @@ msgstr "Nimeta tabel ümber" #~ msgstr "Suhte loomine (relation)" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Suhte loomine (relation)" diff --git a/po/fi.po b/po/fi.po index c443cd6..36ee12a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11983,17 +11983,14 @@ msgid "Rename view to" msgstr "Nimeä taulu uudelleen" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "Luo näkymä" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Luo relaatio" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "Luo näkymä" diff --git a/po/gl.po b/po/gl.po index 67d6726..584769e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -12225,17 +12225,14 @@ msgid "Rename view to" msgstr "Mudar o nome da táboa para" #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "Crear unha versión" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Crear relación" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "Crear unha versión" diff --git a/po/hi.po b/po/hi.po index eedd49d..5b81977 100644 --- a/po/hi.po +++ b/po/hi.po @@ -11065,17 +11065,14 @@ msgid "Rename view to" msgstr "दृश्य का नाम बदलो" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "दृश्य बनाइये" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "संबंध बनायें" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "दृश्य बनाइये" diff --git a/po/hr.po b/po/hr.po index 77fa21b..06876b2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -11733,7 +11733,6 @@ msgstr "Preimenuj prikaz u" #~ msgstr "Izradi relaciju" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Izradi relaciju" diff --git a/po/hu.po b/po/hu.po index 697979a..0e9fce7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11809,7 +11809,6 @@ msgstr "Nézet átnevezése" #~ msgstr "Kapcsolat létrehozása" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Kapcsolat létrehozása" diff --git a/po/id.po b/po/id.po index 8b9d65b..d4cf71c 100644 --- a/po/id.po +++ b/po/id.po @@ -11379,17 +11379,14 @@ msgid "Rename view to" msgstr "Ubah nama tabel menjadi " #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "Membuat versi" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Buat relasi" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "Membuat versi" diff --git a/po/ka.po b/po/ka.po index 68ade38..3301dfc 100644 --- a/po/ka.po +++ b/po/ka.po @@ -12063,7 +12063,6 @@ msgstr "Rename table to" #~ msgstr "Create relation" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Create relation" diff --git a/po/lt.po b/po/lt.po index 9cd0efe..3ad2d56 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11082,12 +11082,10 @@ msgstr "VIEW pavadinimas" msgid "Rename view to" msgstr "Pervadinti rodinį į" -#~| msgid "Create User" #~ msgid "Create event" #~ msgstr "Sukurti įvykį" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Sukurti sąryšį" diff --git a/po/mn.po b/po/mn.po index 3effa6b..8dd90bc 100644 --- a/po/mn.po +++ b/po/mn.po @@ -11457,17 +11457,14 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Create" #~ msgid "Create event" #~ msgstr "Үүсгэх" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Холбоо үүсгэх" #, fuzzy -#~| msgid "Create" #~ msgid "Create"�о үүсгэх"view to"""er_status.php:1529m [172.29.30.126]�򉄱*ry��*�7�r�8�r�u��*��*��*��*8�r�� Ʌ�*�,�r��+�r�k��*6 ��!�!�7�r�8�r�xĦ��*�-�r��򉄱*��*�7�r�`򉄱*�7�r�� *u��*� ��*ش ��*�� *��*xĦ��*�-�r��,�r�k��*�!�!�7�r�8�r�H��*�.�r��򉄱*��*�7�r�`򉄱*�7�r��7�r��7�r�8��*�p�8�r�u��*��*�.�r��-�r�k��*GHIJKMNOP�7�r�8�r�HE]��*p0�r��򉄱*��*�7�r�0� ��*u��*Ц��*�y:��*� ��*ش ��*�� *��*HE]��*p0�r��.�r�k��*8E]��*p0�r��.�r�k��*(E]��*p0�r�/�r�k��*E]��*p0�r�@/�r�k��* �� *u��*�� *�)�r��:��*e��*ش ��*�/�r�y�:��*e��*� ��*0�r�Z�:��*e��*�t:��*Ц��*�y:��*� ��*�Ԧ��*ش ��*�� *��*8��*=��*8�r�p:��*�1�r��0�r�k��*5678:<=>?@BD�7�r�8�r��=��*8�r�u��*��*@0�r�=��*e��*��*�_@f�S Q��l��S҄�*8�r��=��*�2�r��1�r�k��*u]�� 4Q��U^Qʉ��u��*ēv�7�r�8�r�H�τ�*��*@9�r��m��*��m��*�& ��*�7�r�9�r��7�r� 4�r�ߦ��*u��*�Ԧ��*�:�r��m��*P9�r��4�r��m��*8�r�gid "Create trigger" #~ msgstr "Үүсгэх" diff --git a/po/nb.po b/po/nb.po index 6464451..aa3e4b4 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11721,17 +11721,14 @@ msgid "Rename view to" msgstr "Endre tabellens navn" #, fuzzy -#~| msgid "Create User" #~ msgid "Create event" #~ msgstr "Opprett bruker" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Opprett relasjon" #, fuzzy -#~| msgid "Create User" #~ msgid "Create trigger" #~ msgstr "Opprett bruker" diff --git a/po/nl.po b/po/nl.po index 43bbb24..6bc028e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -11632,17 +11632,14 @@ msgid "Rename view to" msgstr "Hernoem view naar" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "VIEW aanmaken" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Maak relatie" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "VIEW aanmaken" diff --git a/po/pl.po b/po/pl.po index 333b305..f2e5db5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -12011,7 +12011,6 @@ msgstr "Zmień nazwę perspektywy na" #~ msgstr "Utwórz związek" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Utwórz relację" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3f337fa..0f02019 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11503,7 +11503,6 @@ msgid "Rename view to" msgstr "Renomear a visão para " #, fuzzy -#~| msgid "Create User" #~ msgid "Create event" #~ msgstr "Criar usuário" @@ -11511,7 +11510,6 @@ msgstr "Renomear a visão para " #~ msgstr "Criar rotina" #, fuzzy -#~| msgid "Create User" #~ msgid "Create trigger" #~ msgstr "Criar usuário" diff --git a/po/ro.po b/po/ro.po index abc4690..2b43d81 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11745,7 +11745,6 @@ msgstr "Redenumire tabel la" #~ msgstr "Creare relație" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Creare relație" diff --git a/po/ru.po b/po/ru.po index 70e0866..51b8ae7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11558,7 +11558,6 @@ msgid "Rename view to" msgstr "Переименовать представление в" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "Создать представление" @@ -11566,7 +11565,6 @@ msgstr "Переименовать представление в" #~ msgstr "Создать процедуру" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "Создать представление" diff --git a/po/si.po b/po/si.po index 8edf59e..26477b8 100644 --- a/po/si.po +++ b/po/si.po @@ -11296,7 +11296,6 @@ msgid "Rename view to" msgstr "දසුනේ නම වෙනස් කරන්න" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "දසුනක් සාදන්න" @@ -11305,7 +11304,6 @@ msgstr "දසුනේ නම වෙනස් කරන්න" #~ msgstr "සර්වරයේ සංස්කරණය" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "දසුනක් සාදන්න" diff --git a/po/sr.po b/po/sr.po index 8dd1bbb..e23ba54 100644 --- a/po/sr.po +++ b/po/sr.po @@ -11654,7 +11654,6 @@ msgstr "Промени име табеле у " #~ msgstr "Направи релацију" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Направи релацију" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index ed4784a..76f159d 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -11642,7 +11642,6 @@ msgstr "Promeni ime tabele u " #~ msgstr "Napravi relaciju" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Napravi relaciju" diff --git a/po/ta.po b/po/ta.po index a816407..08420bd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10699,7 +10699,6 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Add a new User" #~ msgid "Create trigger" #~ msgstr "புதிய பயனாளரை சேர்க்க" diff --git a/po/te.po b/po/te.po index 280abe9..ac525e1 100644 --- a/po/te.po +++ b/po/te.po @@ -10906,19 +10906,16 @@ msgstr "" # మొదటి అనువాదము #, fuzzy -#~| msgid "Create" #~ msgid "Create event" #~ msgstr "సృష్టించు" # మొదటి అనువాదము #, fuzzy -#~| msgid "Create" #~ msgid "Create routine" #~ msgstr "సృష్టించు" # మొదటి అనువాదము #, fuzzy -#~| msgid "Create" #~ msgid "Create trigger" #~ msgstr "సృష్టించు" diff --git a/po/ug.po b/po/ug.po index 856a1bd..d1b9ac9 100644 --- a/po/ug.po +++ b/po/ug.po @@ -11008,17 +11008,14 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "نەشىرنى قۇىماق" #, fuzzy -#~| msgid "Create version" #~ msgid "Create routine" #~ msgstr "نەشىرنى قۇىماق" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "نەشىرنى قۇىماق" diff --git a/po/uk.po b/po/uk.po index 6bdd883..31e3d42 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11043,17 +11043,14 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Create User" #~ msgid "Create event" #~ msgstr "Створити користувача" #, fuzzy -#~| msgid "Create User" #~ msgid "Create routine" #~ msgstr "Створити користувача" #, fuzzy -#~| msgid "Create User" #~ msgid "Create trigger" #~ msgstr "Створити користувача" diff --git a/po/ur.po b/po/ur.po index 5c53720..1ea2476 100644 --- a/po/ur.po +++ b/po/ur.po @@ -11026,17 +11026,14 @@ msgid "Rename view to" msgstr "" #, fuzzy -#~| msgid "Created" #~ msgid "Create event" #~ msgstr "تخلیق کیا گیا" #, fuzzy -#~| msgid "Created" #~ msgid "Create routine" #~ msgstr "تخلیق کیا گیا" #, fuzzy -#~| msgid "Created" #~ msgid "Create trigger" #~ msgstr "تخلیق کیا گیا" diff --git a/po/uz.po b/po/uz.po index fe9054f..a5068d9 100644 --- a/po/uz.po +++ b/po/uz.po @@ -12243,17 +12243,14 @@ msgid "Rename view to" msgstr "Кўриниш номини ўзгартириш" #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "Версиясини тузиш" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Боғлиқлик ўрнатиш" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "Версиясини тузиш" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 64c079f..a1ac6a2 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -12307,17 +12307,14 @@ msgid "Rename view to" msgstr "Ko‘rinish nomini o‘zgartirish" #, fuzzy -#~| msgid "Create version" #~ msgid "Create event" #~ msgstr "Vеrsiyasini tuzish" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "Bog‘liqlik o‘rnatish" #, fuzzy -#~| msgid "Create version" #~ msgid "Create trigger" #~ msgstr "Vеrsiyasini tuzish" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1155fe4..517c3c4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11135,17 +11135,14 @@ msgid "Rename view to" msgstr "将视图改名为" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "新建视图" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "创建关系" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "新建视图" diff --git a/po/zh_TW.po b/po/zh_TW.po index fe866a6..5ee777e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -11122,17 +11122,14 @@ msgid "Rename view to" msgstr "將 view改名爲" #, fuzzy -#~| msgid "Create view" #~ msgid "Create event" #~ msgstr "新建視圖" #, fuzzy -#~| msgid "Create relation" #~ msgid "Create routine" #~ msgstr "建立關聯" #, fuzzy -#~| msgid "Create view" #~ msgid "Create trigger" #~ msgstr "新建視圖" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13792-gf6982ba
by Rouslan Placella 09 Aug '11

09 Aug '11

The branch, master has been updated via f6982bae8491dc425e7d9a2e9cb0841a7ff435e1 (commit) via cccc78a98e0280d5a6fd7566de9a5a498dfaf069 (commit) via 46d0ea701fabee81e21272cd6aca005bcafa3c6b (commit) from 98f9a70ed92690167e498eba9ab7de2480dca694 (commit) - Log ----------------------------------------------------------------- commit f6982bae8491dc425e7d9a2e9cb0841a7ff435e1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 16:41:28 2011 +0100 Triggers don't work with views commit cccc78a98e0280d5a6fd7566de9a5a498dfaf069 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 16:32:47 2011 +0100 Unified some localised strings for routines, triggers and events. commit 46d0ea701fabee81e21272cd6aca005bcafa3c6b Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 9 16:29:05 2011 +0100 Select current table in editor when adding a trigger ----------------------------------------------------------------------- Summary of changes: libraries/rte/rte_events.lib.php | 2 +- libraries/rte/rte_routines.lib.php | 2 +- libraries/rte/rte_triggers.lib.php | 12 ++++++++---- libraries/tbl_links.inc.php | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libraries/rte/rte_events.lib.php b/libraries/rte/rte_events.lib.php index a449ff2..d6a8fdd 100644 --- a/libraries/rte/rte_events.lib.php +++ b/libraries/rte/rte_events.lib.php @@ -178,7 +178,7 @@ function PMA_EVN_handleEditor() } // Get the data for the form (if any) if (! empty($_REQUEST['add_item'])) { - $title = __("Create event"); + $title = PMA_RTE_getWord('add'); $item = PMA_EVN_getDataFromRequest(); $mode = 'add'; } else if (! empty($_REQUEST['edit_item'])) { diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 2edb4ca..3e63603 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -337,7 +337,7 @@ function PMA_RTN_handleEditor() } // Get the data for the form (if any) if (! empty($_REQUEST['add_item'])) { - $title = __("Create routine"); + $title = PMA_RTE_getWord('add'); $routine = PMA_RTN_getDataFromRequest(); $mode = 'add'; } else if (! empty($_REQUEST['edit_item'])) { diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index 8c65a67..64b8b85 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -154,7 +154,7 @@ function PMA_TRI_handleEditor() ) { // Get the data for the form (if any) if (! empty($_REQUEST['add_item'])) { - $title = __("Create trigger"); + $title = PMA_RTE_getWord('add'); $item = PMA_TRI_getDataFromRequest(); $mode = 'add'; } else if (! empty($_REQUEST['edit_item'])) { @@ -308,10 +308,14 @@ function PMA_TRI_getEditorForm($mode, $item) $retval .= " <select name='item_table'>\n"; foreach (PMA_DBI_get_tables($db) as $key => $value) { $selected = ""; - if ($value == $item['item_table']) { - $selected = " selected='selected'"; + if (! PMA_Table::isView($db, $value)) { + if ($mode == 'add' && $value == $table) { + $selected = " selected='selected'"; + } else if ($mode == 'edit' && $value == $item['item_table']) { + $selected = " selected='selected'"; + } + $retval .= " <option$selected>$value</option>\n"; } - $retval .= " <option$selected>$value</option>\n"; } $retval .= " </select>\n"; $retval .= " </td>\n"; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 3de9ed2..1d8af40 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -98,7 +98,7 @@ if (PMA_Tracker::isActive()) { $tabs['tracking']['link'] = 'tbl_tracking.php'; } if (!$db_is_information_schema && !PMA_DRIZZLE) { - if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table)) { + if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table) && ! PMA_Table::isView($db, $table)) { $tabs['triggers']['link'] = 'tbl_triggers.php'; $tabs['triggers']['text'] = __('Triggers'); $tabs['triggers']['icon'] = 'ic_b_triggers'; hooks/post-receive -- phpMyAdmin

1 0