Git December 2011

git@phpmyadmin.net

5 participants
151 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24507-ge4bbd02

by Rouslan Placella

The branch, master has been updated via e4bbd02eefa782f3d8b187deb43c661a67b6b1ec (commit) via 93882b9681573502a2a4855f18f1c103dec7a815 (commit) from dbde2f57226a9b9386928281a25f5c53c973e387 (commit) - Log ----------------------------------------------------------------- commit e4bbd02eefa782f3d8b187deb43c661a67b6b1ec Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Dec 11 21:14:37 2011 +0000 Use PMA_convertFootnotesToTooltips() in ajax user editor commit 93882b9681573502a2a4855f18f1c103dec7a815 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sun Dec 11 21:10:51 2011 +0000 Improved export user functionality with ajax ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 37 +++++++++++++++++++++++++------------ server_privileges.php | 14 +++++++++----- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index eb8b3b3..c6636f3 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -366,7 +366,7 @@ $(document).ready(function() { var token = $(this).parents('form').find('input[name="token"]').val(); $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) { - $('<div id="edit_user_dialog"></div>') + var $div = $('<div id="edit_user_dialog"></div>') .append(data) .dialog({ width: 900, @@ -375,6 +375,7 @@ $(document).ready(function() { }); //dialog options end displayPasswordGenerateButton(); PMA_ajaxRemoveMessage($msgbox); + PMA_convertFootnotesToTooltips($div); }) // end $.get() }) @@ -467,27 +468,39 @@ $(document).ready(function() { * @name export_user_click */ $(".export_user_anchor.ajax").live('click', function(event) { - /** @lends jQuery */ event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(); - /** * @var button_options Object containing options for jQueryUI dialog buttons */ var button_options = {}; - button_options[PMA_messages['strClose']] = function() {$(this).dialog("close").remove();} - + button_options[PMA_messages['strClose']] = function() { + $(this).dialog("close"); + }; $.get($(this).attr('href'), {'ajax_request': true}, function(data) { - $('<div id="export_dialog"></div>') - .prepend(data) + var $ajaxDialog = $('<div />') + .append(data.message) .dialog({ - width : 500, - buttons: button_options + title: data.title, + width: 500, + buttons: button_options, + close: function () { + $(this).remove(); + } }); PMA_ajaxRemoveMessage($msgbox); - }) //end $.get - }) //end export privileges + // Attach syntax highlited editor to export dialog + CodeMirror.fromTextArea( + $ajaxDialog.find('textarea')[0], + { + lineNumbers: true, + matchBrackets: true, + indentUnit: 4, + mode: "text/x-mysql" + } + ); + }); //end $.get + }); //end export privileges /** * AJAX handler to Paginate the Users Table diff --git a/server_privileges.php b/server_privileges.php index 46487fd..14ad7e6 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -16,6 +16,8 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; +$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js'; +$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js'; $_add_user_error = false; require './libraries/server_common.inc.php'; @@ -1540,16 +1542,18 @@ if (isset($viewing_mode) && $viewing_mode == 'db') { // export user definition if (isset($_REQUEST['export'])) { - echo '<h2>' . __('User') . ' \'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</h2>'; - echo '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">'; + $title = __('User') . ' `' . htmlspecialchars($username) . '`@`' . htmlspecialchars($hostname) . '`'; + $response = '<textarea cols="' . $GLOBALS['cfg']['TextareaCols'] . '" rows="' . $GLOBALS['cfg']['TextareaRows'] . '">'; $grants = PMA_DBI_fetch_result("SHOW GRANTS FOR '" . PMA_sqlAddSlashes($username) . "'@'" . PMA_sqlAddSlashes($hostname) . "'"); foreach ($grants as $one_grant) { - echo $one_grant . ";\n\n"; + $response .= $one_grant . ";\n\n"; } - echo '</textarea>'; + $response .= '</textarea>'; unset($username, $hostname, $grants, $one_grant); if ($GLOBALS['is_ajax_request']) { - exit; + PMA_ajaxResponse($response, 1, array('title' => $title)); + } else { + echo "<h2>$title</h2>$response"; } } hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24505-gdbde2f5

by Madhura Jayaratne

The branch, master has been updated via dbde2f57226a9b9386928281a25f5c53c973e387 (commit) from 67ad88f355d6e541f98d41c48ade42d6f41bd477 (commit) - Log ----------------------------------------------------------------- commit dbde2f57226a9b9386928281a25f5c53c973e387 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 23:00:26 2011 +0530 Adjust row colors upon deletion of a table ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 269f2b1..5151bca 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -338,6 +338,7 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if (data.success == true) { PMA_ajaxShowMessage(data.message); + toggleRowColors($curr_row.next()); $curr_row.hide("medium").remove(); PMA_adjustTotals(); hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24504-g67ad88f

by Madhura Jayaratne

The branch, master has been updated via 67ad88f355d6e541f98d41c48ade42d6f41bd477 (commit) via c06c4af74047f147ebc3fa6c4a17badd4d41dd19 (commit) via 787d393d02974b3420d8691c6d1ccc2c5dd7037d (commit) from ad3e6eeba5c083519ae36d5670b243bc02940f49 (commit) - Log ----------------------------------------------------------------- commit 67ad88f355d6e541f98d41c48ade42d6f41bd477 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 22:35:34 2011 +0530 Adjust row numbers upon deletion of a row commit c06c4af74047f147ebc3fa6c4a17badd4d41dd19 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 22:24:06 2011 +0530 Use toggleRowColors() for tracking page commit 787d393d02974b3420d8691c6d1ccc2c5dd7037d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 22:23:17 2011 +0530 Adjust row colors of the remaining rows upon deletion of a row ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 20 +++----------------- js/functions.js | 16 ++++++++++++++++ js/tbl_structure.js | 13 ++++++++++--- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index dcd4532..269f2b1 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -387,16 +387,9 @@ $(document).ready(function() { $('#tracked_tables').hide("slow").remove(); } else { // There are more rows left after the deletion + toggleRowColors($curr_tracking_row.next()); $curr_tracking_row.hide("slow", function() { $(this).remove(); - // Maybe some row classes are wrong now. Iterate and correct. - var ct = 0; - var rowclass = ''; - $tracked_table.find('tbody tr').each(function() { - rowclass = (ct % 2 === 0) ? 'odd' : 'even'; - $(this).removeClass().addClass(rowclass); - ct++; - }); }); } @@ -428,23 +421,16 @@ $(document).ready(function() { // Insert the cloned row in an appropriate location. if (tmp_tbl_name > table_name) { $cloned.insertBefore($row); + toggleRowColors($row); return false; } else { $cloned.insertAfter($row); + toggleRowColors($cloned); } } }); } - // Maybe some row classes are wrong now. Iterate and correct. - var ct = 0; - var rowclass = ''; - $untracked_table.find('tbody tr').each(function () { - rowclass = (ct % 2 === 0) ? 'odd' : 'even'; - $(this).removeClass().addClass(rowclass); - ct++; - }); - PMA_ajaxShowMessage(data.message); } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); diff --git a/js/functions.js b/js/functions.js index b51ef7c..f1e1277 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3720,3 +3720,19 @@ $(document).ready(function () { ); } }); + +/** + * Toggles row colors of a set of 'tr' elements starting from a given element + * + * @param $start Starting element + */ +function toggleRowColors($start) +{ + for (var $curr_row = $start; $curr_row.length > 0; $curr_row = $curr_row.next()) { + if ($curr_row.hasClass('odd')) { + $curr_row.removeClass('odd').addClass('even'); + } else if ($curr_row.hasClass('even')) { + $curr_row.removeClass('even').addClass('odd'); + } + } +} \ No newline at end of file diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 651cab0..5564bc0 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -35,11 +35,11 @@ $(document).ready(function() { /** * @var curr_row Object reference to the currently selected row (i.e. field in the table) */ - var curr_row = $(this).parents('tr'); + var $curr_row = $(this).parents('tr'); /** * @var curr_column_name String containing name of the field referred to by {@link curr_row} */ - var curr_column_name = $(curr_row).children('th').children('label').text(); + var curr_column_name = $curr_row.children('th').children('label').text(); /** * @var $after_field_item Corresponding entry in the 'After' field. */ @@ -56,8 +56,14 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); + toggleRowColors($curr_row.next()); + // Adjust the row numbers + for (var $row = $curr_row.next(); $row.length > 0; $row = $row.next()) { + var new_val = parseInt($row.find('td:nth-child(2)').text()) - 1; + $row.find('td:nth-child(2)').text(new_val); + } $after_field_item.remove(); - $(curr_row).hide("medium").remove(); + $curr_row.hide("medium").remove(); } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); @@ -151,6 +157,7 @@ $(document).ready(function() { $table_ref.siblings('div.notice').hide('medium'); } else { // We are removing some of the rows only + toggleRowColors($rows_to_hide.last().next()); $rows_to_hide.hide("medium", function () { $(this).remove(); }); hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24501-gad3e6ee

by Madhura Jayaratne

The branch, master has been updated via ad3e6eeba5c083519ae36d5670b243bc02940f49 (commit) from 84b8281c1a9cb83d721859101c993eb4635116a0 (commit) - Log ----------------------------------------------------------------- commit ad3e6eeba5c083519ae36d5670b243bc02940f49 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 19:29:42 2011 +0530 Some more AJAX improvements to tracking page in database view ----------------------------------------------------------------------- Summary of changes: js/db_structure.js | 54 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/js/db_structure.js b/js/db_structure.js index 70a5932..dcd4532 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -387,12 +387,12 @@ $(document).ready(function() { $('#tracked_tables').hide("slow").remove(); } else { // There are more rows left after the deletion - $curr_tracking_row.hide("slow", function () { + $curr_tracking_row.hide("slow", function() { $(this).remove(); // Maybe some row classes are wrong now. Iterate and correct. var ct = 0; var rowclass = ''; - $tracked_table.find('tbody tr').each(function () { + $tracked_table.find('tbody tr').each(function() { rowclass = (ct % 2 === 0) ? 'odd' : 'even'; $(this).removeClass().addClass(rowclass); ct++; @@ -402,23 +402,39 @@ $(document).ready(function() { // Make the removed table visible in the list of 'Untracked tables'. $untracked_table = $('table#noversions'); - $untracked_table.find('tbody tr').each(function () { - var $row = $(this); - var tmp_tbl_name = $row.find('td:nth-child(1)').text(); - if (tmp_tbl_name > table_name) { - var $cloned = $row.clone(); - // Change the table name of the cloned row. - $cloned.find('td:first-child').text(table_name); - // Change the link of the cloned row. - var new_url = $cloned - .find('td:nth-child(2) a') - .attr('href') - .replace('table=' + tmp_tbl_name, 'table=' + table_name); - $cloned.find('td:nth-child(2) a').attr('href', new_url); - $cloned.insertBefore($row); - return false; - } - }); + + // This won't work if no untracked tables are there. + if ($untracked_table.length > 0) { + var $rows = $untracked_table.find('tbody tr'); + + $rows.each(function(index) { + var $row = $(this); + var tmp_tbl_name = $row.find('td:first-child').text(); + var is_last_iteration = (index == ($rows.length - 1)); + + if (tmp_tbl_name > table_name || is_last_iteration) { + var $cloned = $row.clone(); + + // Change the table name of the cloned row. + $cloned.find('td:first-child').text(table_name); + + // Change the link of the cloned row. + var new_url = $cloned + .find('td:nth-child(2) a') + .attr('href') + .replace('table=' + tmp_tbl_name, 'table=' + encodeURIComponent(table_name)); + $cloned.find('td:nth-child(2) a').attr('href', new_url); + + // Insert the cloned row in an appropriate location. + if (tmp_tbl_name > table_name) { + $cloned.insertBefore($row); + return false; + } else { + $cloned.insertAfter($row); + } + } + }); + } // Maybe some row classes are wrong now. Iterate and correct. var ct = 0; hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24500-g84b8281

by Madhura Jayaratne

The branch, master has been updated via 84b8281c1a9cb83d721859101c993eb4635116a0 (commit) from e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 (commit) - Log ----------------------------------------------------------------- commit 84b8281c1a9cb83d721859101c993eb4635116a0 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 14:58:35 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: libraries/StorageEngine.class.php | 113 ++++++++------- libraries/database_interface.lib.php | 259 ++++++++++++++++++++-------------- server_status.php | 29 +++-- 3 files changed, 229 insertions(+), 172 deletions(-) diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php index b325935..e41f7be 100644 --- a/libraries/StorageEngine.class.php +++ b/libraries/StorageEngine.class.php @@ -82,12 +82,12 @@ class PMA_StorageEngine /** * returns HTML code for storage engine select box * + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines Should unavailable storage engines be offered? + * * @static - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param string $selected The selected engine - * @param boolean $offerUnavailableEngines - * Should unavailable storage engines be offered? * @return string html selectbox */ static public function getHtmlSelect($name = 'engine', $id = null, @@ -100,10 +100,12 @@ class PMA_StorageEngine foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) { // Don't show PERFORMANCE_SCHEMA engine (MySQL 5.5) // Don't show MyISAM for Drizzle (allowed only for temporary tables) - if (!$offerUnavailableEngines - && ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' - || $details['Engine'] == 'PERFORMANCE_SCHEMA') - || (PMA_DRIZZLE && $details['Engine'] == 'MyISAM')) { + if (! $offerUnavailableEngines + && ($details['Support'] == 'NO' + || $details['Support'] == 'DISABLED' + || $details['Engine'] == 'PERFORMANCE_SCHEMA') + || (PMA_DRIZZLE && $details['Engine'] == 'MyISAM') + ) { continue; } @@ -124,7 +126,8 @@ class PMA_StorageEngine * * Loads the corresponding engine plugin, if available. * - * @param string $engine The engine ID + * @param string $engine The engine ID + * * @return object The engine plugin */ static public function getEngine($engine) @@ -132,7 +135,8 @@ class PMA_StorageEngine $engine = str_replace('/', '', str_replace('.', '', $engine)); $engine_lowercase_filename = strtolower($engine); if (file_exists('./libraries/engines/' . $engine_lowercase_filename . '.lib.php') - && include_once './libraries/engines/' . $engine_lowercase_filename . '.lib.php') { + && include_once './libraries/engines/' . $engine_lowercase_filename . '.lib.php' + ) { $class_name = 'PMA_StorageEngine_' . $engine; $engine_object = new $class_name($engine); } else { @@ -144,8 +148,9 @@ class PMA_StorageEngine /** * return true if given engine name is supported/valid, otherwise false * + * @param string $engine name of engine + * * @static - * @param string $engine name of engine * @return boolean whether $engine is valid or not */ static public function isValid($engine) @@ -160,7 +165,7 @@ class PMA_StorageEngine /** * returns as HTML table of the engine's server variables * - * @return string The table that was generated based on the retrieved information + * @return string The table that was generated based on the retrieved information */ function getHtmlVariables() { @@ -170,27 +175,27 @@ class PMA_StorageEngine foreach ($this->getVariablesStatus() as $details) { $ret .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td>' . "\n"; - if (!empty($details['desc'])) { + if (! empty($details['desc'])) { $ret .= ' ' . PMA_showHint($details['desc']) . "\n"; } $ret .= ' </td>' . "\n" . ' <th>' . htmlspecialchars($details['title']) . '</th>' . "\n" . ' <td class="value">'; switch ($details['type']) { - case PMA_ENGINE_DETAILS_TYPE_SIZE: - $parsed_size = $this->resolveTypeSize($details['value']); - $ret .= $parsed_size[0] . ' ' . $parsed_size[1]; - unset($parsed_size); + case PMA_ENGINE_DETAILS_TYPE_SIZE: + $parsed_size = $this->resolveTypeSize($details['value']); + $ret .= $parsed_size[0] . ' ' . $parsed_size[1]; + unset($parsed_size); break; - case PMA_ENGINE_DETAILS_TYPE_NUMERIC: - $ret .= PMA_formatNumber($details['value']) . ' '; + case PMA_ENGINE_DETAILS_TYPE_NUMERIC: + $ret .= PMA_formatNumber($details['value']) . ' '; break; - default: - $ret .= htmlspecialchars($details['value']) . ' '; + default: + $ret .= htmlspecialchars($details['value']) . ' '; } $ret .= '</td>' . "\n" . '</tr>' . "\n"; - $odd_row = !$odd_row; + $odd_row = ! $odd_row; } if (! $ret) { @@ -266,12 +271,12 @@ class PMA_StorageEngine /** * Constructor * - * @param string $engine The engine ID + * @param string $engine The engine ID */ function __construct($engine) { $storage_engines = PMA_StorageEngine::getStorageEngines(); - if (!empty($storage_engines[$engine])) { + if (! empty($storage_engines[$engine])) { $this->engine = $engine; $this->title = $storage_engines[$engine]['Engine']; $this->comment @@ -279,18 +284,18 @@ class PMA_StorageEngine ? $storage_engines[$engine]['Comment'] : ''); switch ($storage_engines[$engine]['Support']) { - case 'DEFAULT': - $this->support = PMA_ENGINE_SUPPORT_DEFAULT; - break; - case 'YES': - $this->support = PMA_ENGINE_SUPPORT_YES; - break; - case 'DISABLED': - $this->support = PMA_ENGINE_SUPPORT_DISABLED; - break; - case 'NO': - default: - $this->support = PMA_ENGINE_SUPPORT_NO; + case 'DEFAULT': + $this->support = PMA_ENGINE_SUPPORT_DEFAULT; + break; + case 'YES': + $this->support = PMA_ENGINE_SUPPORT_YES; + break; + case 'DISABLED': + $this->support = PMA_ENGINE_SUPPORT_DISABLED; + break; + case 'NO': + default: + $this->support = PMA_ENGINE_SUPPORT_NO; } } else { $this->engine_init(); @@ -301,7 +306,8 @@ class PMA_StorageEngine * public String getTitle() * * Reveals the engine's title - * @return string The title + * + * @return string The title */ function getTitle() { @@ -312,7 +318,8 @@ class PMA_StorageEngine * public String getComment() * * Fetches the server's comment about this engine - * @return string The comment + * + * @return string The comment */ function getComment() { @@ -327,18 +334,18 @@ class PMA_StorageEngine function getSupportInformationMessage() { switch ($this->support) { - case PMA_ENGINE_SUPPORT_DEFAULT: - $message = __('%s is the default storage engine on this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_YES: - $message = __('%s is available on this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_DISABLED: - $message = __('%s has been disabled for this MySQL server.'); - break; - case PMA_ENGINE_SUPPORT_NO: - default: - $message = __('This MySQL server does not support the %s storage engine.'); + case PMA_ENGINE_SUPPORT_DEFAULT: + $message = __('%s is the default storage engine on this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_YES: + $message = __('%s is available on this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_DISABLED: + $message = __('%s has been disabled for this MySQL server.'); + break; + case PMA_ENGINE_SUPPORT_NO: + default: + $message = __('This MySQL server does not support the %s storage engine.'); } return sprintf($message, htmlspecialchars($this->title)); } @@ -398,9 +405,9 @@ class PMA_StorageEngine * * Generates the requested information page * - * @abstract - * @param string $id The page ID + * @param string $id The page ID * + * @abstract * @return string The page * boolean or false on error. */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index a142249..ebbe124 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -29,7 +29,8 @@ define('PMA_DBI_GETVAR_GLOBAL', 2); /** * Checks whether database extension is loaded * - * @param string $extension mysql extension to check + * @param string $extension mysql extension to check + * * @return bool */ function PMA_DBI_checkDbExtension($extension = 'mysql') @@ -59,7 +60,7 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { $GLOBALS['cfg']['Server']['extension'], false, PMA_showDocu('faqmysql') - ); + ); if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') { $alternativ_extension = 'mysqli'; @@ -73,7 +74,7 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) { $GLOBALS['cfg']['Server']['extension'], true, PMA_showDocu('faqmysql') - ); + ); } $GLOBALS['cfg']['Server']['extension'] = $alternativ_extension; @@ -93,6 +94,7 @@ require_once './libraries/dbi/' * @param mixed $link optional database link to use * @param int $options optional query options * @param bool $cache_affected_rows whether to cache affected rows + * * @return mixed */ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -105,10 +107,11 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows /** * runs a query and returns the result * - * @param string $query query to run - * @param resource $link mysql link resource - * @param integer $options - * @param bool $cache_affected_rows + * @param string $query query to run + * @param resource $link mysql link resource + * @param integer $options query options + * @param bool $cache_affected_rows whether to cache affected row + * * @return mixed */ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) @@ -128,7 +131,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $r = PMA_DBI_real_query($query, $link, $options); if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); } if ($GLOBALS['cfg']['DBG']['sql']) { @@ -176,7 +179,8 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r * uses language to charset mapping from mysql/share/errmsg.txt * and charset names to ISO charset from information_schema.CHARACTER_SETS * - * @param string $message + * @param string $message the message + * * @return string $message */ function PMA_DBI_convert_message($message) @@ -218,24 +222,38 @@ function PMA_DBI_convert_message($message) if (! empty($server_language) && isset($encodings[$server_language])) { if (function_exists('iconv')) { - if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { + if ((@stristr(PHP_OS, 'AIX')) + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0) + ) { include_once './libraries/iconv_wrapper.lib.php'; - $message = PMA_aix_iconv_wrapper($encodings[$server_language], - 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); + $message = PMA_aix_iconv_wrapper( + $encodings[$server_language], + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], + $message + ); } else { - $message = iconv($encodings[$server_language], - 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); + $message = iconv( + $encodings[$server_language], + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], + $message + ); } } elseif (function_exists('recode_string')) { - $message = recode_string($encodings[$server_language] . '..' . 'utf-8', - $message); + $message = recode_string( + $encodings[$server_language] . '..' . 'utf-8', + $message + ); } elseif (function_exists('libiconv')) { $message = libiconv($encodings[$server_language], 'utf-8', $message); } elseif (function_exists('mb_convert_encoding')) { // do not try unsupported charsets if (! in_array($server_language, array('ukrainian', 'greek', 'serbian'))) { - $message = mb_convert_encoding($message, 'utf-8', - $encodings[$server_language]); + $message = mb_convert_encoding( + $message, + 'utf-8', + $encodings[$server_language] + ); } } } else { @@ -250,21 +268,27 @@ function PMA_DBI_convert_message($message) /** * returns array with table names for given db * - * @param string $database name of database - * @param mixed $link mysql link resource|object + * @param string $database name of database + * @param mixed $link mysql link resource|object + * * @return array tables names */ function PMA_DBI_get_tables($database, $link = null) { - return PMA_DBI_fetch_result('SHOW TABLES FROM ' . PMA_backquote($database) . ';', - null, 0, $link, PMA_DBI_QUERY_STORE); + return PMA_DBI_fetch_result( + 'SHOW TABLES FROM ' . PMA_backquote($database) . ';', + null, + 0, + $link, + PMA_DBI_QUERY_STORE + ); } /** * usort comparison callback * - * @param string $a first argument to sort - * @param string $b second argument to sort + * @param string $a first argument to sort + * @param string $b second argument to sort * * @return integer a value representing whether $a should be before $b in the * sorted array or not @@ -303,15 +327,17 @@ function PMA_usort_comparison_callback($a, $b) * PMA_DBI_get_tables_full('my_database', 'my_tables_', 'comment')); * </code> * + * @param string $database database + * @param string|bool $table table or false + * @param boolean|string $tbl_is_group $table is a table group + * @param mixed $link mysql link + * @param integer $limit_offset zero-based offset for the count + * @param boolean|integer $limit_count number of tables to return + * @param string $sort_by table attribute to sort by + * @param string $sort_order direction to sort (ASC or DESC) + * * @todo move into PMA_Table - * @param string $database database - * @param string|bool $table table or false - * @param boolean|string $tbl_is_group $table is a table group - * @param mixed $link mysql link - * @param integer $limit_offset zero-based offset for the count - * @param boolean|integer $limit_count number of tables to return - * @param string $sort_by table attribute to sort by - * @param string $sort_order direction to sort (ASC or DESC) + * * @return array list of tables in given db(s) */ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, @@ -357,7 +383,9 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals if (PMA_DRIZZLE) { $engine_info = PMA_cacheGet('drizzle_engines', true); $stats_join = "LEFT JOIN (SELECT 0 NUM_ROWS) AS stat ON false"; - if (isset($engine_info['InnoDB']) && $engine_info['InnoDB']['module_library'] == 'innobase') { + if (isset($engine_info['InnoDB']) + && $engine_info['InnoDB']['module_library'] == 'innobase' + ) { $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS stat ON (t.ENGINE = 'InnoDB' AND stat.NAME = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)"; } @@ -431,8 +459,9 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $sql .= ' LIMIT ' . $limit_count . ' OFFSET ' . $limit_offset; } - $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'), - null, $link); + $tables = PMA_DBI_fetch_result( + $sql, array('TABLE_SCHEMA', 'TABLE_NAME'), null, $link + ); unset($sql_where_table, $sql); if (PMA_DRIZZLE) { @@ -515,7 +544,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals foreach ($each_tables as $table_name => $each_table) { if ('comment' === $tbl_is_group - && 0 === strpos($each_table['Comment'], $table) + && 0 === strpos($each_table['Comment'], $table) ) { // remove table from list unset($each_tables[$table_name]); @@ -523,7 +552,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals } if (! isset($each_tables[$table_name]['Type']) - && isset($each_tables[$table_name]['Engine'])) { + && isset($each_tables[$table_name]['Engine']) + ) { // pma BC, same parts of PMA still uses 'Type' $each_tables[$table_name]['Type'] =& $each_tables[$table_name]['Engine']; @@ -557,7 +587,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment']; if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW' - && $each_tables[$table_name]['Engine'] == null) { + && $each_tables[$table_name]['Engine'] == null + ) { $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW'; } else { /** @@ -618,8 +649,6 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals /** * returns array with databases containing extended infos about them * - * @todo move into PMA_List_Database? - * * @param string $database database * @param boolean $force_stats retrieve stats also for MySQL < 5 * @param resource $link mysql link @@ -628,6 +657,8 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals * @param integer $limit_offset starting offset for LIMIT * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList'] * + * @todo move into PMA_List_Database? + * * @return array $databases */ function PMA_DBI_get_databases_full($database = null, $force_stats = false, @@ -817,10 +848,10 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, * returns detailed array with all columns for given table in database, * or all tables/databases * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of specific column - * @param mixed $link mysql link resource + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of specific column + * @param mixed $link mysql link resource * * @return array */ @@ -902,15 +933,17 @@ function PMA_DBI_get_columns_full($database = null, $table = null, } else { if (null === $database) { foreach ($GLOBALS['pma']->databases as $database) { - $columns[$database] = PMA_DBI_get_columns_full($database, null, - null, $link); + $columns[$database] = PMA_DBI_get_columns_full( + $database, null, null, $link + ); } return $columns; } elseif (null === $table) { $tables = PMA_DBI_get_tables($database); foreach ($tables as $table) { $columns[$table] = PMA_DBI_get_columns_full( - $database, $table, null, $link); + $database, $table, null, $link + ); } return $columns; } @@ -982,11 +1015,12 @@ function PMA_DBI_get_columns_full($database = null, $table = null, * The 'Key' column is not calculated properly, use PMA_DBI_get_columns() to get * correct values. * + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of column, null to show all columns + * @param boolean $full whether to return full info or only column names + * * @see PMA_DBI_get_columns() - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of column, null to show all columns - * @param boolean $full whether to return full info or only column names * * @return string */ @@ -1044,12 +1078,14 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals /** * Returns descriptions of columns in given table (all or given by $column) * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of column, null to show all columns - * @param boolean $full whether to return full info or only column names - * @param mixed $link mysql link resource - * @return false|array array indexed by column names or, if $column is given, flat array description + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of column, null to show all columns + * @param boolean $full whether to return full info or only column names + * @param mixed $link mysql link resource + * + * @return false|array array indexed by column names or, + * if $column is given, flat array description */ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $link = null) { @@ -1094,9 +1130,10 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $ /** * Returns SQL for fetching information on table indexes (SHOW INDEXES) * -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived -* @param string $where additional conditions for WHERE +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retreived +* @param string $where additional conditions for WHERE +* * @return array $indexes */ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) @@ -1135,9 +1172,10 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null) /** * Returns indexes of a table * -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retrieved -* @param mixed $link mysql link resource +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retrieved +* @param mixed $link mysql link resource +* * @return array $indexes */ function PMA_DBI_get_table_indexes($database, $table, $link = null) @@ -1154,9 +1192,10 @@ function PMA_DBI_get_table_indexes($database, $table, $link = null) /** * returns value of given mysql server variable * - * @param string $var mysql server variable name - * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL - * @param mixed $link mysql link resource|object + * @param string $var mysql server variable name + * @param int $type PMA_DBI_GETVAR_SESSION|PMA_DBI_GETVAR_GLOBAL + * @param mixed $link mysql link resource|object + * * @return mixed value for mysql server variable */ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null) @@ -1170,17 +1209,18 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null } switch ($type) { - case PMA_DBI_GETVAR_SESSION: - $modifier = ' SESSION'; - break; - case PMA_DBI_GETVAR_GLOBAL: - $modifier = ' GLOBAL'; - break; - default: - $modifier = ''; + case PMA_DBI_GETVAR_SESSION: + $modifier = ' SESSION'; + break; + case PMA_DBI_GETVAR_GLOBAL: + $modifier = ' GLOBAL'; + break; + default: + $modifier = ''; } return PMA_DBI_fetch_value( - 'SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', 0, 1, $link); + 'SHOW' . $modifier . ' VARIABLES LIKE \'' . $var . '\';', 0, 1, $link + ); } /** @@ -1198,32 +1238,33 @@ function PMA_DBI_postConnect($link, $is_controluser = false) define( 'PMA_MYSQL_INT_VERSION', PMA_cacheGet('PMA_MYSQL_INT_VERSION', true) - ); + ); define( 'PMA_MYSQL_MAJOR_VERSION', PMA_cacheGet('PMA_MYSQL_MAJOR_VERSION', true) - ); + ); define( 'PMA_MYSQL_STR_VERSION', PMA_cacheGet('PMA_MYSQL_STR_VERSION', true) - ); + ); define( 'PMA_MYSQL_VERSION_COMMENT', PMA_cacheGet('PMA_MYSQL_VERSION_COMMENT', true) - ); + ); } else { $version = PMA_DBI_fetch_single_row( 'SELECT @@version, @@version_comment', 'ASSOC', $link - ); + ); if ($version) { $match = explode('.', $version['@@version']); define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]); - define('PMA_MYSQL_INT_VERSION', - (int) sprintf('%d%02d%02d', $match[0], $match[1], - intval($match[2]))); + define( + 'PMA_MYSQL_INT_VERSION', + (int) sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2])) + ); define('PMA_MYSQL_STR_VERSION', $version['@@version']); define('PMA_MYSQL_VERSION_COMMENT', $version['@@version_comment']); } else { @@ -1236,22 +1277,22 @@ function PMA_DBI_postConnect($link, $is_controluser = false) 'PMA_MYSQL_INT_VERSION', PMA_MYSQL_INT_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_MAJOR_VERSION', PMA_MYSQL_MAJOR_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_STR_VERSION', PMA_MYSQL_STR_VERSION, true - ); + ); PMA_cacheSet( 'PMA_MYSQL_VERSION_COMMENT', PMA_MYSQL_VERSION_COMMENT, true - ); + ); } // detect Drizzle by version number: // <year>.<month>.<build number>(.<patch rev) @@ -1266,13 +1307,13 @@ function PMA_DBI_postConnect($link, $is_controluser = false) "SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE - ); + ); } else { PMA_DBI_query( "SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE - ); + ); } } @@ -1301,14 +1342,15 @@ function PMA_DBI_postConnect($link, $is_controluser = false) * // $user_name = 'John Doe' * </code> * - * @param string|mysql_result $result query or mysql result + * @param string|mysql_result $result query or mysql result * @param integer $row_number row to fetch the value from, - * starting at 0, with 0 beeing default - * @param integer|string $field field to fetch the value from, - * starting at 0, with 0 beeing default - * @param resource $link mysql link - * @return mixed value of first field in first row from result - * or false if not found + * starting at 0, with 0 beeing default + * @param integer|string $field field to fetch the value from, + * starting at 0, with 0 beeing default + * @param resource $link mysql link + * + * @return mixed value of first field in first row from result + * or false if not found */ function PMA_DBI_fetch_value($result, $row_number = 0, $field = 0, $link = null) { @@ -1377,16 +1419,16 @@ function PMA_DBI_fetch_single_row($result, $type = 'ASSOC', $link = null) } switch ($type) { - case 'NUM' : - $fetch_function = 'PMA_DBI_fetch_row'; - break; - case 'ASSOC' : - $fetch_function = 'PMA_DBI_fetch_assoc'; - break; - case 'BOTH' : - default : - $fetch_function = 'PMA_DBI_fetch_array'; - break; + case 'NUM' : + $fetch_function = 'PMA_DBI_fetch_row'; + break; + case 'ASSOC' : + $fetch_function = 'PMA_DBI_fetch_assoc'; + break; + case 'BOTH' : + default : + $fetch_function = 'PMA_DBI_fetch_array'; + break; } $row = $fetch_function($result); @@ -1562,7 +1604,7 @@ function PMA_DBI_getCompatibilities() /** * returns warnings for last query * - * @param resource $link mysql link resource + * @param resource $link mysql link resource * * @return array warnings */ @@ -1606,7 +1648,7 @@ function PMA_isSuperuser() 'SELECT COUNT(*) FROM mysql.user', $GLOBALS['userlink'], PMA_DBI_QUERY_STORE - ); + ); } PMA_cacheSet('is_superuser', $r, true); } else { @@ -1799,6 +1841,7 @@ function PMA_DBI_formatError($error_number, $error_message) * @param string $schema_name Name of schema (database) to test * @param bool $test_for_mysql_schema Whether 'mysql' schema should * be treated the same as IS and DD + * * @return bool */ function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false) diff --git a/server_status.php b/server_status.php index 536c215..6037038 100644 --- a/server_status.php +++ b/server_status.php @@ -169,7 +169,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (count($statusVars)) { $statusVarValues = PMA_DBI_fetch_result( "SHOW GLOBAL STATUS - WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1 + ); } else { $statusVarValues = array(); } @@ -178,7 +179,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (count($serverVars)) { $serverVarValues = PMA_DBI_fetch_result( "SHOW GLOBAL VARIABLES - WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); + WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1 + ); } else { $serverVarValues = array(); } @@ -317,7 +319,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } break; - default: break; + default: + break; } $return['rows'][] = $row; @@ -484,8 +487,9 @@ cleanDeprecated($server_status); */ // Key_buffer_fraction if (isset($server_status['Key_blocks_unused']) - && isset($server_variables['key_cache_block_size']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_cache_block_size']) + && isset($server_variables['key_buffer_size']) +) { $server_status['Key_buffer_fraction_%'] = 100 - $server_status['Key_blocks_unused'] @@ -498,25 +502,28 @@ if (isset($server_status['Key_blocks_unused']) = $server_status['Key_blocks_used'] * 1024 / $server_variables['key_buffer_size']; - } +} // Ratio for key read/write if (isset($server_status['Key_writes']) - && isset($server_status['Key_write_requests']) - && $server_status['Key_write_requests'] > 0) { + && isset($server_status['Key_write_requests']) + && $server_status['Key_write_requests'] > 0 +) { $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; } if (isset($server_status['Key_reads']) - && isset($server_status['Key_read_requests']) - && $server_status['Key_read_requests'] > 0) { + && isset($server_status['Key_read_requests']) + && $server_status['Key_read_requests'] > 0 +) { $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; } // Threads_cache_hitrate if (isset($server_status['Threads_created']) && isset($server_status['Connections']) - && $server_status['Connections'] > 0) { + && $server_status['Connections'] > 0 +) { $server_status['Threads_cache_hitrate_%'] = 100 - $server_status['Threads_created'] / $server_status['Connections'] * 100; hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24499-ge7e5f05

by Madhura Jayaratne

The branch, master has been updated via e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 (commit) from 8fa0b5b57fda035d77382ba96079468486c5df56 (commit) - Log ----------------------------------------------------------------- commit e7e5f058b1b3ead3f94728800e5e1bc36a7b1d09 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Dec 11 14:54:14 2011 +0530 Better AJAX functionality for Tracking page in Database view ----------------------------------------------------------------------- Summary of changes: db_tracking.php | 2 + js/db_structure.js | 63 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index 1078fa2..a448647 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -76,6 +76,7 @@ $all_tables_result = PMA_query_as_controluser($all_tables_query); // If a HEAD version exists if (PMA_DBI_num_rows($all_tables_result) > 0) { ?> + <div id="tracked_tables"> <h3><?php echo __('Tracked tables');?></h3> <table id="versions" class="data"> @@ -146,6 +147,7 @@ if (PMA_DBI_num_rows($all_tables_result) > 0) { ?> </tbody> </table> + </div> <?php } diff --git a/js/db_structure.js b/js/db_structure.js index bb1e38e..70a5932 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -366,7 +366,7 @@ $(document).ready(function() { /** * @var curr_tracking_row Object containing reference to the current tracked table's row */ - var curr_tracking_row = $anchor.parents('tr'); + var $curr_tracking_row = $anchor.parents('tr'); /** * @var question String containing the question to be asked for confirmation */ @@ -378,15 +378,64 @@ $(document).ready(function() { $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function(data) { if(data.success == true) { + var $tracked_table = $curr_tracking_row.parents('table'); + var table_name = $curr_tracking_row.find('td:nth-child(2)').text(); + + // Check how many rows will be left after we remove + if ($tracked_table.find('tbody tr').length === 1) { + // We are removing the only row it has + $('#tracked_tables').hide("slow").remove(); + } else { + // There are more rows left after the deletion + $curr_tracking_row.hide("slow", function () { + $(this).remove(); + // Maybe some row classes are wrong now. Iterate and correct. + var ct = 0; + var rowclass = ''; + $tracked_table.find('tbody tr').each(function () { + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; + $(this).removeClass().addClass(rowclass); + ct++; + }); + }); + } + + // Make the removed table visible in the list of 'Untracked tables'. + $untracked_table = $('table#noversions'); + $untracked_table.find('tbody tr').each(function () { + var $row = $(this); + var tmp_tbl_name = $row.find('td:nth-child(1)').text(); + if (tmp_tbl_name > table_name) { + var $cloned = $row.clone(); + // Change the table name of the cloned row. + $cloned.find('td:first-child').text(table_name); + // Change the link of the cloned row. + var new_url = $cloned + .find('td:nth-child(2) a') + .attr('href') + .replace('table=' + tmp_tbl_name, 'table=' + table_name); + $cloned.find('td:nth-child(2) a').attr('href', new_url); + $cloned.insertBefore($row); + return false; + } + }); + + // Maybe some row classes are wrong now. Iterate and correct. + var ct = 0; + var rowclass = ''; + $untracked_table.find('tbody tr').each(function () { + rowclass = (ct % 2 === 0) ? 'odd' : 'even'; + $(this).removeClass().addClass(rowclass); + ct++; + }); + PMA_ajaxShowMessage(data.message); - $(curr_tracking_row).hide("medium").remove(); - } - else { + } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } - }) // end $.get() - }) // end $.PMA_confirm() - }) //end Drop Tracking + }); // end $.get() + }); // end $.PMA_confirm() + }); //end Drop Tracking //Calculate Real End for InnoDB /** hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24497-g85344d2

by Marc Delisle

The branch, master has been updated via 85344d2bfe7444b7b6c91c86b006a31524cbee0d (commit) from 75aa1aae8936e9ade5efbd7ab045292a41fd754f (commit) - Log ----------------------------------------------------------------- commit 85344d2bfe7444b7b6c91c86b006a31524cbee0d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 10 07:52:47 2011 -0500 rfe #3438266 [designer] Toggle for relation lines ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/pmd/move.js | 10 ++++++++++ pmd_general.php | 10 +++++----- themes/original/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes themes/pmahomme/img/pmd/toggle_lines.png | Bin 0 -> 630 bytes 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 themes/original/img/pmd/toggle_lines.png create mode 100644 themes/pmahomme/img/pmd/toggle_lines.png diff --git a/ChangeLog b/ChangeLog index 220da9c..fb00e58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ phpMyAdmin - ChangeLog + [interface] Improved index editor + View editing via a generated ALTER VIEW - bug #3408377 [interface] Deleting table from the DB does not change the table counter ++ rfe #3438266 [designer] Toggle for relation lines 3.4.9.0 (not yet released) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/js/pmd/move.js b/js/pmd/move.js index df692fd..10a6cf6 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -10,6 +10,7 @@ var _change = 0; // variable to track any change in designer layout. var _staying = 0; // variable to check if the user stayed after seeing the confirmation prompt. + var show_relation_lines = true; // Below is the function to bind onbeforeunload events with the content_frame as well as the top window. @@ -344,6 +345,9 @@ function Line(x1, y1, x2, y2, color_line) */ function Line0(x1, y1, x2, y2, color_line) { + if (! show_relation_lines) { + return; + } Circle(x1, y1, 3, 3, color_line); Rect(x2 - 1, y2 - 2, 4, 4, color_line); @@ -636,6 +640,12 @@ function Small_tab_invert() // invert max/min all tables Re_load(); } +function Relation_lines_invert() +{ + show_relation_lines = ! show_relation_lines; + Re_load(); +} + function Small_tab_refresh() { for (key in j_tabs) { diff --git a/pmd_general.php b/pmd_general.php index aafc5fd..f6f16e2 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -94,11 +94,11 @@ echo $script_tabs . $script_contr . $script_display_field; onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" - /></a><a href="#" onclick="Small_tab_invert(); return false" - class="M_butt" target="_self" - ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" - /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" - /><a href="#" onclick="PDF_save(); return false" + /></a> +<a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" /></a> +<a href="#" onclick="Relation_lines_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle relation lines'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/toggle_lines.png" /></a> +<img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" /> +<a href="#" onclick="PDF_save(); return false" class="M_butt" target="_self" ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a diff --git a/themes/original/img/pmd/toggle_lines.png b/themes/original/img/pmd/toggle_lines.png new file mode 100644 index 0000000..9ab3764 Binary files /dev/null and b/themes/original/img/pmd/toggle_lines.png differ diff --git a/themes/pmahomme/img/pmd/toggle_lines.png b/themes/pmahomme/img/pmd/toggle_lines.png new file mode 100644 index 0000000..9ab3764 Binary files /dev/null and b/themes/pmahomme/img/pmd/toggle_lines.png differ hooks/post-receive -- phpMyAdmin

12 years, 9 months

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

by Michal Čihař

The branch, master has been updated via e4068511fd4ae095f6d4ba0b1f789e86149fd5fd (commit) via f9b5bf57d286cd2938b467ca5ad862a016a54e06 (commit) via 6c7f079181bd6bf02bec403bf18be2616abedaa0 (commit) via 2342e9832184482ad83fa3a21ce1be459abbaf96 (commit) via 6101237e0fd3077f26959b5f6fb103a1063488de (commit) via bff0fe4a4373be5b1026271263e707dac2f369cb (commit) via 6eb0cce86d697d8cf7abc2f8ff76f4d129888772 (commit) via e104a80d020bb8b0618192a60381ffc250cdc579 (commit) via 395e40d259b02d257967d0dd6efd44918dd32576 (commit) via db65f6d79e06f009b1ebabc14ddd717a70b463c9 (commit) via d07df0bcc58f2a4f90f531f5b3e66300f774753d (commit) via d7c9e16ebd6845ca36a22445deca9671f414534d (commit) via 96dfd6af86f3787834a9e6fb8ee2c6eca8f713ef (commit) via 9147cd78311fca59c2d02b5e84a42484c731fe26 (commit) via 5de8f222e48cffef42136771d9e39934048d0fc8 (commit) via 1b3a37d48f2ce8716538c32f1fea7c28386a2831 (commit) via 533f12984f894ae3951b459f2526ea2976348af4 (commit) via e10f80329ec985c6f585e7f48444d1b9a52d9957 (commit) from aeccddc55439e4b6f8365add0f43841d08c3ee5c (commit) - Log ----------------------------------------------------------------- commit e4068511fd4ae095f6d4ba0b1f789e86149fd5fd Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:39:58 2011 +0100 Update generated docs commit f9b5bf57d286cd2938b467ca5ad862a016a54e06 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:14:50 2011 +0200 Translation update done using Pootle. commit 6c7f079181bd6bf02bec403bf18be2616abedaa0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:50 2011 +0200 Translation update done using Pootle. commit 2342e9832184482ad83fa3a21ce1be459abbaf96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:40 2011 +0200 Translation update done using Pootle. commit 6101237e0fd3077f26959b5f6fb103a1063488de Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:13:18 2011 +0200 Translation update done using Pootle. commit bff0fe4a4373be5b1026271263e707dac2f369cb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:11:44 2011 +0200 Translation update done using Pootle. commit 6eb0cce86d697d8cf7abc2f8ff76f4d129888772 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:05:20 2011 +0200 Translation update done using Pootle. commit e104a80d020bb8b0618192a60381ffc250cdc579 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 7 15:00:48 2011 +0200 Translation update done using Pootle. commit 395e40d259b02d257967d0dd6efd44918dd32576 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:13:17 2011 +0200 Translation update done using Pootle. commit db65f6d79e06f009b1ebabc14ddd717a70b463c9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:12:59 2011 +0200 Translation update done using Pootle. commit d07df0bcc58f2a4f90f531f5b3e66300f774753d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 23:11:08 2011 +0200 Translation update done using Pootle. commit d7c9e16ebd6845ca36a22445deca9671f414534d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:46:20 2011 +0200 Translation update done using Pootle. commit 96dfd6af86f3787834a9e6fb8ee2c6eca8f713ef Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:46:00 2011 +0200 Translation update done using Pootle. commit 9147cd78311fca59c2d02b5e84a42484c731fe26 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:45:39 2011 +0200 Translation update done using Pootle. commit 5de8f222e48cffef42136771d9e39934048d0fc8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:45:08 2011 +0200 Translation update done using Pootle. commit 1b3a37d48f2ce8716538c32f1fea7c28386a2831 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 22:44:08 2011 +0200 Translation update done using Pootle. commit 533f12984f894ae3951b459f2526ea2976348af4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 15:29:26 2011 +0200 Translation update done using Pootle. commit e10f80329ec985c6f585e7f48444d1b9a52d9957 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 6 15:28:57 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 50 +++++++++++++++++++++--------------------- po/tr.po | 37 +++++++++++++++++++----------- 2 files changed, 48 insertions(+), 39 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index a276710..a66f519 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -2448,7 +2448,7 @@ title="Sıkça Sorulan Sorular">SSS</abbr> 2.7</a>'ye bakın.</dd> <dt id="cfg_ThemePerServer">$cfg['ThemePerServer'] boolean</dt> <dd>Her sunucu için farklı temaya izin vermek gerekirse.</dd> - <dt id="cfg_DefaultQueryTable">$cfg['DefaultQueryTable'] string<br /> + <dt id="cfg_DefaultQueryTable">$cfg['DefaultQueryTable'] dizgi<br /> <span id="cfg_DefaultQueryDatabase">$cfg['DefaultQueryDatabase']</span> dizgi </dt> @@ -2689,7 +2689,7 @@ sağlar.</p> <p> 5 dosya adı olasılığı vardır:</p> -<ol><li>Mime türü+alt tür dönüşüm:<br /><br /> +<ol><li>Mime türü+alt tür dönüşümü:<br /><br /> <tt>[mimetype]_[subtype]__[transform].inc.php</tt><br /><br /> @@ -2701,7 +2701,7 @@ olmayacak karakterlerin yanısıra PHP işlevi adlandırma kuralını içerebili '<tt>PMA_transform_[mimetype]_[subtype]__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text_html__formatted.inc.php</tt><br /> <tt>PMA_transform_text_html__formatted()</tt></li> @@ -2717,12 +2717,12 @@ işlevi adlandırma kuralını içerebilir.<br /><br /> Dönüştürme işlevi '<tt>PMA_transform_[mimetype]__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text__formatted.inc.php</tt><br /> <tt>PMA_transform_text__formatted()</tt></li> - <li>Belirli dönüştürme işlevsiz mime türü+alt tür<br /><br /> + <li>Belirli dönüştürme işlevsiz, mime türü+alt tür<br /><br /> <tt>[mimetype]_[subtype].inc.php</tt><br /><br /> @@ -2731,12 +2731,12 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın.<br /><br /> Dosyada kendiliğinden tanımlanan dönüşüm işlevi yok.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text_plain.inc.php</tt><br /> - (İşlev yok)</li> + (İşlevi yok)</li> - <li>Belirli dönüştürme işlevsiz mime türü (alt tür ile/ile değil)<br /><br /> + <li>Belirli dönüştürme işlevsiz, mime türü (alt tür ile/ile değil)<br /><br /> <tt>[mimetype].inc.php</tt><br /><br /> @@ -2746,10 +2746,10 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın. Dosyada kendiliğinden tanımlanan dönüşüm işlevi yok.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>text.inc.php</tt><br /> - (İşlev yok)</li> + (İşlevi yok)</li> <li>Belirli mime türü olmayan genel dönüştürme işlevi<br /><br /> @@ -2758,7 +2758,7 @@ sistemiyle sorunlara sebep olan özel karakterler kullanmayın. Dönüştürme işlevi '<tt>PMA_transform_global__[transform]()</tt>' olarak adlandırılacaktır.<br /><br /> - <b>Example:</b><br /><br /> + <b>Örnek:</b><br /><br /> <tt>global__formatted</tt><br /> <tt>PMA_transform_global__formatted()</tt></li> @@ -2805,7 +2805,7 @@ etmez ve dönüştürme hakkında bilgiyle dizilimi geri döndürür. Şimdilik aşağıdaki anahtarlar kullanılabilir: </p> <dl> - <dt><code>bilgi</code></dt> + <dt><code>info</code></dt> <dd>Uzun dönüşüm açıklaması.</dd> </dl> @@ -2914,31 +2914,31 @@ kaydedilir.<br /> dosyaların gönderilmesini oldukça güvenli yaparak etkinleştirmek için:</p> <ul><li>göndermeler için ayrı dizin oluşturun: <tt>mkdir /tmp/php</tt></li> - <li>give ownership to the Apache server's user.group: <tt>chown apache.apache + <li>Apache sunucusunun kullanıcı grubuna sahiplik verin: <tt>chown apache.apache /tmp/php</tt></li> - <li>give proper permission: <tt>chmod 600 /tmp/php</tt></li> - <li>put <tt>upload_tmp_dir = /tmp/php</tt> in <i>php.ini</i></li> - <li>restart Apache</li> + <li>tam izin verin: <tt>chmod 600 /tmp/php</tt></li> + <li><i>php.ini</i> içine <tt>upload_tmp_dir = /tmp/php</tt> koyun</li> + <li>Apache'yi yeniden başlatın</li> </ul> <h4 id="faq1_9"> - <a href="#faq1_9">1.9 (withdrawn).</a></h4> + <a href="#faq1_9">1.9 (kaldırıldı).</a></h4> <h4 id="faq1_10"> - <a href="#faq1_10">1.10 I'm having troubles when uploading files with -phpMyAdmin running on a secure server. My browser is Internet Explorer and -I'm using the Apache server.</a></h4> + <a href="#faq1_10">1.10 Güvenli bir sunucu üzerinde çalışan phpMyAdmin ile +dosyaları gönderirken sorun yaşıyorum. Tarayıcım Internet Explorer ve Apache +sunucusu kullanıyorum.</a></h4> -<p> As suggested by "Rob M" in the phpWizard forum, add this line to -your <i>httpd.conf</i>:</p> +<p> phpWizard forumunda "Rob M"'in önerdiğine göre bu satırı +<i>httpd.conf</i> dosyanızın içine ekleyin:</p> <pre>SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown</pre> -<p> It seems to clear up many problems between Internet Explorer and SSL.</p> +<p> Internet Explorer ve SSL arasındaki çoğu sorunu hallettiği görünüyor.</p> <h4 id="faq1_11"> - <a href="#faq1_11">1.11 I get an 'open_basedir restriction' while uploading -a file from the query box.</a></h4> + <a href="#faq1_11">1.11 Sorgu kutusundan bir dosya gönderirken bir +'open_basedir kısıtlaması' alıyorum.</a></h4> <p> Since version 2.2.4, phpMyAdmin supports servers with open_basedir restrictions. However you need to create temporary directory and configure diff --git a/po/tr.po b/po/tr.po index 38711bb..fec18c5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-22 13:50+0100\n" -"PO-Revision-Date: 2011-12-05 23:57+0200\n" +"PO-Revision-Date: 2011-12-07 15:13+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6496,7 +6496,7 @@ msgstr "Her sunucu için farklı temaya izin vermek gerekirse." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2306 msgid "$cfg['DefaultQueryTable'] string" -msgstr "" +msgstr "$cfg['DefaultQueryTable'] dizgi" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2307 @@ -7194,7 +7194,7 @@ msgstr "5 dosya adı olasılığı vardır:" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2525 msgid "A mimetype+subtype transform:" -msgstr "Mime türü+alt tür dönüşüm:" +msgstr "Mime türü+alt tür dönüşümü:" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2527 @@ -7228,7 +7228,7 @@ msgstr "" #: orig-docs/Documentation.html:2569 orig-docs/Documentation.html:2584 #: orig-docs/Documentation.html:2596 msgid "<b>Example:</b>" -msgstr "" +msgstr "<b>Örnek:</b>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2539 @@ -7283,7 +7283,7 @@ msgstr "<tt>PMA_transform_text__formatted()</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2559 msgid "A mimetype+subtype without specific transform function" -msgstr "Belirli dönüştürme işlevsiz mime türü+alt tür" +msgstr "Belirli dönüştürme işlevsiz, mime türü+alt tür" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2561 @@ -7312,12 +7312,12 @@ msgstr "<tt>text_plain.inc.php</tt>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2572 orig-docs/Documentation.html:2587 msgid "(No function)" -msgstr "(İşlev yok)" +msgstr "(İşlevi yok)" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2574 msgid "A mimetype (w/o subtype) without specific transform function" -msgstr "Belirli dönüştürme işlevsiz mime türü (alt tür ile/ile değil)" +msgstr "Belirli dönüştürme işlevsiz, mime türü (alt tür ile/ile değil)" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:2576 @@ -7478,7 +7478,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2642 msgid "<code>info</code>" -msgstr "<code>bilgi</code>" +msgstr "<code>info</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:2643 @@ -7759,26 +7759,28 @@ msgid "" "give ownership to the Apache server's user.group: <tt>chown apache.apache /" "tmp/php</tt>" msgstr "" +"Apache sunucusunun kullanıcı grubuna sahiplik verin: <tt>chown apache.apache " +"/tmp/php</tt>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2746 msgid "give proper permission: <tt>chmod 600 /tmp/php</tt>" -msgstr "" +msgstr "tam izin verin: <tt>chmod 600 /tmp/php</tt>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2747 msgid "put <tt>upload_tmp_dir = /tmp/php</tt> in <i>php.ini</i>" -msgstr "" +msgstr "<i>php.ini</i> içine <tt>upload_tmp_dir = /tmp/php</tt> koyun" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:2748 msgid "restart Apache" -msgstr "" +msgstr "Apache'yi yeniden başlatın" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2752 msgid "<a href=\"#faq1_9\">1.9 (withdrawn).</a>" -msgstr "" +msgstr "<a href=\"#faq1_9\">1.9 (kaldırıldı).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2755 @@ -7787,6 +7789,9 @@ msgid "" "phpMyAdmin running on a secure server. My browser is Internet Explorer and " "I'm using the Apache server.</a>" msgstr "" +"<a href=\"#faq1_10\">1.10 Güvenli bir sunucu üzerinde çalışan phpMyAdmin ile " +"dosyaları gönderirken sorun yaşıyorum. Tarayıcım Internet Explorer ve Apache " +"sunucusu kullanıyorum.</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2759 @@ -7794,17 +7799,19 @@ msgid "" "As suggested by "Rob M" in the phpWizard forum, add this line to " "your <i>httpd.conf</i>:" msgstr "" +"phpWizard forumunda "Rob M"'in önerdiğine göre bu satırı " +"<i>httpd.conf</i> dosyanızın içine ekleyin:" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:2762 #, no-wrap msgid "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" -msgstr "" +msgstr "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2764 msgid "It seems to clear up many problems between Internet Explorer and SSL." -msgstr "" +msgstr "Internet Explorer ve SSL arasındaki çoğu sorunu hallettiği görünüyor." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2767 @@ -7812,6 +7819,8 @@ msgid "" "<a href=\"#faq1_11\">1.11 I get an 'open_basedir restriction' while " "uploading a file from the query box.</a>" msgstr "" +"<a href=\"#faq1_11\">1.11 Sorgu kutusundan bir dosya gönderirken bir " +"'open_basedir kısıtlaması' alıyorum.</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2770 hooks/post-receive -- phpMyAdmin localized documentation

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24496-g75aa1aa

by Michal Čihař

The branch, master has been updated via 75aa1aae8936e9ade5efbd7ab045292a41fd754f (commit) via 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit) from 7c3c2e9250764f6746b49cbdc79983e7b8a82c28 (commit) - Log ----------------------------------------------------------------- commit 75aa1aae8936e9ade5efbd7ab045292a41fd754f Merge: 7c3c2e9 629c5cb Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:18:09 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-14-g629c5cb

by Michal Čihař

The branch, QA_3_4 has been updated via 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit) from 2f342d7231e9c907c026aea5edbf33966594d30e (commit) - Log ----------------------------------------------------------------- commit 629c5cbc3458ff6190bcada0080f1d065bb124ca Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Dec 8 15:13:49 2011 +0100 Update translations from master ----------------------------------------------------------------------- Summary of changes: po/pl.po | 17 +++- po/uk.po | 269 ++++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 169 insertions(+), 117 deletions(-) diff --git a/po/pl.po b/po/pl.po index 09396ec..afbf51a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2220,7 +2220,7 @@ msgstr "Pełna - wyświetl wszystkie opcje konfiguracyjne" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Pełna - jak wyżej, ale bez wyboru Szybki/Pełny" #: libraries/config.values.php:119 #, fuzzy @@ -2545,7 +2545,7 @@ msgstr "Wyświetl serwery w postaci listy" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Edycja zapytań SQL w oknie popup" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2567,7 +2567,7 @@ msgstr "Ignoruj błędy" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Pokaż ikony ostrzeżenia, komunikaty o błędach i komunikaty" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" @@ -2874,7 +2874,7 @@ msgstr "Ogólne" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Zestaw najczęściej używane opcje" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -3041,6 +3041,8 @@ msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Śledzenie zmian w bazie danych. Wymaga przechowywania konfiguracji " +"phpMyAdmin." #: libraries/config/messages.inc.php:206 msgid "Customize export options" @@ -3558,6 +3560,9 @@ msgid "" "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" msgstr "" +"Wyłącz ostrzeżenie domyślnie wyświetlane w szczegółach bazy danych struktury " +"strony, jeśli którejkolwiek z tabel do przechowywania konfiguracji " +"phpMyAdmin nie można znaleźć" #: libraries/config/messages.inc.php:329 msgid "Missing phpMyAdmin configuration storage tables" @@ -3638,7 +3643,7 @@ msgstr "Liczba wątków naprawiających" #: libraries/config/messages.inc.php:349 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Pokaż przycisk pomocy zamiast tekstu Dokumentacji" #: libraries/config/messages.inc.php:350 msgid "Show help button" @@ -4025,6 +4030,7 @@ msgstr "Dodaj DROP VIEW" #: libraries/config/messages.inc.php:425 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Definiuje listę instrukcji automatycznego tworzenia używa nowych wersji." #: libraries/config/messages.inc.php:426 #, fuzzy @@ -4047,6 +4053,7 @@ msgid "" "Whether the tracking mechanism creates versions for tables and views " "automatically." msgstr "" +"Nawet mechanizm śledzenia tworzy wersje dla tabel i widoków automatycznie." #: libraries/config/messages.inc.php:430 #, fuzzy diff --git a/po/uk.po b/po/uk.po index 550bc1c..901ed87 100644 --- a/po/uk.po +++ b/po/uk.po @@ -615,17 +615,19 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "" +"Вигляд має щонайменше цю кількість рядків. Будь-ласка звернітся до " +"%sдокументації%s." #: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:137 #: libraries/tbl_info.inc.php:60 tbl_structure.php:206 test/theme.php:73 msgid "View" -msgstr "" +msgstr "Вигляд" #: db_structure.php:444 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:163 server_status.php:383 msgid "Replication" -msgstr "" +msgstr "Реплікація" #: db_structure.php:448 msgid "Sum" @@ -634,7 +636,7 @@ msgstr "Всього" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s механізм зберігання за замовчуванням на цьому MySQL сервері." #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2217 libraries/display_tbl.lib.php:2222 @@ -658,7 +660,7 @@ msgstr "Зняти усі відмітки" #: db_structure.php:495 msgid "Check tables having overhead" -msgstr "" +msgstr "Перевірити чи мають таблиці накладні витрати" #: db_structure.php:503 libraries/config/messages.inc.php:162 #: libraries/db_links.inc.php:56 libraries/display_tbl.lib.php:2230 @@ -709,7 +711,7 @@ msgstr "Словник даних" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "" +msgstr "Відслідковувані таблиці" #: db_tracking.php:84 libraries/config/messages.inc.php:482 #: libraries/export/htmlword.php:89 libraries/export/latex.php:162 @@ -751,36 +753,38 @@ msgstr "Дія" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "" +msgstr "Видалити дані спостереження для цієї таблиці" +# активна #: db_tracking.php:119 tbl_tracking.php:543 tbl_tracking.php:601 msgid "active" -msgstr "" +msgstr "активний" +# не активна #: db_tracking.php:121 tbl_tracking.php:545 tbl_tracking.php:603 msgid "not active" -msgstr "" +msgstr "не активний" #: db_tracking.php:134 msgid "Versions" -msgstr "" +msgstr "Версії" #: db_tracking.php:135 tbl_tracking.php:374 tbl_tracking.php:621 msgid "Tracking report" -msgstr "" +msgstr "Звіт трекінгу (відстеження)" #: db_tracking.php:136 tbl_tracking.php:246 tbl_tracking.php:623 msgid "Structure snapshot" -msgstr "" +msgstr "Знімок структури" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "" +msgstr "Невідслідковувані таблиці" #: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:626 #: tbl_structure.php:628 msgid "Track table" -msgstr "" +msgstr "Відслідковувати таблицю" #: db_tracking.php:229 msgid "Database Log" @@ -801,15 +805,15 @@ msgstr "" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Вивід" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Скопіювати та вставити об'єднанні значення в \"Довжина/Значення\" поле" #: export.php:73 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "Обранний тип експорту збережений в файл!" #: export.php:164 export.php:189 export.php:670 #, php-format @@ -840,6 +844,9 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation" "%s for ways to workaround this limit." msgstr "" +"Ви напевно намагаєтесь завантажити занадто великий файл. Будь ласка " +"зверніться до %sдокументації%s для знаходження шляхів вирішення цієї " +"проблеми." #: import.php:278 import.php:331 libraries/File.class.php:501 #: libraries/File.class.php:611 @@ -854,6 +861,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 "" @@ -861,10 +870,15 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"Даних для імпорту небуло отримано. Назви файлу не було вказано або розмір " +"файлу перевищив допустимий максимум для вашої PHP конфігурації. Дивіться " +"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" msgstr "" +"Неможливо завантажити імпортовані плагіни, будь ласка перевірте ваше " +"інсталювання!" #: import.php:396 msgid "The bookmark has been deleted." @@ -872,29 +886,34 @@ msgstr "Закладку було видалено." #: import.php:400 msgid "Showing bookmark" -msgstr "" +msgstr "Показані закладки" #: import.php:402 sql.php:885 #, php-format msgid "Bookmark %s created" -msgstr "" +msgstr "Закладка %s створена" #: 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 "" +"Досягнуто часове обмеження віконання скрипту, якщо Ви бажаєте закінчити " +"імпорт, необхідно повторно відправити той самий файл." #: import.php:425 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"На останньому запиті не було розібрано даних, зазвичай це означає що " +"phpMyAdmin не зможе закінчити цей імпорт якщо Ви на збільшите час виконання " +"PHP скриптів." #: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2113 libraries/sql_query_form.lib.php:139 @@ -933,7 +952,7 @@ msgstr "Ви насправді хочете " #: js/messages.php:31 libraries/mult_submits.inc.php:242 sql.php:278 msgid "You are about to DESTROY a complete database!" -msgstr "" +msgstr "Ви збираєтесь здійснити ЗНИЩЕННЯ БД!" #: js/messages.php:32 msgid "Dropping Event" @@ -949,7 +968,7 @@ msgstr "Видалення даних трекінгу" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Знищення Головного Ключа/Індексу" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -957,12 +976,12 @@ msgstr "Ця операція може зайняти багато часу. П #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Ви збираєтесь здійснити ВИМКНЕННЯ BLOB-репозиторію!" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "Ви впевненні що хочете вимкнути всі BLOB посилання для БД %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1029,11 +1048,11 @@ msgstr "Помилка при обробці запиту" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Видалення стовпчика" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Додавання Головного Ключа" #: js/messages.php:68 libraries/relation.lib.php:87 pmd_general.php:386 #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 @@ -1118,15 +1137,15 @@ msgstr "Ігнорувати" #: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "Обрати ключі посилання" #: js/messages.php:102 msgid "Select Foreign Key" -msgstr "" +msgstr "Обрати зовнішній ключ" #: js/messages.php:103 msgid "Please select the primary key or a unique key" -msgstr "" +msgstr "Будь ласка, оберіть первинний ключ або унікальний ключ" #: js/messages.php:104 pmd_general.php:87 tbl_relation.php:538 msgid "Choose column to display" @@ -1134,7 +1153,7 @@ msgstr "Виберіть колонку для відображення" #: js/messages.php:107 msgid "Add an option for column " -msgstr "" +msgstr "Додати опцію для колонки" #: js/messages.php:110 msgid "Generate password" @@ -1158,11 +1177,13 @@ msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." msgstr "" +"Доступна новіша версія PhpMyAdmin, вам необхідно подумати про оновлення. " +"Найновіша версія% s., випущена % s." #. l10n: Latest available phpMyAdmin version #: js/messages.php:120 msgid ", latest stable version:" -msgstr "" +msgstr ", остання стабільна версія:" #. l10n: Display text for calendar close link #: js/messages.php:138 @@ -1397,11 +1418,11 @@ msgstr "Сб" #. l10n: Column header for week of the year in calendar #: js/messages.php:227 msgid "Wk" -msgstr "" +msgstr "Тж" #: js/messages.php:229 msgid "Hour" -msgstr "" +msgstr "Година" #: js/messages.php:230 msgid "Minute" @@ -1417,21 +1438,23 @@ msgstr "Розмір шрифту" #: libraries/File.class.php:310 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "Завантажуваний файл перевищує директиву upload_max_filesize в php.ini." #: libraries/File.class.php:313 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Завантажуваний файл перевищує MAX_FILE_SIZE директиву, яка була вказана в " +"HTML формі." #: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "Завантажуваний файл був завантажений лише частково." #: libraries/File.class.php:319 msgid "Missing a temporary folder." -msgstr "" +msgstr "Відсутня тимчасова дирикторія." #: libraries/File.class.php:322 msgid "Failed to write file to disk." @@ -1439,7 +1462,7 @@ msgstr "Неможливо записати файл на диск." #: libraries/File.class.php:325 msgid "File upload stopped by extension." -msgstr "" +msgstr "Завантаження зупинено розширенням." #: libraries/File.class.php:328 msgid "Unknown error in file upload." @@ -1450,6 +1473,8 @@ msgid "" "Error moving the uploaded file, see [a@./Documentation." "html#faq1_11@Documentation]FAQ 1.11[/a]" msgstr "" +"Помилка прі переммщенні файлу, a@./Documentation.html#faq1_11@Documentation]" +"FAQ 1.11[/a]" #: libraries/Index.class.php:427 tbl_relation.php:519 msgid "No index defined!" @@ -1468,7 +1493,7 @@ msgstr "Унікальне" #: libraries/Index.class.php:444 tbl_tracking.php:318 msgid "Packed" -msgstr "" +msgstr "Запакований" #: libraries/Index.class.php:446 tbl_tracking.php:320 msgid "Cardinality" @@ -1493,6 +1518,8 @@ msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." msgstr "" +"Схоже що індекси %1$s та %2$s ідентичні, тому напевне один із них може бути " +"вилученим." #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:175 #: libraries/server_links.inc.php:42 server_databases.php:100 @@ -1531,26 +1558,26 @@ msgstr[1] "" #: libraries/StorageEngine.class.php:194 msgid "" "There is no detailed status information available for this storage engine." -msgstr "" +msgstr "Для цього механізму зберігання нама дельної інформації про статус." #: libraries/StorageEngine.class.php:354 #, php-format msgid "%s is available on this MySQL server." -msgstr "" +msgstr "%s доступне на цьому MySQL сервері." #: libraries/StorageEngine.class.php:357 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "" +msgstr "%s було вимкнене для цього MySQL серверу." #: libraries/StorageEngine.class.php:361 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "" +msgstr "Цей MySQL сервер не підтримує %s кодування." #: libraries/Table.class.php:1017 msgid "Invalid database" -msgstr "" +msgstr "Поламана БД" #: libraries/Table.class.php:1031 tbl_get_field.php:25 msgid "Invalid table name" @@ -1559,7 +1586,7 @@ msgstr "Неправильна назва таблиці" #: libraries/Table.class.php:1046 #, php-format msgid "Error renaming table %1$s to %2$s" -msgstr "" +msgstr "Помилка зміни назви %1$s на %2$s" #: libraries/Table.class.php:1129 #, php-format @@ -1569,30 +1596,30 @@ msgstr "Таблицю %s було перейменовано в %s" #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" +msgstr "Не знайдено правильного шляху до зображення для теми %s!" #: libraries/Theme.class.php:380 msgid "No preview available." -msgstr "" +msgstr "Намає доступного перегляду." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "прийняти його" #: libraries/Theme_Manager.class.php:109 #, php-format msgid "Default theme %s not found!" -msgstr "" +msgstr "Тема за замовчуванням %s не знайдена!" #: libraries/Theme_Manager.class.php:147 #, php-format msgid "Theme %s not found!" -msgstr "" +msgstr "Тема %s не знайдена!" #: libraries/Theme_Manager.class.php:215 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" +msgstr "Шлях теми не знайдений для теми %s!" #: libraries/Theme_Manager.class.php:295 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1601,7 +1628,7 @@ msgstr "" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." -msgstr "" +msgstr "З'єднання неможливе: невірні налаштування." #: libraries/auth/config.auth.lib.php:91 #: libraries/auth/cookie.auth.lib.php:205 libraries/auth/http.auth.lib.php:64 @@ -1616,6 +1643,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"Ви, напевно, не створили файл конфігурації. Для його створення Ви можете " +"використати %1$ssetup script%2$s." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -1644,7 +1673,7 @@ msgstr "Документація по phpMyAdmin" #: libraries/auth/cookie.auth.lib.php:244 #: libraries/auth/cookie.auth.lib.php:245 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "Ви можете ввести ім'я хоста / IP-адресу та порт через пробіл." #: libraries/auth/cookie.auth.lib.php:244 msgid "Server:" @@ -1676,7 +1705,7 @@ msgstr "Авторизація без паролю заборонена в на #: libraries/auth/signon.auth.lib.php:226 #, php-format msgid "No activity within %s seconds; please log in again" -msgstr "" +msgstr "Відсутня діяльність протягом %s секунд; будь ласка, увійдіть знову" #: libraries/auth/cookie.auth.lib.php:658 #: libraries/auth/cookie.auth.lib.php:660 @@ -1688,19 +1717,20 @@ msgstr "Не можу зареєструватися на MySQL сервері" msgid "Wrong username/password. Access denied." msgstr "Невірний логін/пароль. Доступ не дозволено." +# Файл %s не містить id ключа #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "Файл %s не містить ідентифікатора (id) ключа" #: libraries/auth/swekey/swekey.auth.lib.php:159 #: libraries/auth/swekey/swekey.auth.lib.php:182 msgid "Hardware authentication failed" -msgstr "" +msgstr "Апаратна аутентифікація не вдалася" #: libraries/auth/swekey/swekey.auth.lib.php:168 msgid "No valid authentication key plugged" -msgstr "" +msgstr "Не підключений валідний ключ аутентифікації" #: libraries/auth/swekey/swekey.auth.lib.php:204 msgid "Authenticating..." @@ -1708,15 +1738,15 @@ msgstr "Авторизуємося..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS помилка" #: libraries/blobstreaming.lib.php:267 msgid "PBMS connection failed:" -msgstr "" +msgstr "PBMS підключення не вдалося:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS get BLOB info не вдалося:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" @@ -1724,28 +1754,28 @@ msgstr "" #: libraries/blobstreaming.lib.php:347 msgid "View image" -msgstr "" +msgstr "Переглянути картинку" #: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "Програти аудіо" #: libraries/blobstreaming.lib.php:356 msgid "View video" -msgstr "" +msgstr "Програти відео" #: libraries/blobstreaming.lib.php:360 msgid "Download file" -msgstr "" +msgstr "Завантажити файл" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Не вдається відкрити файл: %s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "загальні" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:181 libraries/export/xml.php:36 @@ -1783,11 +1813,11 @@ msgstr "Перейти до бази даних" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "Не репліковані" #: libraries/build_html_for_db.lib.php:136 msgid "Replicated" -msgstr "" +msgstr "Репліковані" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1842,7 +1872,7 @@ msgstr "" #: libraries/common.inc.php:585 #, php-format msgid "Could not load default configuration from: %1$s" -msgstr "" +msgstr "Неможливо завантажити стандартну функціональність із: %1$s" #: libraries/common.inc.php:590 msgid "" @@ -1855,12 +1885,14 @@ msgstr "" #: libraries/common.inc.php:620 #, php-format msgid "Invalid server index: %s" -msgstr "" +msgstr "Не вірний індекс сервера: %s" #: libraries/common.inc.php:627 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" +"Не вірна назва хоста для сервера %1$s. Будь ласка перевірте Вашу " +"конфігурацію." #: libraries/common.inc.php:636 libraries/config/messages.inc.php:486 #: libraries/header.inc.php:115 main.php:163 server_synchronize.php:1175 @@ -1870,17 +1902,17 @@ msgstr "Сервер" #: libraries/common.inc.php:819 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "Невірний метод аутентифікації встановленний в налаштуваннях:" #: libraries/common.inc.php:922 #, php-format msgid "You should upgrade to %s %s or later." -msgstr "" +msgstr "Вам необхідно оновити до %s %s або пізнішої." #: libraries/common.lib.php:142 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "Максимум: %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:404 @@ -1923,7 +1955,7 @@ msgstr "Відповідь MySQL: " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "Не вдалося пид'єднатися до SQL валідатора!" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -1956,7 +1988,7 @@ msgstr "Перевірити SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "Рядкове редагування цього запиту" #: libraries/common.lib.php:1267 msgid "Inline" @@ -1964,7 +1996,7 @@ msgstr "" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "Профілювання" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2045,7 +2077,7 @@ msgstr "Перейти до бази даних "%s"." #: libraries/common.lib.php:2466 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "На функціональність %s впливає відома помилка, див. %s" #: libraries/common.lib.php:2826 libraries/common.lib.php:2833 #: libraries/common.lib.php:3018 libraries/config/setup.forms.php:285 @@ -2082,7 +2114,7 @@ msgstr "Операцій" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "Переглянути Ваш комп'ютер:" #: libraries/common.lib.php:2979 #, php-format @@ -2096,15 +2128,15 @@ msgstr "Встановлений Вами каталог для завантаж #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "Немає файлів для завантаження" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "Обидва" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "Відкрити" #: libraries/config.values.php:74 #, fuzzy @@ -2117,13 +2149,13 @@ msgstr "Не закриті лапки" #: libraries/export/sql.php:79 libraries/export/texytext.php:23 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "структура" #: libraries/config.values.php:96 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "дані" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2133,15 +2165,15 @@ msgstr "структура і дані" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Швидко - відображати лише мінімальну кількість параметрів налаштування" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Кастомно - відобразити всі можливі параметри налаштування" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Кастомний - як попередній але без варіантів швидко/кастомно" #: libraries/config.values.php:119 msgid "complete inserts" @@ -2153,26 +2185,26 @@ msgstr "розширені вставки" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "обидва попередні" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "жоден з попередніх " #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "Не додатнє число" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "Не від'ємне число" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "Невірний номер порту" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 @@ -2184,12 +2216,12 @@ msgstr "Некоректне значення" #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Значення має дорівнювати або бути меншим аніж %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "Пропущені дані для %s" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2200,21 +2232,21 @@ msgstr "недоступний" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" потребує додаток %s" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "імпорт не буде працювати, відсутня функція (%s)" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "експорт не буде працювати, відсутня функція (%s)" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL Валідатор вимкнений" #: libraries/config/FormDisplay.class.php:773 msgid "SOAP extension not found" @@ -2223,11 +2255,12 @@ msgstr "SOA розширення не знайдено" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "максимум %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Цей параметр відключений, він не буде застосовуватися до вашої конфігурації" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2237,16 +2270,16 @@ msgstr "заблоковано" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "Встановити значення: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:351 msgid "Restore default value" -msgstr "" +msgstr "Відновити значення за замовчуванням" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Дозволити користувачам налаштовувати це значення" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2256,7 +2289,7 @@ msgstr "Перевстановити" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "Підвищує ефективність оновлення екрану" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2268,10 +2301,12 @@ msgstr "дозволено" msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" +"Якщо включений користувач може ввести будь-який сервер MySQL у формі Увійти " +"для кукі аутентифікації" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" -msgstr "" +msgstr "Дозволити Увійти в будь-який сервер MySQL" #: libraries/config/messages.inc.php:21 msgid "" @@ -2279,46 +2314,53 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Включення цьго дозволяє сторінці, розташованої на іншому домені викликати " +"PhpMyAdmin всередині фрейму, і це потенціальна [сильне] дірка в безпеці [/ " +"сильний] що дозволяє крос-фреймові сценарії атак" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Дозволити фреймінг для третіх сторін" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Показувати "Знищити БД" звичайним користувачам" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Секретна фраза використовується для шифрування кукі в [kbd]cookie[/kbd] " +"аутентифікації" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Blowfish секрет" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Виділити обрані рядки" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Маркер рядка" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Виділяти радок курсором миші" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Покажчик виділення" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"Вімкнути [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] компресію для " +"операцій імпорту та експорту" #: libraries/config/messages.inc.php:31 msgid "Bzip2" @@ -2330,10 +2372,13 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Визначає, який тип редагування контролю повинен бути використаний для CHAR і " +"VARCHAR стовпців; [kbd]input[/kbd] - довжина тексту, [kbd]textarea[/kbd] - " +"дозволена кількість рядків в стовпцях" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "CHAR редагування стовпців" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -4647,7 +4692,7 @@ msgstr "Перетворення МІМЕ-типу бровзером" #: libraries/display_tbl.lib.php:1218 msgid "Copy" -msgstr "" +msgstr "Копіювати" #: libraries/display_tbl.lib.php:1233 libraries/display_tbl.lib.php:1245 msgid "The row has been deleted" @@ -6640,7 +6685,7 @@ msgstr "Показати інформацію про PHP" #: main.php:215 msgid "Wiki" -msgstr "" +msgstr "Вікі" #: main.php:218 msgid "Official Homepage" @@ -6752,7 +6797,7 @@ msgstr "БД відсутні" #: navigation.php:277 msgid "Filter" -msgstr "" +msgstr "Фільтр" #: navigation.php:277 #, fuzzy hooks/post-receive -- phpMyAdmin

12 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2011