Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-24-ga3132f6
by Marc Delisle 19 Oct '11

19 Oct '11

The branch, QA_3_4 has been updated via a3132f6e91f04dc8f885f4141e6d397460421fa4 (commit) from ec99ab3e0084e61623f5343dc82296cc0cd5fe3b (commit) - Log ----------------------------------------------------------------- commit a3132f6e91f04dc8f885f4141e6d397460421fa4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 19 16:58:10 2011 -0400 3.4.8-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04455a7..2660fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.8.0 (not yet released) + 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false - bug #3418849 [interface] Inline edit shows dropdowns even after closing diff --git a/Documentation.html b/Documentation.html index e9390dd..c925464 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.7-dev - Documentation</title> + <title>phpMyAdmin 3.4.8-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.7-dev + 3.4.8-dev Documentation </h1> </div> diff --git a/README b/README index caec19f..aecad4c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.7-dev +Version 3.4.8-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a6f4e12..ed9d775 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.7-dev'); + $this->set('PMA_VERSION', '3.4.8-dev'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_7, created. RELEASE_3_4_6-24-gfd82f1d
by Marc Delisle 19 Oct '11

19 Oct '11

The branch, MAINT_3_4_7 has been created at fd82f1d12c2915c9045de0bfdc440581738eaebd (commit) - Log ----------------------------------------------------------------- commit fd82f1d12c2915c9045de0bfdc440581738eaebd Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 19 16:56:13 2011 -0400 3.4.7-rc1 ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21404-g9db5e44
by Marc Delisle 19 Oct '11

19 Oct '11

The branch, master has been updated via 9db5e4447c9249a92ca3283d452513c10d79a380 (commit) via c76d9fea3a64a06fdd2d2bd215f97932ce2f7282 (commit) via ec99ab3e0084e61623f5343dc82296cc0cd5fe3b (commit) from 00269e5e5e5249018bd08576571ab46e87677de7 (commit) - Log ----------------------------------------------------------------- commit 9db5e4447c9249a92ca3283d452513c10d79a380 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 19 13:21:42 2011 -0400 Fix merge conflicts commit c76d9fea3a64a06fdd2d2bd215f97932ce2f7282 Merge: 00269e5 ec99ab3 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Oct 19 13:15:05 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + export.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25041cf..9e266b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ phpMyAdmin - ChangeLog - bug #3423725 [pdf] Broken PDF file when exporting database to PDF - [core] Allow to set language in URL - bug #3425184 [doc] Fix links to PHP documentation +- bug #3426031 [export] Export to bzip2 is not working 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/export.php b/export.php index 0c8a644..ba3d883 100644 --- a/export.php +++ b/export.php @@ -35,7 +35,7 @@ if (! isset($export_list[$type])) { $compression_methods = array( 'zip', 'gzip', - 'bzip', + 'bzip2', ); /** @@ -153,7 +153,7 @@ function PMA_exportOutputHandler($line) $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // as bzipped - if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) { + if ($GLOBALS['compression'] == 'bzip2' && @function_exists('bzcompress')) { $dump_buffer = bzcompress($dump_buffer); } elseif ($GLOBALS['compression'] == 'gzip' && @function_exists('gzencode')) { // as a gzipped file @@ -224,7 +224,7 @@ $output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_C && $type != 'xls'; // Use on the fly compression? -$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip'); +$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip2'); if ($onfly_compression) { $memory_limit = trim(@ini_get('memory_limit')); // 2 MB as default @@ -287,7 +287,7 @@ if ($asfile) { // If dump is going to be compressed, set correct mime_type and add // compression to extension - if ($compression == 'bzip') { + if ($compression == 'bzip2') { $filename .= '.bz2'; $mime_type = 'application/x-bzip2'; } elseif ($compression == 'gzip') { @@ -631,7 +631,7 @@ if (!empty($asfile)) { $zipfile -> addFile($dump_buffer, substr($filename, 0, -4)); $dump_buffer = $zipfile -> file(); } - } elseif ($compression == 'bzip') { + } elseif ($compression == 'bzip2') { // 2. as a bzipped file if (@function_exists('bzcompress')) { $dump_buffer = bzcompress($dump_buffer); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-23-gec99ab3
by Marc Delisle 19 Oct '11

19 Oct '11

The branch, QA_3_4 has been updated via ec99ab3e0084e61623f5343dc82296cc0cd5fe3b (commit) from 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + export.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b61d59..04455a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #3423725 [pdf] Broken PDF file when exporting database to PDF - [core] Allow to set language in URL - bug #3425184 [doc] Fix links to PHP documentation +- bug #3426031 [export] Export to bzip2 is not working 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/export.php b/export.php index fb8805a..fa8e15a 100644 --- a/export.php +++ b/export.php @@ -31,7 +31,7 @@ if (!isset($export_list[$type])) { $compression_methods = array( 'zip', 'gzip', - 'bzip', + 'bzip2', ); /** @@ -150,7 +150,7 @@ function PMA_exportOutputHandler($line) $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); } // as bzipped - if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) { + if ($GLOBALS['compression'] == 'bzip2' && @function_exists('bzcompress')) { $dump_buffer = bzcompress($dump_buffer); } // as a gzipped file @@ -222,7 +222,7 @@ $output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_C && $type != 'xls'; // Use on the fly compression? -$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip'); +$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip2'); if ($onfly_compression) { $memory_limit = trim(@ini_get('memory_limit')); // 2 MB as default @@ -285,7 +285,7 @@ if ($asfile) { // If dump is going to be compressed, set correct mime_type and add // compression to extension - if ($compression == 'bzip') { + if ($compression == 'bzip2') { $filename .= '.bz2'; $mime_type = 'application/x-bzip2'; } elseif ($compression == 'gzip') { @@ -649,7 +649,7 @@ if (!empty($asfile)) { } } // 2. as a bzipped file - elseif ($compression == 'bzip') { + elseif ($compression == 'bzip2') { if (@function_exists('bzcompress')) { $dump_buffer = bzcompress($dump_buffer); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21401-g00269e5
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, master has been updated via 00269e5e5e5249018bd08576571ab46e87677de7 (commit) via 7b2d5419b0943393c2a3ca4f1fddf2c187458f4b (commit) via da4cadcc42f8e98f5864d30a4fa5fdc717b451fe (commit) via fd574ccb85d8597d87f2e47eaef02fb1c53986d7 (commit) via 17c23618e9bc24c031c4f2f21f599c65a345a2a8 (commit) via 60ce4277914e6f945daed0c964feebdc441f7c98 (commit) via b2ddd973b9f31b46b74fa0a9a9dcc8ba4962fdaa (commit) via 411626ec1c0252efeb2f659a14b7e393f8226283 (commit) via fd37d28dfbfa9e9dde7c4be41fcf7176252087fb (commit) via 7e0055b276c34b6bce99178078092781c7a06e9d (commit) via ef8c9be97a12200dd5edad69e5d176b20f8055ae (commit) via 98230f9550ad13300ac7ea34adccb3aa252f73f0 (commit) via b81a7e52fe475d4fd399483ae67bbc6fa62231a3 (commit) via 1e77bb16f3efba4600265eb8245b8b06c577400d (commit) via 23fae25e2f89f564b835155bd31af47623d26c2b (commit) via 4d2d02a7a343534972b6bad25f5103570fc7eac3 (commit) via 67f745be2cb856aaffdacaffbf706339635824bf (commit) via 530610a70842c08335aa486197eced013c3e8226 (commit) via d268dc160464288e0691a3f7cd504c2fee84f41f (commit) via a32f148a43539c2ca4a878a7d205e2402c06a175 (commit) via f115afc5dff50bdc3a0ec7af52e955477c905516 (commit) via 5a349db8e15a2ae4393f092880a43939a3e3c298 (commit) via 35324048926e0177c15b8373b5dce1460b4e313d (commit) via 5aa7f7f7e30a15df347603f81b01430f5a1fbbea (commit) via 0326161e3df3315adcc1c354acf2c012c632e492 (commit) via e5b97d61b6a0eb800ae0fbbcc1892dd3b127d9b0 (commit) via 9f0bdad4bd64fa393789fb310b4bdd1dfa6b9c3b (commit) via 4f001a6297913bfe1842dcf74572f0719e44b1dd (commit) via 3aa98e4c105eea8769d77b8402433d61fb4a9242 (commit) via a3ae1bf552204d0af4e99254313d3e0426a515aa (commit) via f7563202de51c8241e92d6bde8d2fc4bde44da77 (commit) via 56e8df907e661054fbc3f610eb81211768653c9a (commit) via 7b677ea7d10e52bfec7d064a6e4edeb60b7051be (commit) via 19f3ff20217c4a1fad5706cfada0cc6b358b1007 (commit) via 9ed185a830483aaef86a1b0e2ac040f04b2da340 (commit) via 02c1e3892b5341b2e3f51fe73a5f15adff183f66 (commit) via 7b5472ac9e5f93da58aecec259fce8fe5a8d21d2 (commit) via 6a9a99dc7b3b318259405fd06338160a191c5577 (commit) via 000f3261c1acde691e487bc8d68a212b13a501fd (commit) via 3a7fa82c4c6a8bdefd9285aea30bb2552cd0c3fa (commit) via fbcab023ac341f5e18f2f61f29679ab1eda428c6 (commit) via 6649b2d2be8e28ce0e18bb0fe749534e75596bf1 (commit) via ffe469f3fd7c1c85481c918c7c15add923782a45 (commit) via b7bc4caf4915b8f15643ac83086117945ca10800 (commit) via 9707f25b5c834e3b2fd16c8972495859dfe34d57 (commit) via c8520e1660904c3d0cb3e0de4715bc856b2774ff (commit) via ef301343083af6a9dab5ae0c197fb20df15e3ae8 (commit) via cea93188f801f8eff887c440810294389e2538f1 (commit) via 0aba90a41cc536e278e2cb5b4d63a510201aef01 (commit) via bae7840779a1b4e342bb5d3bc78f58bca5c008e2 (commit) via bfb698b78b02428224b25478dba89b33d5ce840d (commit) via 1a4279723d8c2ec638ae5a20200b59737344b78e (commit) via c1be929c70e94612bb540ef0911cde0cd6d5e3ca (commit) via e82d4cbeb8435e2bb36c54b279ff40edb6cde686 (commit) via c2702e6aeffa29e00e86d8f8f4d5c2f661770625 (commit) via 239af4264db6fee7de69f4cde117b9d45d5078cf (commit) via 4b85829f9aee5100fc5738ae4bcea80c4548534d (commit) via 6985ff1ed6ee5380a3b0a8eb03f5a238ee8c8fd9 (commit) via b7f45c780107d79a2a8adb4c5a4fcd5e4b2e2d3c (commit) via a6ae00c9629a9cf6223f0d45438c84472e7085ba (commit) via 4dbf91a0aa7fdb6ba3c909923143e7ffe987be45 (commit) via bf0db5769b8e429341e6c13656c4891ca69262ac (commit) via 9fd88614b15db77acfcee5f6f0e084470cd376a3 (commit) from 88c5f90e5395981f704d162d6c383cc2efb82196 (commit) - Log ----------------------------------------------------------------- commit 00269e5e5e5249018bd08576571ab46e87677de7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 20:02:26 2011 +0200 Translation update done using Pootle. commit 7b2d5419b0943393c2a3ca4f1fddf2c187458f4b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 20:01:40 2011 +0200 Translation update done using Pootle. commit da4cadcc42f8e98f5864d30a4fa5fdc717b451fe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:57:58 2011 +0200 Translation update done using Pootle. commit fd574ccb85d8597d87f2e47eaef02fb1c53986d7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:57:30 2011 +0200 Translation update done using Pootle. commit 17c23618e9bc24c031c4f2f21f599c65a345a2a8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:53:33 2011 +0200 Translation update done using Pootle. commit 60ce4277914e6f945daed0c964feebdc441f7c98 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:09:40 2011 +0200 Translation update done using Pootle. commit b2ddd973b9f31b46b74fa0a9a9dcc8ba4962fdaa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:07:03 2011 +0200 Translation update done using Pootle. commit 411626ec1c0252efeb2f659a14b7e393f8226283 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:06:09 2011 +0200 Translation update done using Pootle. commit fd37d28dfbfa9e9dde7c4be41fcf7176252087fb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 19:04:28 2011 +0200 Translation update done using Pootle. commit 7e0055b276c34b6bce99178078092781c7a06e9d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:59:15 2011 +0200 Translation update done using Pootle. commit ef8c9be97a12200dd5edad69e5d176b20f8055ae Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:58:41 2011 +0200 Translation update done using Pootle. commit 98230f9550ad13300ac7ea34adccb3aa252f73f0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:58:13 2011 +0200 Translation update done using Pootle. commit b81a7e52fe475d4fd399483ae67bbc6fa62231a3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:57:17 2011 +0200 Translation update done using Pootle. commit 1e77bb16f3efba4600265eb8245b8b06c577400d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:52:42 2011 +0200 Translation update done using Pootle. commit 23fae25e2f89f564b835155bd31af47623d26c2b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:51:25 2011 +0200 Translation update done using Pootle. commit 4d2d02a7a343534972b6bad25f5103570fc7eac3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:07:00 2011 +0200 Translation update done using Pootle. commit 67f745be2cb856aaffdacaffbf706339635824bf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:05:25 2011 +0200 Translation update done using Pootle. commit 530610a70842c08335aa486197eced013c3e8226 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:04:40 2011 +0200 Translation update done using Pootle. commit d268dc160464288e0691a3f7cd504c2fee84f41f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:03:17 2011 +0200 Translation update done using Pootle. commit a32f148a43539c2ca4a878a7d205e2402c06a175 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:02:18 2011 +0200 Translation update done using Pootle. commit f115afc5dff50bdc3a0ec7af52e955477c905516 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 18:01:11 2011 +0200 Translation update done using Pootle. commit 5a349db8e15a2ae4393f092880a43939a3e3c298 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:59:59 2011 +0200 Translation update done using Pootle. commit 35324048926e0177c15b8373b5dce1460b4e313d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:54:29 2011 +0200 Translation update done using Pootle. commit 5aa7f7f7e30a15df347603f81b01430f5a1fbbea Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:53:40 2011 +0200 Translation update done using Pootle. commit 0326161e3df3315adcc1c354acf2c012c632e492 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:52:35 2011 +0200 Translation update done using Pootle. commit e5b97d61b6a0eb800ae0fbbcc1892dd3b127d9b0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:51:26 2011 +0200 Translation update done using Pootle. commit 9f0bdad4bd64fa393789fb310b4bdd1dfa6b9c3b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:50:39 2011 +0200 Translation update done using Pootle. commit 4f001a6297913bfe1842dcf74572f0719e44b1dd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:49:13 2011 +0200 Translation update done using Pootle. commit 3aa98e4c105eea8769d77b8402433d61fb4a9242 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:46:34 2011 +0200 Translation update done using Pootle. commit a3ae1bf552204d0af4e99254313d3e0426a515aa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:45:37 2011 +0200 Translation update done using Pootle. commit f7563202de51c8241e92d6bde8d2fc4bde44da77 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 17:38:55 2011 +0200 Translation update done using Pootle. commit 56e8df907e661054fbc3f610eb81211768653c9a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:45:17 2011 +0200 Translation update done using Pootle. commit 7b677ea7d10e52bfec7d064a6e4edeb60b7051be Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:44:20 2011 +0200 Translation update done using Pootle. commit 19f3ff20217c4a1fad5706cfada0cc6b358b1007 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:42:51 2011 +0200 Translation update done using Pootle. commit 9ed185a830483aaef86a1b0e2ac040f04b2da340 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:41:59 2011 +0200 Translation update done using Pootle. commit 02c1e3892b5341b2e3f51fe73a5f15adff183f66 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:39:08 2011 +0200 Translation update done using Pootle. commit 7b5472ac9e5f93da58aecec259fce8fe5a8d21d2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:38:16 2011 +0200 Translation update done using Pootle. commit 6a9a99dc7b3b318259405fd06338160a191c5577 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:37:01 2011 +0200 Translation update done using Pootle. commit 000f3261c1acde691e487bc8d68a212b13a501fd Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:36:01 2011 +0200 Translation update done using Pootle. commit 3a7fa82c4c6a8bdefd9285aea30bb2552cd0c3fa Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:33:02 2011 +0200 Translation update done using Pootle. commit fbcab023ac341f5e18f2f61f29679ab1eda428c6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:30:48 2011 +0200 Translation update done using Pootle. commit 6649b2d2be8e28ce0e18bb0fe749534e75596bf1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:28:58 2011 +0200 Translation update done using Pootle. commit ffe469f3fd7c1c85481c918c7c15add923782a45 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:26:32 2011 +0200 Translation update done using Pootle. commit b7bc4caf4915b8f15643ac83086117945ca10800 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:24:38 2011 +0200 Translation update done using Pootle. commit 9707f25b5c834e3b2fd16c8972495859dfe34d57 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:24:23 2011 +0200 Translation update done using Pootle. commit c8520e1660904c3d0cb3e0de4715bc856b2774ff Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:23:30 2011 +0200 Translation update done using Pootle. commit ef301343083af6a9dab5ae0c197fb20df15e3ae8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:21:36 2011 +0200 Translation update done using Pootle. commit cea93188f801f8eff887c440810294389e2538f1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:18:08 2011 +0200 Translation update done using Pootle. commit 0aba90a41cc536e278e2cb5b4d63a510201aef01 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:16:01 2011 +0200 Translation update done using Pootle. commit bae7840779a1b4e342bb5d3bc78f58bca5c008e2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:12:47 2011 +0200 Translation update done using Pootle. commit bfb698b78b02428224b25478dba89b33d5ce840d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:12:19 2011 +0200 Translation update done using Pootle. commit 1a4279723d8c2ec638ae5a20200b59737344b78e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:11:09 2011 +0200 Translation update done using Pootle. commit c1be929c70e94612bb540ef0911cde0cd6d5e3ca Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:10:43 2011 +0200 Translation update done using Pootle. commit e82d4cbeb8435e2bb36c54b279ff40edb6cde686 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Oct 18 16:05:44 2011 +0200 Translation update done using Pootle. commit c2702e6aeffa29e00e86d8f8f4d5c2f661770625 Merge: 239af42 88c5f90 Author: Pootle server <pootle(a)cihar.com> Date: Tue Oct 18 14:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 239af4264db6fee7de69f4cde117b9d45d5078cf Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:26:32 2011 +0200 Translation update done using Pootle. commit 4b85829f9aee5100fc5738ae4bcea80c4548534d Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:25:04 2011 +0200 Translation update done using Pootle. commit 6985ff1ed6ee5380a3b0a8eb03f5a238ee8c8fd9 Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:23:11 2011 +0200 Translation update done using Pootle. commit b7f45c780107d79a2a8adb4c5a4fcd5e4b2e2d3c Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:22:26 2011 +0200 Translation update done using Pootle. commit a6ae00c9629a9cf6223f0d45438c84472e7085ba Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:22:16 2011 +0200 Translation update done using Pootle. commit 4dbf91a0aa7fdb6ba3c909923143e7ffe987be45 Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:21:11 2011 +0200 Translation update done using Pootle. commit bf0db5769b8e429341e6c13656c4891ca69262ac Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:17:46 2011 +0200 Translation update done using Pootle. commit 9fd88614b15db77acfcee5f6f0e084470cd376a3 Author: tauruss85 <tauruss85(a)gmail.com> Date: Tue Oct 18 13:16:19 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pl.po | 23 +++++----- po/ru.po | 136 ++++++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 59 deletions(-) diff --git a/po/pl.po b/po/pl.po index db2cc66..e162851 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,8 +4,8 @@ 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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-17 14:30+0200\n" -"Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n" +"PO-Revision-Date: 2011-10-18 13:26+0200\n" +"Last-Translator: <tauruss85(a)gmail.com>\n" "Language-Team: polish <pl(a)li.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -1620,11 +1620,13 @@ msgstr "Przeładuj" #: js/messages.php:186 msgid "Affected rows:" -msgstr "" +msgstr "Zmodyfikowanych wierszy:" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" +"Nie udało się przetworzyć pliku konfiguracyjnego. Prawdopodobnie nie zawiera " +"prawidłowego kodu JSON" #: js/messages.php:189 msgid "" @@ -1651,17 +1653,16 @@ msgstr "" #: js/messages.php:197 msgid "Possible performance issues" -msgstr "" +msgstr "Możliwe problemy z wydajnością" #: js/messages.php:198 msgid "Issue" -msgstr "" +msgstr "Zagadnienie" #: js/messages.php:199 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Dokumentacja" +msgstr "Rekomendacja" #: js/messages.php:200 #, fuzzy @@ -1677,7 +1678,7 @@ msgstr "Typ uwierzytelniania" #: js/messages.php:202 msgid "Used variable / formula" -msgstr "" +msgstr "Użyta zmienna / formuła" #: js/messages.php:203 msgid "Test" @@ -5966,7 +5967,7 @@ msgstr "Import częściowy" msgid "" "Previous import timed out, after resubmitting will continue from position %d." msgstr "" -"Poprzedni import przekroczył limit czasu, ponowne przedłożenie tego pliku " +"Poprzedni import przekroczył limit czasu, ponowne przesłanie tego pliku " "spowoduje kontynuacje od miejsca %d." #: libraries/display_import.lib.php:221 @@ -7574,10 +7575,10 @@ msgstr "Generuj hasło" #: libraries/rte/rte_routines.lib.php:1246 #: 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 "Wykonane zostały następujące zapytania:" +msgstr "Wykonanie następującego zapytania nie powiodło się: \"%s\"" #: libraries/rte/rte_events.lib.php:116 msgid "Sorry, we failed to restore the dropped event." diff --git a/po/ru.po b/po/ru.po index 8b6f635..0f3fe36 100644 --- a/po/ru.po +++ b/po/ru.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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-15 20:17+0200\n" +"PO-Revision-Date: 2011-10-18 20:02+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -11934,58 +11934,68 @@ msgstr "Сервер работает только %s" #: po/advisory_rules.php:10 #| msgid "Versions" msgid "Questions below 1,000" -msgstr "Запросов менее 1,000" +msgstr "Запросов менее 1000" #: po/advisory_rules.php:11 msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"Данный сервер обработал менее 1000 запросов, в результате чего, рекомендации " +"могут быть недостаточно точными." #: po/advisory_rules.php:12 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Дайте серверу проработать какое-то время, пока не будет выполнено " +"достаточное количество запросов." #: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "Текущее соединение" +msgstr "Текущее количество запросов: %s" #: po/advisory_rules.php:15 -#, fuzzy #| msgid "Show SQL queries" msgid "Percentage of slow queries" -msgstr "Показывать SQL запросы" +msgstr "Процент медленных запросов" #: po/advisory_rules.php:16 msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Наблюдается большое количество медленных запросов по отношению к общему их " +"числу." #: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Вы можете увеличить значение {long_query_time} или оптимизировать запросы " +"выведенные в списке журнала медленных запросов" #: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"Уровень медленных запросов должен быть менее 5%%, ваше значение составляет %" +"s%%." #: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Дефрагментировать кеш запросов" +msgstr "Уровень медленных запросов" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Наблюдается высокий процент медленных запросов по отношению к времени работы " +"сервера." #: po/advisory_rules.php:23 #, php-format @@ -11993,109 +12003,117 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Уровень медленных запросов составляет %s в час, необходимо придерживаться не " +"более 1%% в час." #: po/advisory_rules.php:25 -#, fuzzy #| msgid "SQL queries" msgid "Long query time" -msgstr "SQL запросы" +msgstr "Время выполнения длинных запросов" #: po/advisory_rules.php:26 msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"Значение long_query_time установлено в 10 секунд или более, таким образом, " +"только медленные запросы превышающие по времени выполнения 10 секунд будут " +"записаны в журнал." #: po/advisory_rules.php:27 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Предлагается понизить значение переменной {long_query_time}, в соответствии " +"с вашим окружением. Рекомендуемым значением является 1-5 секунд." #: po/advisory_rules.php:28 #, php-format msgid "long_query_time is currently set to %ds." -msgstr "" +msgstr "Переменная long_query_time установлена в %d секунд." #: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Отобразить поле запроса" +msgstr "Запись журналов медленных запросов" #: po/advisory_rules.php:31 -#, fuzzy #| msgid "The event scheduler is disabled" msgid "The slow query log is disabled." -msgstr "Отключен планировщик событий" +msgstr "Отключен журнал медленных запросов." #: po/advisory_rules.php:32 msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Включите запись журналов медленных запросов установив переменную " +"{log_slow_queries} в 'ON'. Это поможет в поиске медленных, недостаточно " +"оптимизированных запросов." #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" -msgstr "" +msgstr "Переменная log_slow_queries установлена в 'OFF'" #: po/advisory_rules.php:35 -#, fuzzy #| msgid "Select Tables" msgid "Release Series" -msgstr "Выберите таблицы" +msgstr "Серии выпусков" #: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." -msgstr "" +msgstr "Версия сервера MySQL ниже 5.1." #: po/advisory_rules.php:37 msgid "" "You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 " "even more so." msgstr "" +"В связи с улучшенной производительностью MySQL 5.1 и еще более выдающимися " +"результатами MySQL 5.5, вам рекомендуется обновить свою версию MySQL." #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 -#, fuzzy, php-format +#, php-format #| msgid "Create version" msgid "Current version: %s" -msgstr "Создать версию" +msgstr "Текущая версия: %s" #: po/advisory_rules.php:40 po/advisory_rules.php:45 -#, fuzzy #| msgid "Version" msgid "Minor Version" -msgstr "Версия" +msgstr "Промежуточная версия" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Версия менее 5.1.30 (первый стабильный выпуск 5.1)." #: po/advisory_rules.php:42 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." msgstr "" +"В связи с улучшенной производительностью последних выпусков MySQL 5.1 и еще " +"более выдающимися результатами MySQL 5.5, вам рекомендуется обновить свою " +"версию MySQL." #: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Версия менее 5.5.8 (первый стабильный выпуск 5.5)." #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "Необходимо обновить %s до версии %s или выше." +msgstr "Необходимо обновить MySQL до стабильной версии 5.5" #: po/advisory_rules.php:50 po/advisory_rules.php:55 po/advisory_rules.php:60 -#, fuzzy #| msgid "Description" msgid "Distribution" -msgstr "Описание" +msgstr "Дистрибутив" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" +msgstr "Версия собрана из исходников, не официальная сборка MySQL." #: po/advisory_rules.php:52 msgid "" @@ -12103,41 +12121,46 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Если вы сами не собирали программу из исходников, возможно вы используете " +"измененный пакет из дистрибутива. Документация MySQL будет в полной мере " +"применима только к официальной сборке MySQL, а не к пакетам из дистрибутивов " +"(таким как RedHat, Debian/Ubuntu и так далее)." #: po/advisory_rules.php:53 msgid "'source' found in version_comment" -msgstr "" +msgstr "В version_comment найдено слово 'source'" #: po/advisory_rules.php:56 po/advisory_rules.php:61 msgid "The MySQL manual only is accurate for official MySQL binaries." msgstr "" +"Документация MySQL в полной мере применима только к официальной сборке " +"MySQL." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "" +msgstr "Документация Percona находится на http://www.percona.com/docs/wiki/" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" -msgstr "" +msgstr "В version_comment найдено слово 'percona'" #: po/advisory_rules.php:62 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" +msgstr "Документация Drizzle находится на http://docs.drizzle.org/" #: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" -msgstr "" +msgstr "Строка версии (%s) соответствует схеме версии Drizzle" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "MySQL-кодировка" +msgstr "Архитектура MySQL" #: po/advisory_rules.php:66 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "MySQL не был собран, как 64-битная программа." #: po/advisory_rules.php:67 msgid "" @@ -12145,23 +12168,25 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"Объем доступной памяти выше 3 GiB (при условии расположения сервера на " +"localhost), поэтому MySQL не сможет получить доступ ко всей памяти. " +"Возможно, вам следует рассмотреть возможность установки 64-битной версии " +"MySQL." #: po/advisory_rules.php:68 #, php-format msgid "Available memory on this host: %s" -msgstr "" +msgstr "Объем памяти доступной на данном хосте: %s" #: po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache disabled" -msgstr "Кеш запросов" +msgstr "Кеш запросов отключен" #: po/advisory_rules.php:71 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "Сервер не отвечает" +msgstr "Кеш запросов не был включен." #: po/advisory_rules.php:72 msgid "" @@ -12170,20 +12195,26 @@ msgid "" "and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using " "memcached, ignore this recommendation." msgstr "" +"Кеш запросов, при правильной настройке, позволяет значительно улучшить " +"производительность сервера. Включите его установив {query_cache_size} на " +"двухзначное значение в MiB и изменив {query_cache_type} на 'ON'. " +"<b>Примечание:</b> При использовании memcached, игнорируйте данную " +"рекомендацию." #: po/advisory_rules.php:73 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" msgstr "" +"Переменная query_cache_size установлена в 0, или переменная query_cache_type " +"установлена в 'OFF'" #: po/advisory_rules.php:75 -#, fuzzy #| msgid "Query cache" msgid "Query caching method" -msgstr "Кеш запросов" +msgstr "Метод кеширования запросов" #: po/advisory_rules.php:76 msgid "Suboptimal caching method." -msgstr "" +msgstr "Оптимальный метод кеширования." #: po/advisory_rules.php:77 msgid "" @@ -12192,6 +12223,11 @@ msgid "" "refman/5.5/en/ha-memcached.html\\\">memcached</a> instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Вы используете механизм кеширования запросов MySQL с базой данных имеющей " +"достаточно объемный трафик. Стоит обратить внимание на возможность " +"использования <a href=\\\"http://dev.mysql.com/doc/refman/5.5/en/ha-" +"memcached.html\\\">memcached</a> вместо механизма кеширования запросов MySQL, " +"в особенности при наличии нескольких подчиненных серверов." #: po/advisory_rules.php:78 #, php-format @@ -12199,18 +12235,22 @@ msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." msgstr "" +"Кеширование запросов включено и сервер получает %d запросов в секунду. " +"Данное правило срабатывает при поступлении более 100 запросов в секунду." #: po/advisory_rules.php:80 msgid "Query cache efficiency (%)" -msgstr "" +msgstr "Эффективность кеширования запросов (%)" #: po/advisory_rules.php:81 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"Кеширование запросов работает недостаточно эффективно из-за низкой частоты " +"успешных обращений." #: po/advisory_rules.php:82 msgid "Consider increasing {query_cache_limit}." -msgstr "" +msgstr "Рассмотрите возможность увеличения {query_cache_limit}." #: po/advisory_rules.php:83 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21338-g88c5f90
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, master has been updated via 88c5f90e5395981f704d162d6c383cc2efb82196 (commit) via 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 (commit) via 246b37937babd4acff40d2ff3075690b8e2c227d (commit) via 75d1dce908264a0040900fa0ed0080df90749860 (commit) from 3535dcfec3274307371f83dba4cc9ea1579b3b78 (commit) - Log ----------------------------------------------------------------- commit 88c5f90e5395981f704d162d6c383cc2efb82196 Merge: 3535dcf 8b9e7c1 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Oct 18 12:46:24 2011 +0200 Merge branch 'QA_3_4' Conflicts: libraries/core.lib.php libraries/sanitizing.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c2e933..25041cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF - [core] Allow to set language in URL +- bug #3425184 [doc] Fix links to PHP documentation 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 56bdad2..209e4bf 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -241,8 +241,13 @@ function PMA_fatalError($error_message, $message_args = null) */ function PMA_getPHPDocLink($target) { - /* l10n: Please check that translation actually exists. */ - $lang = _pgettext('PHP documentation language', 'en'); + /* Gettext does not have to be loaded yet */ + if (function_exists('_pgettext')) { + /* l10n: Please check that translation actually exists. */ + $lang = _pgettext('PHP documentation language', 'en'); + } else { + $lang = 'en'; + } return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } @@ -688,6 +693,9 @@ function PMA_linkURL($url) if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) { return $url; } else { + if (!function_exists('PMA_generate_common_url')) { + require_once('./libraries/url_generating.lib.php'); + } $params = array(); $params['url'] = $url; return './url.php' . PMA_generate_common_url($params); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-22-g8b9e7c1
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, QA_3_4 has been updated via 8b9e7c1279dc1fb73f3b00acf144e0c4e30de463 (commit) via 246b37937babd4acff40d2ff3075690b8e2c227d (commit) via 75d1dce908264a0040900fa0ed0080df90749860 (commit) from 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/core.lib.php | 12 ++++++++++-- libraries/sanitizing.lib.php | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 279d08a..1b61d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF - [core] Allow to set language in URL +- bug #3425184 [doc] Fix links to PHP documentation 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 9166dc4..7b85d66 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -260,8 +260,13 @@ function PMA_fatalError($error_message, $message_args = null) * @access public */ function PMA_getPHPDocLink($target) { - /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */ - $lang = _pgettext('PHP documentation language', 'en'); + /* Gettext does not have to be loaded yet */ + if (function_exists('_pgettext')) { + /* l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. */ + $lang = _pgettext('PHP documentation language', 'en'); + } else { + $lang = 'en'; + } return PMA_linkURL('http://php.net/manual/' . $lang . '/' . $target); } @@ -690,6 +695,9 @@ function PMA_linkURL($url) { if (!preg_match('#^https?://#', $url) || defined('PMA_SETUP')) { return $url; } else { + if (!function_exists('PMA_generate_common_url')) { + require_once('./libraries/url_generating.lib.php'); + } $params = array(); $params['url'] = $url; return './url.php' . PMA_generate_common_url($params); diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index a65f8ba..f7529e2 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -60,6 +60,7 @@ function PMA_sanitize($message, $escape = false, $safe = false) $valid_links = array( 'http', // default http:// links (and https://) './Do', // ./Documentation + './ur', // url.php redirector ); foreach ($founds as $found) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6-21334-g3535dcf
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, master has been updated via 3535dcfec3274307371f83dba4cc9ea1579b3b78 (commit) via 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit) via b4e7f0a6eabcd79d00e5bbcfee85f45d00d4a09f (commit) via 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f (commit) from cb1b6e3059cdbf276c4d0982ab886c53420e1ad6 (commit) - Log ----------------------------------------------------------------- commit 3535dcfec3274307371f83dba4cc9ea1579b3b78 Merge: b4e7f0a 3fa0b1f Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 18 11:53:40 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit b4e7f0a6eabcd79d00e5bbcfee85f45d00d4a09f Merge: cb1b6e3 3e6f8cc Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 18 11:50:29 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d897f63..9c2e933 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog - bug [navi] Wrong icon for view (MySQL 5.5) - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF +- [core] Allow to set language in URL 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 65d63d4..4a81f14 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -469,7 +469,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /* needed for direct access, see FAQ 1.34 * also, server needed for cookie login screen (multi-server) */ - 'server', 'db', 'table', 'target', + 'server', 'db', 'table', 'target', 'lang', /* Session ID */ 'phpMyAdmin', /* Cookie preferences */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-19-g3fa0b1f
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, QA_3_4 has been updated via 3fa0b1f639b76c8629a0714d0442983d4c9f4030 (commit) from 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f (commit) - Log ----------------------------------------------------------------- commit 3fa0b1f639b76c8629a0714d0442983d4c9f4030 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 18 11:51:24 2011 +0200 [core] Allow to set language in URL ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee79c35..279d08a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug [navi] Wrong icon for view (MySQL 5.5) - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF +- [core] Allow to set language in URL 3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 7d71993..b695022 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -466,7 +466,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /* needed for direct access, see FAQ 1.34 * also, server needed for cookie login screen (multi-server) */ - 'server', 'db', 'table', 'target', + 'server', 'db', 'table', 'target', 'lang', /* Session ID */ 'phpMyAdmin', /* Cookie preferences */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6-18-g3e6f8cc
by Michal Čihař 18 Oct '11

18 Oct '11

The branch, QA_3_4 has been updated via 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f (commit) from f3f9122c67f0fb795d5906a0b8b05b3b0f088683 (commit) - Log ----------------------------------------------------------------- commit 3e6f8cc52cbbbe2589e47c42ac21c847a4e6f45f Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Oct 18 11:49:17 2011 +0200 Update translations from master ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 72 +++++++++++++++++++++++++++++++++------------------------- po/th.po | 21 +++++++++------- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 21131b0..2d05d94 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2914,7 +2914,7 @@ msgstr "Importar / exportar" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Define diretórios de importação e exportação e opções de compressão" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2962,7 +2962,7 @@ msgstr "Abrir Documento" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "Outras configurações do núcleo" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" @@ -3031,7 +3031,7 @@ msgstr "" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "Digite os parâmetros de configuração do servidor" #: libraries/config/messages.inc.php:202 #, fuzzy @@ -3045,6 +3045,9 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Configure as opções de armazenamento do phpMyAdmin para ter acesso as " +"configurações adcionais, veja [a(a)Documentation.html#linked-tables]" +"Configuração de armazenamento do phpMyAdmin[/a] na documentação" #: libraries/config/messages.inc.php:204 msgid "Changes tracking" @@ -3112,7 +3115,7 @@ msgstr "Status" #: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "Personalizar página inicial" #: libraries/config/messages.inc.php:222 msgid "Tabs" @@ -3148,6 +3151,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"Habilitar [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compressão nas " +"operações de importação e exportação" #: libraries/config/messages.inc.php:231 msgid "GZip" @@ -3180,7 +3185,7 @@ msgstr "" #: libraries/config/messages.inc.php:236 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "Importação parcial: permite Interrupção" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:248 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 @@ -3253,19 +3258,19 @@ msgstr "Número de linhas inseridas" #: libraries/config/messages.inc.php:265 msgid "Target for quick access icon" -msgstr "" +msgstr "Alvo para ícone de rápido acesso" #: libraries/config/messages.inc.php:266 msgid "Show logo in left frame" -msgstr "" +msgstr "Exibir logo no quadro da esquerda" #: libraries/config/messages.inc.php:267 msgid "Display logo" -msgstr "" +msgstr "Exibir logo" #: libraries/config/messages.inc.php:268 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "Exibir servidor escolhido no topo do quadro esquerdo" #: libraries/config/messages.inc.php:269 msgid "Display servers selection" @@ -3333,7 +3338,7 @@ msgstr "" #: libraries/config/messages.inc.php:283 msgid "Logo link target" -msgstr "" +msgstr "Alvo do link da logo" #: libraries/config/messages.inc.php:284 msgid "Highlight server under the mouse cursor" @@ -3417,6 +3422,8 @@ msgstr "Usar ícones na página principal" #: libraries/config/messages.inc.php:301 msgid "Maximum number of characters used when a SQL query is displayed" msgstr "" +"Numero máximo de caracteres utilizados na exibição do resultado da consulta " +"SQL" #: libraries/config/messages.inc.php:302 msgid "Maximum displayed SQL length" @@ -3430,6 +3437,8 @@ msgstr "" #: libraries/config/messages.inc.php:304 msgid "Maximum number of databases displayed in left frame and database list" msgstr "" +"Número máximo de bancos de dados mostrados no quadro da esquerda na lista de " +"banco de dados" #: libraries/config/messages.inc.php:305 #, fuzzy @@ -3445,15 +3454,15 @@ msgstr "" #: libraries/config/messages.inc.php:307 msgid "Maximum number of rows to display" -msgstr "" +msgstr "Número máximo de linhas a exibir" #: libraries/config/messages.inc.php:309 msgid "Maximum number of tables displayed in table list" -msgstr "" +msgstr "Número máximo de tabelas exibidas na lista de tabelas" #: libraries/config/messages.inc.php:310 msgid "Maximum tables" -msgstr "" +msgstr "Número máximo de tabelas" #: libraries/config/messages.inc.php:311 msgid "" @@ -3523,7 +3532,7 @@ msgstr "" #: libraries/config/messages.inc.php:326 msgid "Use persistent connections to MySQL databases" -msgstr "" +msgstr "Usar conexões persistentes para bancos de dados MySQL" #: libraries/config/messages.inc.php:327 msgid "Persistent connections" @@ -3546,11 +3555,11 @@ msgstr "" #: libraries/config/messages.inc.php:332 msgid "Disallow BLOB and BINARY columns from editing" -msgstr "" +msgstr "Desabilitar colunas BLOB e BINARY da edição" #: libraries/config/messages.inc.php:333 msgid "Protect binary columns" -msgstr "" +msgstr "Proteger colunas binárias" #: libraries/config/messages.inc.php:334 msgid "" @@ -3598,6 +3607,7 @@ msgstr "Largura da janela de consultas" #: libraries/config/messages.inc.php:345 msgid "Select which functions will be used for character set conversion" msgstr "" +"Selecione quais funções serão usadas para conversão do conjunto de caracteres" #: libraries/config/messages.inc.php:346 msgid "Recoding engine" @@ -3650,11 +3660,11 @@ msgstr "Falha na autenticação de hardware" #: libraries/config/messages.inc.php:358 msgid "Allow logins without a password" -msgstr "" +msgstr "Permitir login sem uma senha" #: libraries/config/messages.inc.php:359 msgid "Allow root login" -msgstr "" +msgstr "Permitir login como root" #: libraries/config/messages.inc.php:360 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" @@ -3673,7 +3683,7 @@ msgstr "" #: libraries/config/messages.inc.php:363 msgid "SweKey config file" -msgstr "" +msgstr "Arquivo de configuração Swekey" #: libraries/config/messages.inc.php:364 #, fuzzy @@ -3692,7 +3702,7 @@ msgstr "" #: libraries/config/messages.inc.php:367 msgid "Bookmark table" -msgstr "" +msgstr "Tabela de favoritos" #: libraries/config/messages.inc.php:368 msgid "" @@ -3789,7 +3799,7 @@ msgstr "" #: libraries/config/messages.inc.php:388 msgid "SQL query history table" -msgstr "" +msgstr "Tabela de histórico das consultas SQL" #: libraries/config/messages.inc.php:389 msgid "Hostname where MySQL server is running" @@ -3810,7 +3820,7 @@ msgstr "Tentando conectar sem senha" #: libraries/config/messages.inc.php:393 msgid "Connect without password" -msgstr "" +msgstr "Conectar sem senha" #: libraries/config/messages.inc.php:394 msgid "" @@ -3823,7 +3833,7 @@ msgstr "" #: libraries/config/messages.inc.php:395 msgid "Show only listed databases" -msgstr "" +msgstr "Exibir apenas bancos de dados listados" #: libraries/config/messages.inc.php:396 libraries/config/messages.inc.php:433 msgid "Leave empty if not using config auth" @@ -3904,7 +3914,7 @@ msgstr "Socket do servidor" #: libraries/config/messages.inc.php:413 msgid "Enable SSL for connection to MySQL server" -msgstr "" +msgstr "Habilitar SSL para conexões no servidor MySQL" #: libraries/config/messages.inc.php:414 msgid "Use SSL" @@ -3999,7 +4009,7 @@ msgstr "" #: libraries/config/messages.inc.php:432 msgid "User preferences storage table" -msgstr "" +msgstr "Utilizar tabela de preferências de armazenamento" #: libraries/config/messages.inc.php:434 msgid "User for config auth" @@ -4106,7 +4116,7 @@ msgstr "" #: libraries/config/messages.inc.php:456 msgid "Display database comment instead of its name" -msgstr "" +msgstr "Exibir comentários dos bancos de dados ao invés do nomes" #: libraries/config/messages.inc.php:457 msgid "" @@ -4118,7 +4128,7 @@ msgstr "" #: libraries/config/messages.inc.php:458 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Exibir comentários das tabelas ao invés dos nomes" #: libraries/config/messages.inc.php:459 msgid "Display table comments in tooltips" @@ -4136,7 +4146,7 @@ msgstr "Exibir tabelas abertas" #: libraries/config/messages.inc.php:466 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Requer validador SQL para ser habilitado" #: libraries/config/messages.inc.php:468 #: libraries/display_change_password.lib.php:40 @@ -4156,7 +4166,7 @@ msgstr "" #: libraries/config/messages.inc.php:470 msgid "Enable SQL Validator" -msgstr "" +msgstr "Habilitar Validador SQL" #: libraries/config/messages.inc.php:471 msgid "" @@ -4266,7 +4276,7 @@ msgstr "" #: libraries/config/messages.inc.php:496 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Habilitar aba Desenvolvedor nas configurações" #: libraries/config/messages.inc.php:497 msgid "" @@ -6984,7 +6994,7 @@ msgstr "Mostrar informações do PHP" #: main.php:215 msgid "Wiki" -msgstr "" +msgstr "Wiki" #: main.php:218 msgid "Official Homepage" diff --git a/po/th.po b/po/th.po index 4c4b420..d75e282 100644 --- a/po/th.po +++ b/po/th.po @@ -836,11 +836,12 @@ msgid "Dump has been saved to file %s." msgstr "" #: import.php:58 -#, php-format +#, fuzzy, php-format msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"คุณพยายามที่จะอับโหลดไฟล์ที่มีขนาดใหญ่เกินไป กรุณาดูที่ เอกสารช่วยเหลือ เพื่อแก้ไขปัญหาดังกล่าวนี้ " #: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 @@ -855,6 +856,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" +"คุณพยายามที่จะโหลดไฟล์ที่ไม่สนับสนุนระบบการบีบอัดไฟล์ข้อมูล (%s) กรุณากำหนดค่าอย่างไรอย่างหนึ่ง " +"หรือปิดการตั้งค่าของคุณ" #: import.php:336 msgid "" @@ -865,7 +868,7 @@ msgstr "" #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" +msgstr "ไม่สามารถโหลดนำเข้าปลั๊กอินได้ กรุณาตรวจสอบการติดตั้งของคุณ" #: import.php:396 msgid "The bookmark has been deleted." @@ -873,23 +876,23 @@ msgstr "ลบคำค้นที่จดไว้เรียบร้อย #: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "แสดงบุ๊คมาร์ค" #: import.php:402 sql.php:885 -#, php-format +#, fuzzy, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "ที่คั่นหน้า ได้ถูกสร้างขึ้น" #: import.php:408 import.php:414 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "" +msgstr "นำเข้าได้สำเร็จ %d กำลังดำเนินกา่รต่อ" #: import.php:423 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." -msgstr "" +msgstr "หมดเวลาการนำเข้าสริปแล้ว กรุณานำเข้าไฟล์สริปใหม่" #: import.php:425 msgid "" @@ -918,11 +921,11 @@ msgstr "เบราเซอร์ที่<b>ใช้เฟรมได้</b #: server_synchronize.php:734 server_synchronize.php:762 #: server_synchronize.php:790 server_synchronize.php:802 msgid "Click to select" -msgstr "" +msgstr "คลิกเพื่อเลือก" #: js/messages.php:26 msgid "Click to unselect" -msgstr "" +msgstr "คลิกเพื่อยกเลิกการเลือก" #: js/messages.php:27 libraries/import.lib.php:103 sql.php:195 msgid "\"DROP DATABASE\" statements are disabled." hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011