Git December 2010

git@phpmyadmin.net

5 participants
175 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1708-gd370730

by Dieter Adriaenssens

The branch, master has been updated via d370730eff1b8e8e69369e54a51726a839058ba4 (commit) from 621d851c5f0dcf063af2120f8984773e580d7a84 (commit) - Log ----------------------------------------------------------------- commit d370730eff1b8e8e69369e54a51726a839058ba4 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Dec 4 14:13:51 2010 +0100 bug #3119874, Show integers without decimals on status page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a44159..55cbb7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. +- bug #3119874 [interface] Show integers without decimals on status page. 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/server_status.php b/server_status.php index 520bb51..de68965 100644 --- a/server_status.php +++ b/server_status.php @@ -793,7 +793,7 @@ if (! empty($section['title'])) { if ('%' === substr($name, -1, 1)) { echo PMA_formatNumber($value, 0, 2) . ' %'; } elseif (is_numeric($value) && $value == (int) $value) { - echo PMA_formatNumber($value, 3, 1); + echo PMA_formatNumber($value, 4, 0); } elseif (is_numeric($value)) { echo PMA_formatNumber($value, 3, 1); } else { hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1707-g621d851

by Marc Delisle

The branch, master has been updated via 621d851c5f0dcf063af2120f8984773e580d7a84 (commit) from 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit) - Log ----------------------------------------------------------------- commit 621d851c5f0dcf063af2120f8984773e580d7a84 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 07:02:06 2010 -0500 zend.ze1_compatibility_mode removed in PHP 5.3 ----------------------------------------------------------------------- Summary of changes: libraries/common.inc.php | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index dda4b95..1a140bb 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -57,20 +57,25 @@ require './libraries/Error_Handler.class.php'; $GLOBALS['error_handler'] = new PMA_Error_Handler(); $cfg['Error_Handler']['display'] = TRUE; -// at this point PMA_PHP_INT_VERSION is not yet defined -if (version_compare(phpversion(), '6', 'lt')) { +/* + * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.3', 'lt')) { /** * Avoid object cloning errors */ @ini_set('zend.ze1_compatibility_mode', false); - - /** - * Avoid problems with magic_quotes_runtime - */ - @ini_set('magic_quotes_runtime', false); } /** + * Avoid problems with magic_quotes_runtime + * (in the future, this setting will be removed but it's not yet + * known in which PHP version) + */ +@ini_set('magic_quotes_runtime', false); + +/** * for verification in all procedural scripts under libraries */ define('PHPMYADMIN', true); hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1706-g79f320e

by Marc Delisle

The branch, master has been updated via 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit) from 9d9d88b83f82a2026336f19140c23a313d75bd56 (commit) - Log ----------------------------------------------------------------- commit 79f320e95104ba4017d1ad78b81c3964c7df4871 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 06:41:10 2010 -0500 remove author names ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 4 ++-- libraries/common.inc.php | 2 -- libraries/common.lib.php | 4 ---- libraries/ip_allow_deny.lib.php | 2 +- libraries/sqlparser.lib.php | 4 ---- tbl_alter.php | 1 - 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index f4f4e85..ea95884 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -246,7 +246,7 @@ for ($x = 0; $x < $col; $x++) { // If they have chosen all fields using the * selector, // then sorting is not available - // Robbat2 - Fix for Bug #570698 + // Fix for Bug #570698 if (isset($Sort[$x]) && isset($Field[$x]) && substr($Field[$x], -2) == '.*') { $Sort[$x] = ''; @@ -936,7 +936,7 @@ for ($x = 0; $x < $col; $x++) { if (!empty($curField[$x]) && !empty($curSort[$x])) { // if they have chosen all fields using the * selector, // then sorting is not available - // Robbat2 - Fix for Bug #570698 + // Fix for Bug #570698 if (substr($curField[$x], -2) != '.*') { $qry_orderby .= $curField[$x] . ' ' . $curSort[$x]; $last_orderby = 1; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index e4ce8c8..dda4b95 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -731,7 +731,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Lookup server by name - * by Arnold - Helder Hosting * (see FAQ 4.8) */ if (! empty($_REQUEST['server']) && is_string($_REQUEST['server']) @@ -838,7 +837,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { // Based on mod_access in Apache: // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.… // Look at: "static int check_dir_access(request_rec *r)" - // Robbat2 - May 10, 2002 if (isset($cfg['Server']['AllowDeny']) && isset($cfg['Server']['AllowDeny']['order'])) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ca99014..6bfb7c7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -557,8 +557,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // --- Added to solve bug #641765 - // Robbat2 - 12 January 2003, 9:46PM - // Revised, Robbat2 - 13 January 2003, 2:59PM if (!function_exists('PMA_SQP_isError') || PMA_SQP_isError()) { $formatted_sql = htmlspecialchars($the_query); } elseif (empty($the_query) || trim($the_query) == '') { @@ -578,8 +576,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '', // username/password if (!empty($the_query) && !strstr($the_query, 'connect')) { // --- Added to solve bug #641765 - // Robbat2 - 12 January 2003, 9:46PM - // Revised, Robbat2 - 13 January 2003, 2:59PM if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) { $error_msg_output .= PMA_SQP_getErrorString() . "\n"; $error_msg_output .= ' ' . "\n"; diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 69cab18..30bce24 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -46,7 +46,7 @@ function PMA_getIp() * Based on IP Pattern Matcher * Originally by J.Adams <jna(a)retina.net> * Found on <http://www.php.net/manual/en/function.ip2long.php> - * Modified by Robbat2 <robbat2(a)users.sourceforge.net> + * Modified for phpMyAdmin * * Matches: * xxx.xxx.xxx.xxx (exact) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a9568c4..a6676e4 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -86,7 +86,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_resetError() { global $SQP_errorString; @@ -101,7 +100,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_getErrorString() { global $SQP_errorString; @@ -115,7 +113,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_isError() { global $SQP_errorString; @@ -131,7 +128,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * @access private * @scope SQL Parser internal */ - // Revised, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_throwError($message, $sql) { global $SQP_errorString; diff --git a/tbl_alter.php b/tbl_alter.php index ba8c048..b7ab440 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -92,7 +92,6 @@ if (isset($_REQUEST['do_save_data'])) { // To allow replication, we first select the db to use and then run queries // on this db. PMA_DBI_select_db($db) or PMA_mysqlDie(PMA_DBI_getError(), 'USE ' . PMA_backquote($db) . ';', '', $err_url); - // Optimization fix - 2 May 2001 - Robbat2 $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' ' . implode(', ', $changes) . $key_query; $result = PMA_DBI_try_query($sql_query); hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1705-g9d9d88b

by Marc Delisle

The branch, master has been updated via 9d9d88b83f82a2026336f19140c23a313d75bd56 (commit) from c6d051b65e28b07b5b7980eac29616d3932f360c (commit) - Log ----------------------------------------------------------------- commit 9d9d88b83f82a2026336f19140c23a313d75bd56 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 06:35:55 2010 -0500 bug #3119937 cannot upload into a BLOB ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index dc1632a..758add1 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -276,8 +276,24 @@ $(document).ready(function() { * Submission of data to be inserted or updated * * @uses PMA_ajaxShowMessage() + * + * This section has been deactivated. Here are the problems that I've + * noticed: + * + * 1. If the form contains a file upload field, the data does not reach + * tbl_replace.php. This is because AJAX does not support file upload. + * As a workaround I tried jquery.form.js version 2.49. The file + * upload worked but afterwards the browser presented a tbl_replace.php + * file and a choice to open or save. + * + * 2. This code can be called if we are editing or inserting. If editing, + * the "and then" action can be "go back to this page" or "edit next + * row", in which cases it makes sense to use AJAX. But the "go back + * to previous page" and "insert another new row" actions, using AJAX + * has no obvious advantage. If inserting, the "go back to previous" + * action needs a page refresh anyway. */ - $("#insertForm").live('submit', function(event) { + $("#insertFormDEACTIVATED").live('submit', function(event) { /** * @var the_form Object referring to the insertion form hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1704-gc6d051b

by Michal Čihař

The branch, master has been updated via c6d051b65e28b07b5b7980eac29616d3932f360c (commit) via 1adb0bff4c883f9a1378eacd0affb0489c719f30 (commit) via 11e9cd28787adb00bb0a10219730eb747629bcf2 (commit) via c3b120c67abe3e89ab975c378a41263b6210bec2 (commit) via 5d7ed1900a2327959372209b2fda63f977d6bbc9 (commit) via 8f2902975a44d20d68a5678faf61c38d3d0256c3 (commit) via 1b66fcb9d3d5995812672db084c30f6045c447cf (commit) via 4038ceb61d3b5ab703b15b2a9a0f4e167fa453f2 (commit) via 4d8a177a35963f0a9e198fcc6e2a697c6f7e306b (commit) via 5c0d01504a25afa3608570c344500ef9814f7959 (commit) via f4f9c7f5f197ca7390a2d611b827019c1a774a28 (commit) via 244f7404ecb32f70d3ed7273c1d0a616f44c0306 (commit) via 35eeceec1eac29463c185ad4b74e33efa9608a96 (commit) via 72d36016a665be839f378daadcf261eb4f3cdcc8 (commit) via 47efc58805c1f8844ac36374f801d658348f123d (commit) via fed83679737c95f8dc2042711fda12994dd3bb94 (commit) via 254b2b468869c247835d474901294b0ae0f0b3aa (commit) via d898063b5fa841cb77f7a3db66680858ae852bff (commit) via d423c0a2a6f4a03276e73dad392e0a0a075b166a (commit) via 5b76c658e0fe838bc822d062d64f64939c2f2e63 (commit) via 462fd3dc8d47fd16da1e3a508c2a94379f748330 (commit) via d4e3c3c6530341334a7128d4c9303ae4d1c39248 (commit) via d1ae2fe6264856b94eb8daa8cf646320d48da686 (commit) via e06fdf3c3e088c108ca64ae7eaff35469518f937 (commit) via 3364be836af6fda59050ada0158dcba9b6f96a6a (commit) via 4af93e3d0184fb92bbf885f1f5980ebef6a12471 (commit) via 04ba897a836b5ad73076c223b2d061df5ed45569 (commit) via e66a44534e94551142bf87d7bdc2f36c2a39eb4b (commit) via 4093abb7e4fdbd0d7dc777c16fa3f6916b5d33a0 (commit) via 1d13802c96c60f026cf772a27eb17775fa082c91 (commit) via 4a3cf746ebcd3f4707e513fde43c1132b34de433 (commit) via ac9bd7a52161235879b0bd0a193f69b4e765d6d9 (commit) via be570ade164539c64bf8bcbaac480867d51eb8ff (commit) via 596a0bd93f8f76aaadc8a7fdbd7ee45b7d7ddc34 (commit) via aedab73c8ed7e32a0302d98ea32c9830c4a513e4 (commit) via bf47a17ae0edc12eb3d65f95ae4e205c56464de8 (commit) via bedc06ce34c1a0ea709224cbe20e382b32ddfdae (commit) via 88e531080e32939e0d960d4734ac3e945d34e2df (commit) via 8141f8b06c6e27b63f4f2a8096b216219a9c16a4 (commit) via 3cec86bad3893f904c8a83b30ec546df49c063f0 (commit) via fbdce1513fc81e5c0d8fb5f4224bfb53d6ecfe4e (commit) via 25e717fe6a9d4547d4a36efa6f2a110dce89fac7 (commit) via b0f629a04d79b4969bc98d5e5ee994a9e2d91872 (commit) via a5609ea827ff1d85c7fc627da8271c23b042d9fc (commit) via ded1fe485855d8249aa01e0ea5703722a8fd8dc6 (commit) via 18a533ab2beec8a6cc8c740f4a9488bb266e0dd4 (commit) via c566faf3faf7e8ea7c4ef039a4fa0910d563496f (commit) via a3631a19255d78b68c4e58f6d89a87736cf13c58 (commit) via a4cf1cecd2c29dd2b29a5f010542aa22ad4bbd57 (commit) via 4d3089c8154c3ab3abc031f08f77c2c51962ed65 (commit) from e6704b5fa60fa61d74c900024f7fec72511a3a9e (commit) - Log ----------------------------------------------------------------- commit c6d051b65e28b07b5b7980eac29616d3932f360c Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:10:30 2010 +0200 Translation update done using Pootle. commit 1adb0bff4c883f9a1378eacd0affb0489c719f30 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:10:18 2010 +0200 Translation update done using Pootle. commit 11e9cd28787adb00bb0a10219730eb747629bcf2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:09:55 2010 +0200 Translation update done using Pootle. commit c3b120c67abe3e89ab975c378a41263b6210bec2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:09:11 2010 +0200 Translation update done using Pootle. commit 5d7ed1900a2327959372209b2fda63f977d6bbc9 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:08:46 2010 +0200 Translation update done using Pootle. commit 8f2902975a44d20d68a5678faf61c38d3d0256c3 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:08:07 2010 +0200 Translation update done using Pootle. commit 1b66fcb9d3d5995812672db084c30f6045c447cf Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:07:42 2010 +0200 Translation update done using Pootle. commit 4038ceb61d3b5ab703b15b2a9a0f4e167fa453f2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:07:14 2010 +0200 Translation update done using Pootle. commit 4d8a177a35963f0a9e198fcc6e2a697c6f7e306b Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:05:43 2010 +0200 Translation update done using Pootle. commit 5c0d01504a25afa3608570c344500ef9814f7959 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:02:15 2010 +0200 Translation update done using Pootle. commit f4f9c7f5f197ca7390a2d611b827019c1a774a28 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:01:57 2010 +0200 Translation update done using Pootle. commit 244f7404ecb32f70d3ed7273c1d0a616f44c0306 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:01:13 2010 +0200 Translation update done using Pootle. commit 35eeceec1eac29463c185ad4b74e33efa9608a96 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:59:35 2010 +0200 Translation update done using Pootle. commit 72d36016a665be839f378daadcf261eb4f3cdcc8 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:58:39 2010 +0200 Translation update done using Pootle. commit 47efc58805c1f8844ac36374f801d658348f123d Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:58:11 2010 +0200 Translation update done using Pootle. commit fed83679737c95f8dc2042711fda12994dd3bb94 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:57:26 2010 +0200 Translation update done using Pootle. commit 254b2b468869c247835d474901294b0ae0f0b3aa Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:56:06 2010 +0200 Translation update done using Pootle. commit d898063b5fa841cb77f7a3db66680858ae852bff Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:55:11 2010 +0200 Translation update done using Pootle. commit d423c0a2a6f4a03276e73dad392e0a0a075b166a Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:54:38 2010 +0200 Translation update done using Pootle. commit 5b76c658e0fe838bc822d062d64f64939c2f2e63 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:35 2010 +0200 Translation update done using Pootle. commit 462fd3dc8d47fd16da1e3a508c2a94379f748330 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:28 2010 +0200 Translation update done using Pootle. commit d4e3c3c6530341334a7128d4c9303ae4d1c39248 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:16 2010 +0200 Translation update done using Pootle. commit d1ae2fe6264856b94eb8daa8cf646320d48da686 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:03 2010 +0200 Translation update done using Pootle. commit e06fdf3c3e088c108ca64ae7eaff35469518f937 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:28 2010 +0200 Translation update done using Pootle. commit 3364be836af6fda59050ada0158dcba9b6f96a6a Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:26 2010 +0200 Translation update done using Pootle. commit 4af93e3d0184fb92bbf885f1f5980ebef6a12471 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:23 2010 +0200 Translation update done using Pootle. commit 04ba897a836b5ad73076c223b2d061df5ed45569 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:19 2010 +0200 Translation update done using Pootle. commit e66a44534e94551142bf87d7bdc2f36c2a39eb4b Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:14 2010 +0200 Translation update done using Pootle. commit 4093abb7e4fdbd0d7dc777c16fa3f6916b5d33a0 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:58 2010 +0200 Translation update done using Pootle. commit 1d13802c96c60f026cf772a27eb17775fa082c91 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:50 2010 +0200 Translation update done using Pootle. commit 4a3cf746ebcd3f4707e513fde43c1132b34de433 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:45 2010 +0200 Translation update done using Pootle. commit ac9bd7a52161235879b0bd0a193f69b4e765d6d9 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:37 2010 +0200 Translation update done using Pootle. commit be570ade164539c64bf8bcbaac480867d51eb8ff Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:34 2010 +0200 Translation update done using Pootle. commit 596a0bd93f8f76aaadc8a7fdbd7ee45b7d7ddc34 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:25 2010 +0200 Translation update done using Pootle. commit aedab73c8ed7e32a0302d98ea32c9830c4a513e4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:36:14 2010 +0200 Translation update done using Pootle. commit bf47a17ae0edc12eb3d65f95ae4e205c56464de8 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:20:12 2010 +0200 Translation update done using Pootle. commit bedc06ce34c1a0ea709224cbe20e382b32ddfdae Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:20:03 2010 +0200 Translation update done using Pootle. commit 88e531080e32939e0d960d4734ac3e945d34e2df Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:44 2010 +0200 Translation update done using Pootle. commit 8141f8b06c6e27b63f4f2a8096b216219a9c16a4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:40 2010 +0200 Translation update done using Pootle. commit 3cec86bad3893f904c8a83b30ec546df49c063f0 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:36 2010 +0200 Translation update done using Pootle. commit fbdce1513fc81e5c0d8fb5f4224bfb53d6ecfe4e Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:07 2010 +0200 Translation update done using Pootle. commit 25e717fe6a9d4547d4a36efa6f2a110dce89fac7 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:18:11 2010 +0200 Translation update done using Pootle. commit b0f629a04d79b4969bc98d5e5ee994a9e2d91872 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:17:32 2010 +0200 Translation update done using Pootle. commit a5609ea827ff1d85c7fc627da8271c23b042d9fc Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:17:26 2010 +0200 Translation update done using Pootle. commit ded1fe485855d8249aa01e0ea5703722a8fd8dc6 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:56 2010 +0200 Translation update done using Pootle. commit 18a533ab2beec8a6cc8c740f4a9488bb266e0dd4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:40 2010 +0200 Translation update done using Pootle. commit c566faf3faf7e8ea7c4ef039a4fa0910d563496f Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:26 2010 +0200 Translation update done using Pootle. commit a3631a19255d78b68c4e58f6d89a87736cf13c58 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:13:16 2010 +0200 Translation update done using Pootle. commit a4cf1cecd2c29dd2b29a5f010542aa22ad4bbd57 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:06:12 2010 +0200 Translation update done using Pootle. commit 4d3089c8154c3ab3abc031f08f77c2c51962ed65 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:02:47 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 95 +++++++++++++++++++++----------------------------------------- 1 files changed, 32 insertions(+), 63 deletions(-) diff --git a/po/nl.po b/po/nl.po index b8f871b..b478f1e 100644 --- a/po/nl.po +++ b/po/nl.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: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-12-03 11:04+0200\n" +"PO-Revision-Date: 2010-12-03 17:10+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" "Language: nl\n" @@ -586,7 +586,6 @@ msgid "Inside column:" msgstr "In de kolom:" #: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" msgstr "Geen tabellen gevonden in de database." @@ -804,11 +803,11 @@ msgstr "Database-log" #: enum_editor.php:21 libraries/tbl_properties.inc.php:794 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Waarden voor het de kolom \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:795 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Plaats elke waarde in een log veld." #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -955,16 +954,14 @@ msgid "Dropping Event" msgstr "" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Procedures" +msgstr "Procedure komt te vervallen" #: js/messages.php:35 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Deleting tracking data" -msgstr "Verwijder tracking data voor deze tabel" +msgstr "Tracking data voor deze tabel wordt verwijderd" #: js/messages.php:36 msgid "Dropping Primary Key/Index" @@ -1010,28 +1007,24 @@ msgid "The passwords aren't the same!" msgstr "De wachtwoorden zijn niet gelijk!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" msgstr "Voeg een nieuwe gebruiker toe" #: js/messages.php:53 -#, fuzzy #| msgid "Create version" msgid "Create User" -msgstr "Versie aanmaken" +msgstr "Gebruiker aanmaken" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Bezig de privileges te verversen" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Verwijder de geselecteerde gebruikers" +msgstr "Geselecteerde gebruikers worden verwijderd" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1044,16 +1037,14 @@ msgid "Cancel" msgstr "Annuleren" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" msgstr "Laden" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Processen" +msgstr "Bezig met verwerken" #: js/messages.php:65 msgid "Error in Processing Request" @@ -1080,10 +1071,9 @@ msgid "Renaming Databases" msgstr "Hernoem database naar" #: js/messages.php:72 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Hernoem database naar" +msgstr "Ververs database" #: js/messages.php:73 #, fuzzy @@ -1098,41 +1088,35 @@ msgid "Changing Charset" msgstr "Karakterset" #: js/messages.php:75 -#, fuzzy #| msgid "Table must have at least one column." msgid "Table must have at least one column" -msgstr "Tabel moet minimaal één veld hebben." +msgstr "Tabel moet minimaal één kolom hebben." #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Maak tabel" #: js/messages.php:81 -#, fuzzy #| msgid "Search" msgid "Searching" msgstr "Zoeken" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL-query veld" +msgstr "SQL-query veld verbergen" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL-query veld" +msgstr "SQL-query veld tonen" # "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen iets anders. #: js/messages.php:86 -#, fuzzy #| msgid "Inline" msgid "Inline Edit" -msgstr "Rechtstreeks" +msgstr "Wijzig inline" #: js/messages.php:89 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1152,7 +1136,6 @@ msgid "Please select the primary key or a unique key" msgstr "Selecteer de primaire sleutel of een unieke sleutel" #: js/messages.php:95 pmd_general.php:89 tbl_relation.php:545 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Kies weer te geven veld" @@ -1162,7 +1145,6 @@ msgid "Add an option for column " msgstr "" #: js/messages.php:101 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" msgstr "Genereer wachtwoord" @@ -1172,16 +1154,14 @@ msgid "Generate" msgstr "Genereer" #: js/messages.php:103 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "Wijzig wachtwoord" #: js/messages.php:106 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "Ma" +msgstr "Meer" #. l10n: Display text for calendar close link #: js/messages.php:116 @@ -1190,7 +1170,6 @@ msgstr "Klaar" #. l10n: Display text for previous month link in calendar #: js/messages.php:118 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Vorige" @@ -1278,7 +1257,6 @@ msgstr "Apr" #. l10n: Short month name #: js/messages.php:148 libraries/common.lib.php:1553 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1389,35 +1367,30 @@ msgstr "Zo" #. l10n: Minimal week day name #: js/messages.php:193 -#, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Ma" #. l10n: Minimal week day name #: js/messages.php:195 -#, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Di" #. l10n: Minimal week day name #: js/messages.php:197 -#, fuzzy #| msgid "Wed" msgid "We" msgstr "Wo" #. l10n: Minimal week day name #: js/messages.php:199 -#, fuzzy #| msgid "Thu" msgid "Th" msgstr "Do" #. l10n: Minimal week day name #: js/messages.php:201 -#, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Vr" @@ -1765,13 +1738,12 @@ msgstr "Authenticeren..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS fout" #: libraries/blobstreaming.lib.php:267 -#, fuzzy #| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Het aanmaken van de pagina is mislukt" +msgstr "PBMS connectie mislukt:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" @@ -1800,7 +1772,7 @@ msgstr "Download bestand" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Bestand kon niet worden geopend: %s" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:178 libraries/export/xml.php:36 @@ -1837,16 +1809,14 @@ msgid "Jump to database" msgstr "Ga naar database" #: libraries/build_html_for_db.lib.php:130 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Master replicatie" +msgstr "Niet gerepliceerd" #: libraries/build_html_for_db.lib.php:136 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Replicatie" +msgstr "Gerepliceerd" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1858,14 +1828,13 @@ msgid "Check Privileges" msgstr "Controleer privileges" #: libraries/chart.lib.php:40 -#, fuzzy #| msgid "Show statistics" msgid "Query statistics" msgstr "Toon statistieken" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" -msgstr "" +msgstr "Vergelijking van query uitvoer tijden ( in microseconden)" #: libraries/chart.lib.php:83 #, fuzzy @@ -1875,11 +1844,11 @@ msgstr "Query resultaat bewerkingen" #: libraries/chart.lib.php:109 msgid "No data found for the chart." -msgstr "" +msgstr "Geen gegeven beschikbaar voor de grafiek." #: libraries/chart.lib.php:249 msgid "GD extension is needed for charts." -msgstr "" +msgstr "De GD-extensie is vereist voor het tonen van grafieken." #: libraries/chart.lib.php:252 msgid "JSON encoder is needed for chart tooltips." @@ -2165,7 +2134,7 @@ msgstr "structuur" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "gegevens" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2177,15 +2146,15 @@ msgstr "Structuur en gegevens" #: libraries/config.values.php:99 libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Snel - toon enkel de belangrijkste opties" #: libraries/config.values.php:100 libraries/display_export.lib.php:129 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Uitgebreid - toon alle mogelijke opties" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Uitgebreid - als bovenstaande maar zonder snel/uitgebreid keuze" #: libraries/config.values.php:119 #, fuzzy @@ -2201,11 +2170,11 @@ msgstr "Uitgebreide invoegingen" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "beide bovenstaande opties" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "geen van bovenstaande opties" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:416 @@ -2232,7 +2201,7 @@ msgstr "Foutieve waarde" #: libraries/config/validate.lib.php:458 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Waarde moet lager of gelijk zijn aan %s" #: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2250,17 +2219,17 @@ msgstr "Variabelen" #: libraries/config/FormDisplay.class.php:732 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" vereist de %s extensie" #: libraries/config/FormDisplay.class.php:746 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "importeren niet mogelijk, de functie %s mist" #: libraries/config/FormDisplay.class.php:750 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "exporteren niet mogelijk, de functie %s mist" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1654-ge6704b5

by Michal Čihař

The branch, master has been updated via e6704b5fa60fa61d74c900024f7fec72511a3a9e (commit) via af974b6c09fa659c8944d72aed1afb54b697b60c (commit) via ed2aba109de1321caae9324d81ef3f00a3d91486 (commit) via cf95c4b4b5c92c9cd39fc71e866057e71b31c179 (commit) from 83848da9eaeda858650536516a544691922be526 (commit) - Log ----------------------------------------------------------------- commit e6704b5fa60fa61d74c900024f7fec72511a3a9e Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:04:45 2010 +0200 Translation update done using Pootle. commit af974b6c09fa659c8944d72aed1afb54b697b60c Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:04:20 2010 +0200 Translation update done using Pootle. commit ed2aba109de1321caae9324d81ef3f00a3d91486 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:00:21 2010 +0200 Translation update done using Pootle. commit cf95c4b4b5c92c9cd39fc71e866057e71b31c179 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 09:39:53 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/nl.po b/po/nl.po index 0d4105f..b8f871b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-12-01 10:52+0200\n" +"PO-Revision-Date: 2010-12-03 11:04+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -339,10 +339,9 @@ msgstr "" "waarom klik %shier%s." #: db_operations.php:581 -#, fuzzy #| msgid "Relational schema" msgid "Edit or export relational schema" -msgstr "Relationeel schema" +msgstr "Bewerk of exporteer relationeel schema" #: db_printview.php:102 db_tracking.php:84 db_tracking.php:169 #: libraries/config/messages.inc.php:484 libraries/db_structure.lib.php:37 @@ -469,7 +468,6 @@ msgid "Modify" msgstr "Aanpassen" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" msgstr "Toevoegen/Verwijderen Criteria Rij" @@ -550,10 +548,10 @@ msgid "Delete" msgstr "Verwijderen" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Verwijder tracking data voor deze tabel" +msgstr "Verwijder gevonden rijen voor de tabel %s?" #: db_search.php:273 #, php-format @@ -583,10 +581,9 @@ msgid "Inside table(s):" msgstr "In de tabel(len):" #: db_search.php:352 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "In het veld:" +msgstr "In de kolom:" #: db_structure.php:59 #, fuzzy hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1650-g83848da

by Michal Čihař

The branch, master has been updated via 83848da9eaeda858650536516a544691922be526 (commit) from 57265808b8e639bb06506851a74e3474521ccb70 (commit) - Log ----------------------------------------------------------------- commit 83848da9eaeda858650536516a544691922be526 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 17:30:10 2010 +0100 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/cs.po b/po/cs.po index be9b35c..145930b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,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: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-11-21 10:10+0100\n" +"PO-Revision-Date: 2010-12-02 17:30+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -551,10 +551,10 @@ msgid "Delete" msgstr "Odstranit" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Odstranit všechny informace o sledování této tabulky" +msgstr "Odstranit nalezené záznamy z tabulky %s?" #: db_search.php:273 #, php-format @@ -618,8 +618,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -841,8 +841,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1599,8 +1599,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -1785,7 +1785,7 @@ msgstr "Zkontrolovat oprávnění" #: libraries/chart.lib.php:40 msgid "Query statistics" -msgstr "Statistika dotazu" +msgstr "Statistika dotazů" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" @@ -4517,8 +4517,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6437,8 +6437,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6479,8 +6479,8 @@ msgid "" "No description is available for this transformation. Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6851,10 +6851,9 @@ msgid "Filter" msgstr "Filtr" #: navigation.php:292 -#, fuzzy #| msgid "table name" msgid "filter tables by name" -msgstr "jméno tabulky" +msgstr "filtrovat tabulky podle jména" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" @@ -7088,8 +7087,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7541,8 +7540,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9019,8 +9018,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1649-g5726580

by Michal Čihař

The branch, master has been updated via 57265808b8e639bb06506851a74e3474521ccb70 (commit) via 89f03ef81b9705a15e3a173a316130e2acf9c4bb (commit) via 219f5a4fb913a5f748a0d871e751a0609dea5c17 (commit) via a480379baeddef4a7af43adc1504760179188164 (commit) from f60afa01e40fe259a1745adad26dda3bcef81ac0 (commit) - Log ----------------------------------------------------------------- commit 57265808b8e639bb06506851a74e3474521ccb70 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:20:09 2010 +0100 Do not fail if transformations are not enabled for this table, but request asks to enable them. commit 89f03ef81b9705a15e3a173a316130e2acf9c4bb Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:14:59 2010 +0100 bug #3123433 [interface] Avoid double escaping of MySQL errors. The PMA_DBI_getError function already does escaping, so there is no need to escape that string again on displaying. commit 219f5a4fb913a5f748a0d871e751a0609dea5c17 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:06:05 2010 +0100 Whitespace cleanup. commit a480379baeddef4a7af43adc1504760179188164 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 2 17:05:57 2010 +0100 Remove not used variable. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/common.lib.php | 9 +++------ sql.php | 24 ++++++++++++++---------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c791ac..5a44159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ - bug #3115519 [interface] Prevent long queries from being shown in confirmation popup - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas +- bug #3123433 [interface] Avoid double escaping of MySQL errors. 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4b194de..ca99014 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -616,10 +616,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', .' ' . "\n"; } // end if - $tmp_mysql_error = ''; // for saving the original $error_message if (!empty($error_message)) { - $tmp_mysql_error = strtolower($error_message); // save the original $error_message - $error_message = htmlspecialchars($error_message); $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); } // modified to show the help on error-returns @@ -2992,10 +2989,10 @@ function PMA_selectUploadFile($import_list, $uploaddir) { } /** - * Build titles and icons for action links + * Build titles and icons for action links * - * @return array the action titles - * @uses PMA_getIcon() + * @return array the action titles + * @uses PMA_getIcon() */ function PMA_buildActionTitles() { $titles = array(); diff --git a/sql.php b/sql.php index 351fb20..27a6c72 100644 --- a/sql.php +++ b/sql.php @@ -377,12 +377,12 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $table = ''; } $active_page = $goto; - $message = PMA_Message::rawError(htmlspecialchars($error)); + $message = PMA_Message::rawError($error); if( $GLOBALS['is_ajax_request'] == true) { PMA_ajaxResponse($message, false); } - + /** * Go to target path. */ @@ -391,7 +391,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { /** * HTML header. */ - + if($GLOBALS['is_ajax_request'] != true) { require_once './libraries/header.inc.php'; } @@ -545,7 +545,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { require_once './libraries/relation_cleanup.lib.php'; PMA_relationsCleanupColumn($db, $table, $dropped_column); - } // end if column was dropped + } // end if column was dropped } // end else "didn't ask to see php code" // No rows returned -> move back to the calling page @@ -600,7 +600,7 @@ if (0 == $num_rows || $is_affected) { $message->addMessage($_querytime); $message->addMessage(')'); } - + if( $GLOBALS['is_ajax_request'] == true) { /** @@ -643,6 +643,10 @@ if (0 == $num_rows || $is_affected) { //if some posted fields need to be transformed, generate them here. $mime_map = PMA_getMIME($db, $table); + if ($mime_map === FALSE) { + $mime_map = array(); + } + $edited_values = array(); parse_str($_REQUEST['transform_fields_list'], $edited_values); @@ -680,7 +684,7 @@ if (0 == $num_rows || $is_affected) { if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) { $extra_data['reload'] = 1; $extra_data['db'] = $GLOBALS['db']; - } + } PMA_ajaxResponse($message, $message->isSuccess(), (isset($extra_data) ? $extra_data : '')); } @@ -691,7 +695,7 @@ if (0 == $num_rows || $is_affected) { if (isset($_REQUEST['purge'])) { $table = ''; unset($url_params['table']); - } + } include 'libraries/db_table_exists.lib.php'; if (strpos($goto, 'tbl_') === 0 && ! $is_table) { @@ -745,7 +749,7 @@ else { $GLOBALS['js_include'][] = 'sql.js'; unset($message); - + if( $GLOBALS['is_ajax_request'] != true) { if (strlen($table)) { require './libraries/tbl_common.php'; @@ -776,7 +780,7 @@ else { $fields_meta = PMA_DBI_get_fields_meta($result); $fields_cnt = count($fields_meta); } - + if( $GLOBALS['is_ajax_request'] != true ) { //begin the sqlqueryresults div here. container div echo '<div id="sqlqueryresults">'; @@ -786,7 +790,7 @@ else { if (isset($disp_query) && $cfg['ShowSQL'] == true) { PMA_showMessage($disp_message, $disp_query, 'success'); } - + if (isset($profiling_results)) { PMA_profilingResults($profiling_results, true); } hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1645-gf60afa0

by Michal Čihař

The branch, master has been updated via f60afa01e40fe259a1745adad26dda3bcef81ac0 (commit) via fd9187e8cc31b08c69d1c356dd4e2cced7a69694 (commit) from 267c8fe7353c10d7a308274cf69853b6bcc58ecf (commit) - Log ----------------------------------------------------------------- commit f60afa01e40fe259a1745adad26dda3bcef81ac0 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:53:00 2010 +0100 Upload .tar.xz files as well commit fd9187e8cc31b08c69d1c356dd4e2cced7a69694 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:52:45 2010 +0100 Enable generating of tar.xz ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 2 +- scripts/upload-release | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 8e1ca23..3e7c2c1 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -12,7 +12,7 @@ set -u set -e KITS="all-languages english" -COMPRESSIONS="zip-7z tbz tgz 7z" +COMPRESSIONS="zip-7z tbz txz tgz 7z" if [ $# -lt 2 ] then diff --git a/scripts/upload-release b/scripts/upload-release index 3fbaf5c..243281f 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -21,6 +21,8 @@ mkdir $REL cd $REL put phpMyAdmin-$REL-all-languages.tar.bz2 put phpMyAdmin-$REL-english.tar.bz2 +put phpMyAdmin-$REL-all-languages.tar.xz +put phpMyAdmin-$REL-english.tar.xz put phpMyAdmin-$REL-all-languages.tar.gz put phpMyAdmin-$REL-english.tar.gz put phpMyAdmin-$REL-all-languages.zip hooks/post-receive -- phpMyAdmin

13 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 5be088e904b8a768dd8fe4add3614c0f61190b4d

by Michal Čihař

The branch, master has been updated via 5be088e904b8a768dd8fe4add3614c0f61190b4d (commit) from eba8989fad267c75cf0921aab77bbb038dca3fc2 (commit) - Log ----------------------------------------------------------------- commit 5be088e904b8a768dd8fe4add3614c0f61190b4d Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 16:41:54 2010 +0100 Do not filter out .xz. ----------------------------------------------------------------------- Summary of changes: render.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/render.py b/render.py index 9767d60..ae59587 100755 --- a/render.py +++ b/render.py @@ -382,7 +382,7 @@ class SFGenerator: if type != 'phpMyAdmin': continue path, ext = os.path.splitext(title) - if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.zip']: + if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.xz', '.zip']: continue release, file = self.dom2release(entry) if release is None: @@ -507,7 +507,7 @@ class SFGenerator: if type != 'themes': continue path, ext = os.path.splitext(title) - if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.zip']: + if ext not in ['.html', '.txt', '.7z', '.gz', '.bz2', '.xz', '.zip']: continue name = titleparts[1] version = titleparts[2] hooks/post-receive -- phpMyAdmin website

13 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2010