- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2043-g22bb1aa
by Mike Homme 11 Mar '11

11 Mar '11

The branch, master has been updated via 22bb1aa134cdb52a37c06f8fbe83d8534e01a475 (commit) via 84b3135b2e0afe023793668ba0d774bd4254b986 (commit) from d38156b71d9d4d1c1c2b067bb8e18932ff6d2265 (commit) - Log ----------------------------------------------------------------- commit 22bb1aa134cdb52a37c06f8fbe83d8534e01a475 Merge: 84b3135b2e0afe023793668ba0d774bd4254b986 d38156b71d9d4d1c1c2b067bb8e18932ff6d2265 Author: Mike Hommé <mike(a)globalcode.org> Date: Fri Mar 11 17:04:38 2011 -0500 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 84b3135b2e0afe023793668ba0d774bd4254b986 Author: Mike Hommé <mike(a)globalcode.org> Date: Fri Mar 11 17:03:13 2011 -0500 Removed 100% width on .data selector. Was causing UI problems. ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 3e63d05..924a729 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -57,7 +57,6 @@ h2 a img{display:inline;} .data{ -width:100%; margin: 0 0 12px 0; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2041-gd38156b
by Piotr Przybylski 11 Mar '11

11 Mar '11

The branch, master has been updated via d38156b71d9d4d1c1c2b067bb8e18932ff6d2265 (commit) from f64f1d3ef0fe99a0155bc5db539cf61de8b3ee3b (commit) - Log ----------------------------------------------------------------- commit d38156b71d9d4d1c1c2b067bb8e18932ff6d2265 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Mar 11 22:27:39 2011 +0100 fix -/- switching in slider effect ----------------------------------------------------------------------- Summary of changes: js/functions.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index 72abde4..8abdc51 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2131,15 +2131,16 @@ function PMA_init_slider() { $('.pma_auto_slider').each(function(idx, e) { if ($(e).hasClass('slider_init_done')) return; $(e).addClass('slider_init_done'); - $('<span id="anchor_status_' + e.id + '"><span>') + $('<span id="anchor_status_' + e.id + '"></span>') .insertBefore(e); PMA_set_status_label(e.id); $('<a href="#' + e.id + '" id="anchor_' + e.id + '">' + e.title + '</a>') .insertBefore(e) .click(function() { - $('#' + e.id).toggle('clip'); - PMA_set_status_label(e.id); + $('#' + e.id).toggle('clip', function() { + PMA_set_status_label(e.id); + }); return false; }); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2037-gddae18b
by Marc Delisle 11 Mar '11

11 Mar '11

The branch, master has been updated via ddae18b7db27237debc4208a272268b4199ef439 (commit) from 8d2531d65813dae9333af28321b1e98088fb8e8c (commit) - Log ----------------------------------------------------------------- commit ddae18b7db27237debc4208a272268b4199ef439 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Mar 11 13:31:18 2011 -0500 These functions belong to server synchronization logic ----------------------------------------------------------------------- Summary of changes: js/functions.js | 296 --------------------------------------------- js/server_synchronize.js | 298 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 297 insertions(+), 297 deletions(-) diff --git a/js/functions.js b/js/functions.js index b163fed..72abde4 100644 --- a/js/functions.js +++ b/js/functions.js @@ -380,302 +380,6 @@ function checkSqlQuery(theForm) return true; } // end of the 'checkSqlQuery()' function -// Global variable row_class is set to even -var row_class = 'even'; - -/** -* Generates a row dynamically in the differences table displaying -* the complete statistics of difference in table like number of -* rows to be updated, number of rows to be inserted, number of -* columns to be added, number of columns to be removed, etc. -* -* @param index index of matching table -* @param update_size number of rows/column to be updated -* @param insert_size number of rows/coulmns to be inserted -* @param remove_size number of columns to be removed -* @param insert_index number of indexes to be inserted -* @param remove_index number of indexes to be removed -* @param img_obj image object -* @param table_name name of the table -*/ - -function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name) -{ - // a jQuery object - var $img = $(img_obj); - - $img.toggleClass('selected'); - - // The image source is changed when the showDetails function is called. - if ($img.hasClass('selected')) { - if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); - } - if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); - } - } else { - if ($img.hasClass('struct_img')) { - $img.attr('src', pmaThemeImage + 'new_struct.jpg'); - } - if ($img.hasClass('data_img')) { - $img.attr('src', pmaThemeImage + 'new_data.jpg'); - } - } - - var div = document.getElementById("list"); - var table = div.getElementsByTagName("table")[0]; - var table_body = table.getElementsByTagName("tbody")[0]; - - //Global variable row_class is being used - if (row_class == 'even') { - row_class = 'odd'; - } else { - row_class = 'even'; - } - // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. - if ($img.hasClass('selected')) { - var newRow = document.createElement("tr"); - newRow.setAttribute("class", row_class); - newRow.className = row_class; - // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array - newRow.setAttribute("id" , i); - - var table_name_cell = document.createElement("td"); - table_name_cell.align = "center"; - table_name_cell.innerHTML = table_name ; - - newRow.appendChild(table_name_cell); - - var create_table = document.createElement("td"); - create_table.align = "center"; - - var add_cols = document.createElement("td"); - add_cols.align = "center"; - - var remove_cols = document.createElement("td"); - remove_cols.align = "center"; - - var alter_cols = document.createElement("td"); - alter_cols.align = "center"; - - var add_index = document.createElement("td"); - add_index.align = "center"; - - var delete_index = document.createElement("td"); - delete_index.align = "center"; - - var update_rows = document.createElement("td"); - update_rows.align = "center"; - - var insert_rows = document.createElement("td"); - insert_rows.align = "center"; - - var tick_image = document.createElement("img"); - tick_image.src = pmaThemeImage + "s_success.png"; - - if (update_size == '' && insert_size == '' && remove_size == '') { - /** - This is the case when the table needs to be created in target database. - */ - create_table.appendChild(tick_image); - add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; - alter_cols.innerHTML = "--"; - delete_index.innerHTML = "--"; - add_index.innerHTML = "--"; - update_rows.innerHTML = "--"; - insert_rows.innerHTML = "--"; - - newRow.appendChild(create_table); - newRow.appendChild(add_cols); - newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); - newRow.appendChild(add_index); - newRow.appendChild(update_rows); - newRow.appendChild(insert_rows); - - } else if (update_size == '' && remove_size == '') { - /** - This is the case when data difference is displayed in the - table which is present in source but absent from target database - */ - create_table.innerHTML = "--"; - add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; - alter_cols.innerHTML = "--"; - add_index.innerHTML = "--"; - delete_index.innerHTML = "--"; - update_rows.innerHTML = "--"; - insert_rows.innerHTML = insert_size; - - newRow.appendChild(create_table); - newRow.appendChild(add_cols); - newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); - newRow.appendChild(add_index); - newRow.appendChild(update_rows); - newRow.appendChild(insert_rows); - - } else if (remove_size == '') { - /** - This is the case when data difference between matching_tables is displayed. - */ - create_table.innerHTML = "--"; - add_cols.innerHTML = "--"; - remove_cols.innerHTML = "--"; - alter_cols.innerHTML = "--"; - add_index.innerHTML = "--"; - delete_index.innerHTML = "--"; - update_rows.innerHTML = update_size; - insert_rows.innerHTML = insert_size; - - newRow.appendChild(create_table); - newRow.appendChild(add_cols); - newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); - newRow.appendChild(add_index); - newRow.appendChild(update_rows); - newRow.appendChild(insert_rows); - - } else { - /** - This is the case when structure difference between matching_tables id displayed - */ - create_table.innerHTML = "--"; - add_cols.innerHTML = insert_size; - remove_cols.innerHTML = remove_size; - alter_cols.innerHTML = update_size; - delete_index.innerHTML = remove_index; - add_index.innerHTML = insert_index; - update_rows.innerHTML = "--"; - insert_rows.innerHTML = "--"; - - newRow.appendChild(create_table); - newRow.appendChild(add_cols); - newRow.appendChild(remove_cols); - newRow.appendChild(alter_cols); - newRow.appendChild(delete_index); - newRow.appendChild(add_index); - newRow.appendChild(update_rows); - newRow.appendChild(insert_rows); - } - table_body.appendChild(newRow); - - } else { - //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now. - var table_rows = table_body.getElementsByTagName("tr"); - var j; - var index = 0; - for (j=0; j < table_rows.length; j++) - { - if (table_rows[j].id == i) { - index = j; - table_rows[j].parentNode.removeChild(table_rows[j]); - } - } - //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained. - for(index = 0; index < table_rows.length; index++) - { - row_class_element = table_rows[index].getAttribute('class'); - if (row_class_element == "even") { - table_rows[index].setAttribute("class","odd"); // for Mozilla firefox - table_rows[index].className = "odd"; // for IE browser - } else { - table_rows[index].setAttribute("class","even"); // for Mozilla firefox - table_rows[index].className = "even"; // for IE browser - } - } - } -} - -/** - * Generates the URL containing the list of selected table ids for synchronization and - * a variable checked for confirmation of deleting previous rows from target tables - * - * @param token the token generated for each PMA form - * - */ -function ApplySelectedChanges(token) -{ - var div = document.getElementById("list"); - var table = div.getElementsByTagName('table')[0]; - var table_body = table.getElementsByTagName('tbody')[0]; - // Get all the rows from the details table - var table_rows = table_body.getElementsByTagName('tr'); - var x = table_rows.length; - var i; - /** - Append the token at the beginning of the query string followed by - Table_ids that shows that "Apply Selected Changes" button is pressed - */ - var append_string = "?token="+token+"&Table_ids="+1; - for(i=0; i<x; i++){ - append_string += "&"; - append_string += i+"="+table_rows[i].id; - } - - // Getting the value of checkbox delete_rows - var checkbox = document.getElementById("delete_rows"); - if (checkbox.checked){ - append_string += "&checked=true"; - } else { - append_string += "&checked=false"; - } - //Appending the token and list of table ids in the URL - location.href += token; - location.href += append_string; -} - -/** -* Displays an error message if any text field -* is left empty other than the port field. -* -* @param string the form name -* @param object the form -* -* @return boolean whether the form field is empty or not -*/ -function validateConnection(form_name, form_obj) -{ - var check = true; - var src_hostfilled = true; - var trg_hostfilled = true; - - for (var i=1; i<form_name.elements.length; i++) - { - // All the text fields are checked excluding the port field because the default port can be used. - if ((form_name.elements[i].type == 'text') && (form_name.elements[i].name != 'src_port') && (form_name.elements[i].name != 'trg_port')) { - check = emptyFormElements(form_obj, form_name.elements[i].name); - if (check==false) { - element = form_name.elements[i].name; - if (form_name.elements[i].name == 'src_host') { - src_hostfilled = false; - continue; - } - if (form_name.elements[i].name == 'trg_host') { - trg_hostfilled = false; - continue; - } - if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) - break; - else - continue; - } - } - } - if (!check) { - form_obj.reset(); - element.select(); - alert(PMA_messages['strFormEmpty']); - element.focus(); - } - return check; -} - /** * Check if a form's element is empty. * An element containing only spaces is also considered empty diff --git a/js/server_synchronize.js b/js/server_synchronize.js index 244feff..e327a7b 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -3,6 +3,303 @@ * for server_synchronize.php * */ + +// Global variable row_class is set to even +var row_class = 'even'; + +/** +* Generates a row dynamically in the differences table displaying +* the complete statistics of difference in table like number of +* rows to be updated, number of rows to be inserted, number of +* columns to be added, number of columns to be removed, etc. +* +* @param index index of matching table +* @param update_size number of rows/column to be updated +* @param insert_size number of rows/coulmns to be inserted +* @param remove_size number of columns to be removed +* @param insert_index number of indexes to be inserted +* @param remove_index number of indexes to be removed +* @param img_obj image object +* @param table_name name of the table +*/ + +function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name) +{ + // a jQuery object + var $img = $(img_obj); + + $img.toggleClass('selected'); + + // The image source is changed when the showDetails function is called. + if ($img.hasClass('selected')) { + if ($img.hasClass('struct_img')) { + $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + } + if ($img.hasClass('data_img')) { + $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + } + } else { + if ($img.hasClass('struct_img')) { + $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + } + if ($img.hasClass('data_img')) { + $img.attr('src', pmaThemeImage + 'new_data.jpg'); + } + } + + var div = document.getElementById("list"); + var table = div.getElementsByTagName("table")[0]; + var table_body = table.getElementsByTagName("tbody")[0]; + + //Global variable row_class is being used + if (row_class == 'even') { + row_class = 'odd'; + } else { + row_class = 'even'; + } + // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. + if ($img.hasClass('selected')) { + var newRow = document.createElement("tr"); + newRow.setAttribute("class", row_class); + newRow.className = row_class; + // Id assigned to this row element is same as the index of this table name in the matching_tables/source_tables_uncommon array + newRow.setAttribute("id" , i); + + var table_name_cell = document.createElement("td"); + table_name_cell.align = "center"; + table_name_cell.innerHTML = table_name ; + + newRow.appendChild(table_name_cell); + + var create_table = document.createElement("td"); + create_table.align = "center"; + + var add_cols = document.createElement("td"); + add_cols.align = "center"; + + var remove_cols = document.createElement("td"); + remove_cols.align = "center"; + + var alter_cols = document.createElement("td"); + alter_cols.align = "center"; + + var add_index = document.createElement("td"); + add_index.align = "center"; + + var delete_index = document.createElement("td"); + delete_index.align = "center"; + + var update_rows = document.createElement("td"); + update_rows.align = "center"; + + var insert_rows = document.createElement("td"); + insert_rows.align = "center"; + + var tick_image = document.createElement("img"); + tick_image.src = pmaThemeImage + "s_success.png"; + + if (update_size == '' && insert_size == '' && remove_size == '') { + /** + This is the case when the table needs to be created in target database. + */ + create_table.appendChild(tick_image); + add_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; + alter_cols.innerHTML = "--"; + delete_index.innerHTML = "--"; + add_index.innerHTML = "--"; + update_rows.innerHTML = "--"; + insert_rows.innerHTML = "--"; + + newRow.appendChild(create_table); + newRow.appendChild(add_cols); + newRow.appendChild(remove_cols); + newRow.appendChild(alter_cols); + newRow.appendChild(delete_index); + newRow.appendChild(add_index); + newRow.appendChild(update_rows); + newRow.appendChild(insert_rows); + + } else if (update_size == '' && remove_size == '') { + /** + This is the case when data difference is displayed in the + table which is present in source but absent from target database + */ + create_table.innerHTML = "--"; + add_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; + alter_cols.innerHTML = "--"; + add_index.innerHTML = "--"; + delete_index.innerHTML = "--"; + update_rows.innerHTML = "--"; + insert_rows.innerHTML = insert_size; + + newRow.appendChild(create_table); + newRow.appendChild(add_cols); + newRow.appendChild(remove_cols); + newRow.appendChild(alter_cols); + newRow.appendChild(delete_index); + newRow.appendChild(add_index); + newRow.appendChild(update_rows); + newRow.appendChild(insert_rows); + + } else if (remove_size == '') { + /** + This is the case when data difference between matching_tables is displayed. + */ + create_table.innerHTML = "--"; + add_cols.innerHTML = "--"; + remove_cols.innerHTML = "--"; + alter_cols.innerHTML = "--"; + add_index.innerHTML = "--"; + delete_index.innerHTML = "--"; + update_rows.innerHTML = update_size; + insert_rows.innerHTML = insert_size; + + newRow.appendChild(create_table); + newRow.appendChild(add_cols); + newRow.appendChild(remove_cols); + newRow.appendChild(alter_cols); + newRow.appendChild(delete_index); + newRow.appendChild(add_index); + newRow.appendChild(update_rows); + newRow.appendChild(insert_rows); + + } else { + /** + This is the case when structure difference between matching_tables id displayed + */ + create_table.innerHTML = "--"; + add_cols.innerHTML = insert_size; + remove_cols.innerHTML = remove_size; + alter_cols.innerHTML = update_size; + delete_index.innerHTML = remove_index; + add_index.innerHTML = insert_index; + update_rows.innerHTML = "--"; + insert_rows.innerHTML = "--"; + + newRow.appendChild(create_table); + newRow.appendChild(add_cols); + newRow.appendChild(remove_cols); + newRow.appendChild(alter_cols); + newRow.appendChild(delete_index); + newRow.appendChild(add_index); + newRow.appendChild(update_rows); + newRow.appendChild(insert_rows); + } + table_body.appendChild(newRow); + + } else { + //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now. + var table_rows = table_body.getElementsByTagName("tr"); + var j; + var index = 0; + for (j=0; j < table_rows.length; j++) + { + if (table_rows[j].id == i) { + index = j; + table_rows[j].parentNode.removeChild(table_rows[j]); + } + } + //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained. + for(index = 0; index < table_rows.length; index++) + { + row_class_element = table_rows[index].getAttribute('class'); + if (row_class_element == "even") { + table_rows[index].setAttribute("class","odd"); // for Mozilla firefox + table_rows[index].className = "odd"; // for IE browser + } else { + table_rows[index].setAttribute("class","even"); // for Mozilla firefox + table_rows[index].className = "even"; // for IE browser + } + } + } +} + +/** + * Generates the URL containing the list of selected table ids for synchronization and + * a variable checked for confirmation of deleting previous rows from target tables + * + * @param token the token generated for each PMA form + * + */ +function ApplySelectedChanges(token) +{ + var div = document.getElementById("list"); + var table = div.getElementsByTagName('table')[0]; + var table_body = table.getElementsByTagName('tbody')[0]; + // Get all the rows from the details table + var table_rows = table_body.getElementsByTagName('tr'); + var x = table_rows.length; + var i; + /** + Append the token at the beginning of the query string followed by + Table_ids that shows that "Apply Selected Changes" button is pressed + */ + var append_string = "?token="+token+"&Table_ids="+1; + for(i=0; i<x; i++){ + append_string += "&"; + append_string += i+"="+table_rows[i].id; + } + + // Getting the value of checkbox delete_rows + var checkbox = document.getElementById("delete_rows"); + if (checkbox.checked){ + append_string += "&checked=true"; + } else { + append_string += "&checked=false"; + } + //Appending the token and list of table ids in the URL + location.href += token; + location.href += append_string; +} + +/** +* Displays an error message if any text field +* is left empty other than the port field. +* +* @param string the form name +* @param object the form +* +* @return boolean whether the form field is empty or not +*/ +function validateConnection(form_name, form_obj) +{ + var check = true; + var src_hostfilled = true; + var trg_hostfilled = true; + + for (var i=1; i<form_name.elements.length; i++) + { + // All the text fields are checked excluding the port field because the default port can be used. + if ((form_name.elements[i].type == 'text') && (form_name.elements[i].name != 'src_port') && (form_name.elements[i].name != 'trg_port')) { + check = emptyFormElements(form_obj, form_name.elements[i].name); + if (check==false) { + element = form_name.elements[i].name; + if (form_name.elements[i].name == 'src_host') { + src_hostfilled = false; + continue; + } + if (form_name.elements[i].name == 'trg_host') { + trg_hostfilled = false; + continue; + } + if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) + break; + else + continue; + } + } + } + if (!check) { + form_obj.reset(); + element.select(); + alert(PMA_messages['strFormEmpty']); + element.focus(); + } + return check; +} + $(document).ready(function() { $('.server_selector').change(function(evt) { var server = $(evt.target).val(); @@ -50,7 +347,6 @@ $(document).ready(function() { ); $('.data_img').hover( - // pmaThemeImage comes from js/messages.php function() { // mouse enters the element var $img = $(this); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2036-g8d2531d
by Marc Delisle 11 Mar '11

11 Mar '11

The branch, master has been updated via 8d2531d65813dae9333af28321b1e98088fb8e8c (commit) from 4fdae9a0e0fc2b1a16fdd3f6e4c0e70b70436513 (commit) - Log ----------------------------------------------------------------- commit 8d2531d65813dae9333af28321b1e98088fb8e8c Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Mar 11 13:16:36 2011 -0500 In Synchronize panel, make image changes independant from the original theme ----------------------------------------------------------------------- Summary of changes: js/functions.js | 68 ++++++++++++++------------------------------- js/messages.php | 3 ++ js/server_synchronize.js | 51 +++++++++++++++++++++++++++++++++- server_synchronize.php | 33 +++++++++++----------- 4 files changed, 91 insertions(+), 64 deletions(-) diff --git a/js/functions.js b/js/functions.js index d09109f..b163fed 100644 --- a/js/functions.js +++ b/js/functions.js @@ -401,22 +401,26 @@ var row_class = 'even'; function showDetails(i, update_size, insert_size, remove_size, insert_index, remove_index, img_obj, table_name) { - // The path of the image is split to facilitate comparison - var relative_path = (img_obj.src).split("themes/"); + // a jQuery object + var $img = $(img_obj); + + $img.toggleClass('selected'); // The image source is changed when the showDetails function is called. - if (relative_path[1] == 'original/img/new_data_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; - img_obj.alt = PMA_messages['strClickToUnselect']; //only for IE browser - } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; - img_obj.alt = PMA_messages['strClickToUnselect']; - } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; - img_obj.alt = PMA_messages['strClickToSelect']; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data_hovered.jpg"; - img_obj.alt = PMA_messages['strClickToSelect']; + if ($img.hasClass('selected')) { + if ($img.hasClass('struct_img')) { + $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + } + if ($img.hasClass('data_img')) { + $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + } + } else { + if ($img.hasClass('struct_img')) { + $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + } + if ($img.hasClass('data_img')) { + $img.attr('src', pmaThemeImage + 'new_data.jpg'); + } } var div = document.getElementById("list"); @@ -430,8 +434,7 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem row_class = 'even'; } // If the red or green button against a table name is pressed then append a new row to show the details of differences of this table. - if ((relative_path[1] != 'original/img/new_struct_selected_hovered.jpg') && (relative_path[1] != 'original/img/new_data_selected_hovered.jpg')) { - + if ($img.hasClass('selected')) { var newRow = document.createElement("tr"); newRow.setAttribute("class", row_class); newRow.className = row_class; @@ -469,7 +472,7 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem insert_rows.align = "center"; var tick_image = document.createElement("img"); - tick_image.src = "./themes/original/img/s_success.png"; + tick_image.src = pmaThemeImage + "s_success.png"; if (update_size == '' && insert_size == '' && remove_size == '') { /** @@ -562,7 +565,7 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem } table_body.appendChild(newRow); - } else if ((relative_path[1] != 'original/img/new_struct_hovered.jpg') && (relative_path[1] != 'original/img/new_data_hovered.jpg')) { + } else { //The case when the row showing the details need to be removed from the table i.e. the difference button is deselected now. var table_rows = table_body.getElementsByTagName("tr"); var j; @@ -590,35 +593,6 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem } /** - * Changes the image on hover effects - * - * @param img_obj the image object whose source needs to be changed - * - */ -function change_Image(img_obj) -{ - var relative_path = (img_obj.src).split("themes/"); - - if (relative_path[1] == 'original/img/new_data.jpg') { - img_obj.src = "./themes/original/img/new_data_hovered.jpg"; - } else if (relative_path[1] == 'original/img/new_struct.jpg') { - img_obj.src = "./themes/original/img/new_struct_hovered.jpg"; - } else if (relative_path[1] == 'original/img/new_struct_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct.jpg"; - } else if (relative_path[1] == 'original/img/new_data_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected.jpg') { - img_obj.src = "./themes/original/img/new_data_selected_hovered.jpg"; - } else if(relative_path[1] == 'original/img/new_struct_selected.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected_hovered.jpg"; - } else if (relative_path[1] == 'original/img/new_struct_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_struct_selected.jpg"; - } else if (relative_path[1] == 'original/img/new_data_selected_hovered.jpg') { - img_obj.src = "./themes/original/img/new_data_selected.jpg"; - } -} - -/** * Generates the URL containing the list of selected table ids for synchronization and * a variable checked for confirmation of deleting previous rows from target tables * diff --git a/js/messages.php b/js/messages.php index 9da01ca..0f7c8c7 100644 --- a/js/messages.php +++ b/js/messages.php @@ -126,6 +126,9 @@ foreach ($js_messages as $name => $js_message) { /* Calendar */ echo "var themeCalendarImage = '" . $GLOBALS['pmaThemeImage'] . 'b_calendar.png' . "';\n"; +/* Image path */ +echo "var pmaThemeImage = '" . $GLOBALS['pmaThemeImage'] . "';\n"; + /* Version */ echo "var pmaversion = '" . PMA_VERSION . "';\n"; diff --git a/js/server_synchronize.js b/js/server_synchronize.js index b360d15..244feff 100644 --- a/js/server_synchronize.js +++ b/js/server_synchronize.js @@ -23,5 +23,54 @@ $(document).ready(function() { $(this).closest('tbody').find('.server-pass').val(''); $(this).closest('tbody').find('.server-db').val(parts[4]) } - }); + }); + + $('.struct_img').hover( + // pmaThemeImage comes from js/messages.php + function() { + // mouse enters the element + var $img = $(this); + $img.addClass('hover'); + if ($img.hasClass('selected')) { + $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.jpg'); + } else { + $img.attr('src', pmaThemeImage + 'new_struct_hovered.jpg'); + } + }, + function() { + // mouse leaves the element + var $img = $(this); + $img.removeClass('hover'); + if ($img.hasClass('selected')) { + $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg'); + } else { + $img.attr('src', pmaThemeImage + 'new_struct.jpg'); + } + } + ); + + $('.data_img').hover( + // pmaThemeImage comes from js/messages.php + function() { + // mouse enters the element + var $img = $(this); + $img.addClass('hover'); + if ($img.hasClass('selected')) { + $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.jpg'); + } else { + $img.attr('src', pmaThemeImage + 'new_data_hovered.jpg'); + } + }, + function() { + // mouse leaves the element + var $img = $(this); + $img.removeClass('hover'); + if ($img.hasClass('selected')) { + $img.attr('src', pmaThemeImage + 'new_data_selected.jpg'); + } else { + $img.attr('src', pmaThemeImage + 'new_data.jpg'); + } + } + ); + }); diff --git a/server_synchronize.php b/server_synchronize.php index b49aa9e..2c095de 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -277,6 +277,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ PMA_syncDisplayHeaderSource($src_db); $odd_row = false; + /** * Display the matching tables' names and difference, first */ @@ -339,8 +340,8 @@ if ((isset($_REQUEST['submit_connect']))) { */ if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" .$num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; @@ -351,8 +352,8 @@ if ((isset($_REQUEST['submit_connect']))) { if (isset($update_array[$i]) || isset($insert_array[$i])) { if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails('. "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; } @@ -367,15 +368,15 @@ if ((isset($_REQUEST['submit_connect']))) { $odd_row = PMA_syncDisplayBeginTableRow($odd_row); echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> '; - echo '<td align="center"><img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<td align="center"><img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>'; if ($row_count[$j] > 0) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'UD" . $j . "','" . null . "','" . $row_count[$j] . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; } @@ -733,8 +734,8 @@ if (isset($_REQUEST['Table_ids'])) { } if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>'; } @@ -761,8 +762,8 @@ if (isset($_REQUEST['Table_ids'])) { if ((isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]])) || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions . "','" . null . "','" . null . "','" . null . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />'; } @@ -789,8 +790,8 @@ if (isset($_REQUEST['Table_ids'])) { */ if (!(in_array($j, $uncommon_table_structure_diff))) { if (isset($uncommon_tables[$j])) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>' .' '; } } else { @@ -801,8 +802,8 @@ if (isset($_REQUEST['Table_ids'])) { */ if (!(in_array($j, $uncommon_table_data_diff))) { if (isset($row_count[$j]) && ($row_count > 0)) { - echo '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" - alt="' . __('Click to select') . '" onmouseover="change_Image(this);" onmouseout="change_Image(this);" + echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29" + alt="' . __('Click to select') . '" onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. b2726e5367adbb06a064364905c0333753cc0c23
by Michal Čihař 10 Mar '11

10 Mar '11

The branch, master has been updated via b2726e5367adbb06a064364905c0333753cc0c23 (commit) via ed1f7eccc2e7d46a18708531fce4f1fd74d82f3e (commit) via fa56810b89133fbc2b11fee344ded4126b559bf8 (commit) via ebca4da041879f3bc86bbb1a7fc7de1125b3f58f (commit) via 93aee8fb4986e871c24dff8d3b7c52ecefbfdb60 (commit) via e1e0cd55464b57f4514cb866b3acbdc4c33c343e (commit) via cbcb7ccb07c28111376f70e768a99a1cd6f8dff9 (commit) via 5026053a6e75de77b7568218be244d3722d1beec (commit) via 1c9b443dd7469da0f4a8a87ca9d08aa5c0853642 (commit) via baf01370a1dc6a413e0e982055c8b78f4e232069 (commit) via 9622e4fd52b9941b0dcb75fa42b3cc4ea7e98156 (commit) via 5e3aeeb710ec351745aaadc49c9c8d899390abe4 (commit) via 9e8537cc8c72276aa9b1aac07101315b5e59b88a (commit) via 66569ce7eb2025bd7b7172d4590b6049c405341d (commit) via d67094e3e376cb701614d4d9342d305485ff6a75 (commit) via 06e95ae86d164f769d52d898cf198dd4269a13a7 (commit) via c030dda78e1b3222b422695247003366a20524d9 (commit) via 6161bb7c221efce7aac6bf9994b6f5255fb97f15 (commit) via 1bbbe51061cfff40e025703cb07376207403e088 (commit) via 39cd81fb36d88cb0aefd2600cc7563f9f253fd75 (commit) via 2f2c23d547e80c308c954a5ac1d595b8b253b639 (commit) via 09da1070b8a390688ca9a2c416f921b453f2a453 (commit) via 5549aa7b78b8cc82666720a32927c7dc323ddb39 (commit) via 7ade406ab3e5315bc5c80186e453f083be9ead0b (commit) via 56b9d12f57aeec0ea28d7d633fde13c8a1cd1192 (commit) via 040a935de3e7b95a7245046cd8f3d5f04aaf05d5 (commit) via c74856e05e6041323802c177944b314621cf9481 (commit) via 23e8b18e8cbc4c8c8539a6e6580ae602ab830dcc (commit) via 0ddd83d868319bce6d03ade18c6f74bdfa7ad319 (commit) via 0ea57a3b9d00db9e8267a9aec051380ee7c27d2d (commit) via 1e568cb2eeb1bb3363771c9a94c5ac643e68e02c (commit) via 58eb8bc6c5f36917c710065afdb044ea98112211 (commit) via d87239030c8e7606100177a633eca236ef089e20 (commit) via 4e129b2bc7c488b54f40eedd31339255aa976101 (commit) via a0baae81aebab9b35110089edc34dc1337518a0f (commit) from ef80013335840d95a1989880119ca322b40726f8 (commit) - Log ----------------------------------------------------------------- commit b2726e5367adbb06a064364905c0333753cc0c23 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Mar 10 20:38:10 2011 +0100 Generate translated docs commit ed1f7eccc2e7d46a18708531fce4f1fd74d82f3e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:58:48 2011 +0200 Translation update done using Pootle. commit fa56810b89133fbc2b11fee344ded4126b559bf8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:57:48 2011 +0200 Translation update done using Pootle. commit ebca4da041879f3bc86bbb1a7fc7de1125b3f58f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:57:00 2011 +0200 Translation update done using Pootle. commit 93aee8fb4986e871c24dff8d3b7c52ecefbfdb60 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:56:30 2011 +0200 Translation update done using Pootle. commit e1e0cd55464b57f4514cb866b3acbdc4c33c343e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:55:18 2011 +0200 Translation update done using Pootle. commit cbcb7ccb07c28111376f70e768a99a1cd6f8dff9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:55:05 2011 +0200 Translation update done using Pootle. commit 5026053a6e75de77b7568218be244d3722d1beec Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:54:29 2011 +0200 Translation update done using Pootle. commit 1c9b443dd7469da0f4a8a87ca9d08aa5c0853642 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:54:20 2011 +0200 Translation update done using Pootle. commit baf01370a1dc6a413e0e982055c8b78f4e232069 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:53:44 2011 +0200 Translation update done using Pootle. commit 9622e4fd52b9941b0dcb75fa42b3cc4ea7e98156 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:53:12 2011 +0200 Translation update done using Pootle. commit 5e3aeeb710ec351745aaadc49c9c8d899390abe4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:51:40 2011 +0200 Translation update done using Pootle. commit 9e8537cc8c72276aa9b1aac07101315b5e59b88a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:50:45 2011 +0200 Translation update done using Pootle. commit 66569ce7eb2025bd7b7172d4590b6049c405341d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:50:42 2011 +0200 Translation update done using Pootle. commit d67094e3e376cb701614d4d9342d305485ff6a75 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:50:33 2011 +0200 Translation update done using Pootle. commit 06e95ae86d164f769d52d898cf198dd4269a13a7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:50:22 2011 +0200 Translation update done using Pootle. commit c030dda78e1b3222b422695247003366a20524d9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:47:54 2011 +0200 Translation update done using Pootle. commit 6161bb7c221efce7aac6bf9994b6f5255fb97f15 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:47:31 2011 +0200 Translation update done using Pootle. commit 1bbbe51061cfff40e025703cb07376207403e088 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:47:04 2011 +0200 Translation update done using Pootle. commit 39cd81fb36d88cb0aefd2600cc7563f9f253fd75 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:46:33 2011 +0200 Translation update done using Pootle. commit 2f2c23d547e80c308c954a5ac1d595b8b253b639 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:45:15 2011 +0200 Translation update done using Pootle. commit 09da1070b8a390688ca9a2c416f921b453f2a453 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:43:32 2011 +0200 Translation update done using Pootle. commit 5549aa7b78b8cc82666720a32927c7dc323ddb39 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:43:07 2011 +0200 Translation update done using Pootle. commit 7ade406ab3e5315bc5c80186e453f083be9ead0b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:41:32 2011 +0200 Translation update done using Pootle. commit 56b9d12f57aeec0ea28d7d633fde13c8a1cd1192 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:38:16 2011 +0200 Translation update done using Pootle. commit 040a935de3e7b95a7245046cd8f3d5f04aaf05d5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:37:54 2011 +0200 Translation update done using Pootle. commit c74856e05e6041323802c177944b314621cf9481 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:36:19 2011 +0200 Translation update done using Pootle. commit 23e8b18e8cbc4c8c8539a6e6580ae602ab830dcc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:36:06 2011 +0200 Translation update done using Pootle. commit 0ddd83d868319bce6d03ade18c6f74bdfa7ad319 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:35:31 2011 +0200 Translation update done using Pootle. commit 0ea57a3b9d00db9e8267a9aec051380ee7c27d2d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:35:19 2011 +0200 Translation update done using Pootle. commit 1e568cb2eeb1bb3363771c9a94c5ac643e68e02c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:34:37 2011 +0200 Translation update done using Pootle. commit 58eb8bc6c5f36917c710065afdb044ea98112211 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:31:37 2011 +0200 Translation update done using Pootle. commit d87239030c8e7606100177a633eca236ef089e20 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:30:34 2011 +0200 Translation update done using Pootle. commit 4e129b2bc7c488b54f40eedd31339255aa976101 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 19:29:39 2011 +0200 Translation update done using Pootle. commit a0baae81aebab9b35110089edc34dc1337518a0f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Mar 10 12:39:39 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 158 ++++++++++++++++++++++-------------------- po/es.po | 92 ++++++++++++++++++++----- po/tr.po | 3 +- 3 files changed, 159 insertions(+), 94 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 3f3fe7c..3a5b0c2 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1447,88 +1447,96 @@ cuando en la funcionalidad de sincronización pero no tiene efecto cuando PHP está ejecutando en modo seguro.</dd> <dt id="cfg_SessionSavePath">cadena $cfg['SessionSavePath']</dt> - <dd>Path for storing session data (<a -href="http://php.net/session_save_path">session_save_path PHP -parameter</a>).</dd> - - <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> - <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no -limit is imposed.<br /> - This setting is used while importing/exporting dump files and at some other -places in phpMyAdmin so you definitely don't want to put here a too low -value. It has no effect when PHP is running in safe mode.<br /> - You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit -the suffix (16 means 16 bytes!)</dd> - - <dt id="cfg_SkipLockedTables">$cfg['SkipLockedTables'] boolean</dt> - <dd>Mark used tables and make it possible to show databases with locked tables -(since MySQL 3.23.30).</dd> - - <dt id="cfg_ShowSQL">$cfg['ShowSQL'] boolean</dt> - <dd>Defines whether <abbr title="structured query language">SQL</abbr> queries -generated by phpMyAdmin should be displayed or not.</dd> - - <dt id="cfg_AllowUserDropDatabase">$cfg['AllowUserDropDatabase'] boolean</dt> - <dd>Defines whether normal users (non-administrator) are allowed to delete their -own database or not. If set as FALSE, the link "Drop Database" -will not be shown, and even a "DROP DATABASE mydatabase" will be -rejected. Quite practical for <abbr title="Internet service -provider">ISP</abbr>'s with many customers.<br /> - Please note that this limitation of SQL queries is not as strict as when -using MySQL privileges. This is due to nature of SQL queries which might be -quite complicated. So this choice should be viewed as help to avoid -accidental dropping rather than strict privilege limitation.</dd> - - <dt id="cfg_Confirm">$cfg['Confirm'] boolean</dt> - <dd>Whether a warning ("Are your really sure...") should be displayed -when you're about to lose data.</dd> - - <dt id="cfg_LoginCookieRecall">$cfg['LoginCookieRecall'] boolean</dt> - <dd>Define whether the previous login should be recalled or not in cookie -authentication mode.<br /><br /> - - This is automatically disabled if you do not have configured <tt><a + <dd>Ruta para almacenar los datos de la sesión (<a +href="http://php.net/session_save_path">parámetro PHP +session_save_path</a>),</dd> + + <dt id="cfg_MemoryLimit">cadena $cfg['MemoryLimit'] (número de bytes)</dt> + <dd>Configurar la cantidad de bytes que un script puede reservar. Si está +configurado como cero, no se impondrá límite alguno.<br /> + Esta configuración es utilizada al importar/exportar archivos de volcados y +en algunos otros lugares en phpMyAdmin así que definitivamente no quieres +definirlo a un valor demasiado bajo. No tiene efecto alguno cuando PHP está +ejecutando en modo seguro.<br /> + También se puede utilizar cualquier cadena como en php.ini; por ejemplo: +'16M'. Asegúrate de no olvidarte del sufijo (¡16 significa 16 bytes!)</dd> + + <dt id="cfg_SkipLockedTables">booleano $cfg['SkipLockedTables']</dt> + <dd>Marcar tablas usadas y posibilitar el mostrar bases de datos con tablas +bloqueadas (desde MySQL 3.23.30).</dd> + + <dt id="cfg_ShowSQL">booleano $cfg['ShowSQL']</dt> + <dd>Define si se deben mostrar o no las consultas <abbr title="structured query +language">SQL</abbr> generadas por phpMyAdmin.</dd> + + <dt id="cfg_AllowUserDropDatabase">booleano $cfg['AllowUserDropDatabase']</dt> + <dd>Define si se permite a los usuarios normales (no administradores) borrar sus +propias bases de datos o no. Si es FALSE, el enlace "Borrar base de +datos" no será mostrado e inclusive se rechazarán consultas como +"DROP DATABASE mibasededatos". Muy práctico para <abbr +title="Internet service provider">ISP</abbr>s con muchos clientes.<br /> + Porfavor, note que esta limitación de consultas SQL no es tan estricta como +utilizar los privilegios MySQL. Esto es debido a la naturaleza de las +consultas SQL que pueden ser muy complicadas. Esta opción debe de ser +considerada una ayuda para evitar borrados accidentales en lugar de una +limitación estricta de privilegios.</dd> + + <dt id="cfg_Confirm">booleano $cfg['Confirm']</dt> + <dd>Si se mostrará una advertencia ("¿Está seguro... ?") cuando se +están por perder datos.</dd> + + <dt id="cfg_LoginCookieRecall">booleano $cfg['LoginCookieRecall']</dt> + <dd>Define si el inicio de sesión anterior debe de ser recuperado o no en el +modo de autenticación por cookies.<br /><br /> + + Esto está desactivado automáticamente si no está configurado <tt><a href="#cfg_blowfish_secret">$cfg['blowfish_secret']</a></tt>. </dd> - <dt id="cfg_LoginCookieValidity">$cfg['LoginCookieValidity'] integer [number of seconds]</dt> - <dd>Define how long is login cookie valid. Please note that php configuration -option <a + <dt id="cfg_LoginCookieValidity">entero $cfg['LoginCookieValidity'] (cantidad de segundos)</dt> + <dd>Define por cuánto tiempo son válidas las cookies de sesión. Porfavor note +que la opción de configuración PHP <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifeti…">session.gc_maxlifetime</a> -might limit session validity and if session is lost, login cookie is also -invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> -not lower than the value of $cfg['LoginCookieValidity'].</dd> - - <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long login cookie should be stored in browser. Default 0 means -that it will be kept for existing session. This is recommended for not -trusted environments.</dd> - - <dt id="cfg_LoginCookieDeleteAll">$cfg['LoginCookieDeleteAll'] boolean</dt> - <dd>If enabled (default), logout deletes cookies for all servers, otherwise only -for current one. Setting this to false makes it easy to forget to log out -from other server, when you are using more of them.</dd> - - <dt id="cfg_UseDbSearch">$cfg['UseDbSearch'] boolean</dt> - <dd>Define whether the "search string inside database" is enabled or not.</dd> - - <dt id="cfg_IgnoreMultiSubmitErrors">$cfg['IgnoreMultiSubmitErrors'] boolean</dt> - <dd>Define whether phpMyAdmin will continue executing a multi-query statement if -one of the queries fails. Default is to abort execution.</dd> - - <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt> - <dd>Define whether phpMyAdmin will output the results of each query of a -multi-query statement embedded into the <abbr title="structured query -language">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>.</dd> +puede limitar la validez de la sesión y cuando se pierda la sesión la cookie +de sesión es también invalidada. Es buena idea +configurar<code>session.gc_maxlifetime</code> a un valor igual o mayor que +$cfg['LoginCookieValidity'].</dd> + + <dt id="cfg_LoginCookieStore">entero $cfg['LoginCookieStore'] (cantidad de segundos)</dt> + <dd>Define por cuánto tiempo se almacena en el navegador la cookie de sesión. El +valor predeterminado de 0 significa que se mantendrá sólo durante la sesión +actual. Este es el valor recomendable para entornos no confiables.</dd> + + <dt id="cfg_LoginCookieDeleteAll">booleano $cfg['LoginCookieDeleteAll']</dt> + <dd>Si está activado (el valor predeterminado), el fin de sesión borra todas las +cookies para todos los servidores; de lo contrario sólo aquella del servidor +actual. Configurarlo como 'false' hace maś sencillo olvidar finalizar sesión +de otros servidores cuando se utiliza más de uno.</dd> + + <dt id="cfg_UseDbSearch">booleano $cfg['UseDbSearch']</dt> + <dd>Define si la funcionalidad de "búsqueda de cadenas dentro de la base de +datos" está activada o no.</dd> + + <dt id="cfg_IgnoreMultiSubmitErrors">booleano $cfg['IgnoreMultiSubmitErrors']</dt> + <dd>Define si phpMyAdmin continúa ejecutando una sentencia con múltiples +consultas si una de las consultas falla. El valor predeterminado es abortar +la ejecución.</dd> + + <dt id="cfg_VerboseMultiSubmit">booleano $cfg['VerboseMultiSubmit']</dt> + <dd>Define si phpMyAdmin mostrará los resultados de cada consulta en una +sentencia con múltiples consultas embebido en la salida <abbr +title="structured query language">SQL</abbr> como comentarios entre +líneas. El valor predeterminado es <tt>TRUE</tt>.</dd> <dt id="AllowArbitraryServer"> - <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> -boolean</dt> - <dd>If enabled allows you to log in to arbitrary servers using cookie auth. + booleano <span +id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span></dt> + <dd>Permite iniciar sesión en cualquier servidor utilizando autenticación por +cookies. <br /><br /> - <b>NOTE:</b> Please use this carefully, as this may allow users access to -MySQL servers behind the firewall where your <abbr title="HyperText Transfer -Protocol">HTTP</abbr> server is placed. + <b>NOTA:</b> porfavor utilice esto cuidadoseamente ya que podría permitir a +los usuarios acceso a servidores MySQL detrás del firewall del servidor +<abbr title="HyperText Transfer Protocol">HTTP</abbr>. </dd> <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> diff --git a/po/es.po b/po/es.po index f1c4f63..b582a47 100644 --- a/po/es.po +++ b/po/es.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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-10 02:49+0200\n" +"PO-Revision-Date: 2011-03-10 19:58+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -3658,11 +3658,14 @@ msgid "" "Path for storing session data (<a href=\"http://php.net/session_save_path" "\">session_save_path PHP parameter</a>)." msgstr "" +"Ruta para almacenar los datos de la sesión (<a " +"href=\"http://php.net/session_save_path\">parámetro PHP " +"session_save_path</a>)," #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1347 msgid "$cfg['MemoryLimit'] string [number of bytes]" -msgstr "" +msgstr "cadena $cfg['MemoryLimit'] (número de bytes)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1348 @@ -3670,6 +3673,8 @@ msgid "" "Set the number of bytes a script is allowed to allocate. If set to zero, no " "limit is imposed." msgstr "" +"Configurar la cantidad de bytes que un script puede reservar. Si está " +"configurado como cero, no se impondrá límite alguno." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1350 @@ -3678,6 +3683,10 @@ msgid "" "places in phpMyAdmin so you definitely don't want to put here a too low " "value. It has no effect when PHP is running in safe mode." msgstr "" +"Esta configuración es utilizada al importar/exportar archivos de volcados y " +"en algunos otros lugares en phpMyAdmin así que definitivamente no quieres " +"definirlo a un valor demasiado bajo. No tiene efecto alguno cuando PHP está " +"ejecutando en modo seguro." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1353 @@ -3685,11 +3694,13 @@ msgid "" "You can also use any string as in php.ini, eg. '16M'. Ensure you don't omit " "the suffix (16 means 16 bytes!)" msgstr "" +"También se puede utilizar cualquier cadena como en php.ini; por ejemplo: " +"'16M'. Asegúrate de no olvidarte del sufijo (¡16 significa 16 bytes!)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1356 msgid "$cfg['SkipLockedTables'] boolean" -msgstr "" +msgstr "booleano $cfg['SkipLockedTables']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1357 @@ -3697,11 +3708,13 @@ msgid "" "Mark used tables and make it possible to show databases with locked tables " "(since MySQL 3.23.30)." msgstr "" +"Marcar tablas usadas y posibilitar el mostrar bases de datos con tablas " +"bloqueadas (desde MySQL 3.23.30)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1360 msgid "$cfg['ShowSQL'] boolean" -msgstr "" +msgstr "booleano $cfg['ShowSQL']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1361 @@ -3709,11 +3722,13 @@ msgid "" "Defines whether <abbr title=\"structured query language\">SQL</abbr> queries " "generated by phpMyAdmin should be displayed or not." msgstr "" +"Define si se deben mostrar o no las consultas <abbr title=\"structured query " +"language\">SQL</abbr> generadas por phpMyAdmin." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1364 msgid "$cfg['AllowUserDropDatabase'] boolean" -msgstr "" +msgstr "booleano $cfg['AllowUserDropDatabase']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1365 @@ -3724,6 +3739,11 @@ msgid "" "rejected. Quite practical for <abbr title=\"Internet service provider\">ISP</" "abbr>'s with many customers." msgstr "" +"Define si se permite a los usuarios normales (no administradores) borrar sus " +"propias bases de datos o no. Si es FALSE, el enlace "Borrar base de " +"datos" no será mostrado e inclusive se rechazarán consultas como " +""DROP DATABASE mibasededatos". Muy práctico para <abbr " +"title=\"Internet service provider\">ISP</abbr>s con muchos clientes." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1371 @@ -3733,11 +3753,16 @@ msgid "" "quite complicated. So this choice should be viewed as help to avoid " "accidental dropping rather than strict privilege limitation." msgstr "" +"Porfavor, note que esta limitación de consultas SQL no es tan estricta como " +"utilizar los privilegios MySQL. Esto es debido a la naturaleza de las " +"consultas SQL que pueden ser muy complicadas. Esta opción debe de ser " +"considerada una ayuda para evitar borrados accidentales en lugar de una " +"limitación estricta de privilegios." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1377 msgid "$cfg['Confirm'] boolean" -msgstr "" +msgstr "booleano $cfg['Confirm']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1378 @@ -3745,11 +3770,13 @@ msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data." msgstr "" +"Si se mostrará una advertencia ("¿Está seguro... ?") cuando se " +"están por perder datos." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1381 msgid "$cfg['LoginCookieRecall'] boolean" -msgstr "" +msgstr "booleano $cfg['LoginCookieRecall']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1382 @@ -3757,6 +3784,8 @@ msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode." msgstr "" +"Define si el inicio de sesión anterior debe de ser recuperado o no en el " +"modo de autenticación por cookies." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1385 @@ -3764,11 +3793,13 @@ msgid "" "This is automatically disabled if you do not have configured <tt><a href=" "\"#cfg_blowfish_secret\">$cfg['blowfish_secret']</a></tt>." msgstr "" +"Esto está desactivado automáticamente si no está configurado <tt><a " +"href=\"#cfg_blowfish_secret\">$cfg['blowfish_secret']</a></tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1389 msgid "$cfg['LoginCookieValidity'] integer [number of seconds]" -msgstr "" +msgstr "entero $cfg['LoginCookieValidity'] (cantidad de segundos)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1390 @@ -3780,29 +3811,34 @@ msgid "" "a good idea to set <code>session.gc_maxlifetime</code> not lower than the " "value of $cfg['LoginCookieValidity']." msgstr "" +"Define por cuánto tiempo son válidas las cookies de sesión. Porfavor note " +"que la opción de configuración PHP <a " +"href=\"http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime\">session.gc_maxlifetime</a> puede limitar la validez de la " +"sesión y cuando se pierda la sesión la cookie de sesión es también " +"invalidada. Es buena idea configurar<code>session.gc_maxlifetime</code> a un " +"valor igual o mayor que $cfg['LoginCookieValidity']." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1396 msgid "$cfg['LoginCookieStore'] integer [number of seconds]" -msgstr "" +msgstr "entero $cfg['LoginCookieStore'] (cantidad de segundos)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1397 -#, fuzzy msgid "" "Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." msgstr "" -"Defina cuán largo (en segundos) una cookie el navegador. El predeterminado " -"de 0 significa que se mantendrá solamente para la sesión actual, y se " -"borrará tan pronto cierre la ventana del navegador. Esto es recomendable " -"para entornos no confiables." +"Define por cuánto tiempo se almacena en el navegador la cookie de sesión. El " +"valor predeterminado de 0 significa que se mantendrá sólo durante la sesión " +"actual. Este es el valor recomendable para entornos no confiables." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1401 msgid "$cfg['LoginCookieDeleteAll'] boolean" -msgstr "" +msgstr "booleano $cfg['LoginCookieDeleteAll']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1402 @@ -3811,21 +3847,27 @@ msgid "" "for current one. Setting this to false makes it easy to forget to log out " "from other server, when you are using more of them." msgstr "" +"Si está activado (el valor predeterminado), el fin de sesión borra todas las " +"cookies para todos los servidores; de lo contrario sólo aquella del " +"servidor actual. Configurarlo como 'false' hace maś sencillo olvidar " +"finalizar sesión de otros servidores cuando se utiliza más de uno." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1407 msgid "$cfg['UseDbSearch'] boolean" -msgstr "" +msgstr "booleano $cfg['UseDbSearch']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1408 msgid "Define whether the \"search string inside database\" is enabled or not." msgstr "" +"Define si la funcionalidad de \"búsqueda de cadenas dentro de la base de " +"datos\" está activada o no." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1410 msgid "$cfg['IgnoreMultiSubmitErrors'] boolean" -msgstr "" +msgstr "booleano $cfg['IgnoreMultiSubmitErrors']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1411 @@ -3833,11 +3875,14 @@ msgid "" "Define whether phpMyAdmin will continue executing a multi-query statement if " "one of the queries fails. Default is to abort execution." msgstr "" +"Define si phpMyAdmin continúa ejecutando una sentencia con múltiples " +"consultas si una de las consultas falla. El valor predeterminado es abortar " +"la ejecución." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1414 msgid "$cfg['VerboseMultiSubmit'] boolean" -msgstr "" +msgstr "booleano $cfg['VerboseMultiSubmit']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1415 @@ -3846,6 +3891,10 @@ msgid "" "query statement embedded into the <abbr title=\"structured query language" "\">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>." msgstr "" +"Define si phpMyAdmin mostrará los resultados de cada consulta en una " +"sentencia con múltiples consultas embebido en la salida <abbr " +"title=\"structured query language\">SQL</abbr> como comentarios entre líneas. " +"El valor predeterminado es <tt>TRUE</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1420 @@ -3853,11 +3902,15 @@ msgid "" "<span id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span> " "boolean" msgstr "" +"booleano <span " +"id=\"cfg_AllowArbitraryServer\">$cfg['AllowArbitraryServer']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1421 msgid "If enabled allows you to log in to arbitrary servers using cookie auth." msgstr "" +"Permite iniciar sesión en cualquier servidor utilizando autenticación por " +"cookies." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1424 @@ -3866,6 +3919,9 @@ msgid "" "MySQL servers behind the firewall where your <abbr title=\"HyperText " "Transfer Protocol\">HTTP</abbr> server is placed." msgstr "" +"<b>NOTA:</b> porfavor utilice esto cuidadoseamente ya que podría permitir a " +"los usuarios acceso a servidores MySQL detrás del firewall del servidor " +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1429 diff --git a/po/tr.po b/po/tr.po index 1f2e70f..8927ac5 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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-02 23:06+0200\n" +"PO-Revision-Date: 2011-03-10 12:39+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -2183,6 +2183,7 @@ msgstr "" "kullanmak isterseniz, bunlardan kaçının (I.E. <tt>'my\\_db'</tt> kullanın ve " "<tt>'my_db'</tt> kullanmayın)." +# Bu ayar sunucu yükünü hafifletmek için etkin bir yoldur #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:820 msgid "" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2035-g4fdae9a
by Madhura Jayaratne 10 Mar '11

10 Mar '11

The branch, master has been updated via 4fdae9a0e0fc2b1a16fdd3f6e4c0e70b70436513 (commit) via a5ef7d4b3941e5a6f2c1f5a3e0d7a3435f8fd931 (commit) from a46a49b747f89cdc926fd7d2fd41237d6d060ee7 (commit) - Log ----------------------------------------------------------------- commit 4fdae9a0e0fc2b1a16fdd3f6e4c0e70b70436513 Merge: a5ef7d4b3941e5a6f2c1f5a3e0d7a3435f8fd931 a46a49b747f89cdc926fd7d2fd41237d6d060ee7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Mar 10 23:25:35 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit a5ef7d4b3941e5a6f2c1f5a3e0d7a3435f8fd931 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Mar 10 23:20:57 2011 +0530 Bug #3187141 - Double query box shown ----------------------------------------------------------------------- Summary of changes: js/sql.js | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/js/sql.js b/js/sql.js index a7b8e62..9b5edf9 100644 --- a/js/sql.js +++ b/js/sql.js @@ -286,14 +286,21 @@ $(document).ready(function() { } else { // real results are returned - $('#sqlqueryresults').show(); - $("#sqlqueryresults").html(data); - $("#sqlqueryresults").trigger('appendAnchor'); - $('#togglequerybox').show(); - if($("#togglequerybox").siblings(":visible").length > 0) { - $("#togglequerybox").trigger('click'); + $received_data = $(data); + $zero_row_results = $received_data.find('textarea[name="sql_query"]'); + // if zero rows are returned from the query execution + if ($zero_row_results.length > 0) { + $('#sqlquery').val($zero_row_results.val()); + } else { + $('#sqlqueryresults').show(); + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + $('#togglequerybox').show(); + if($("#togglequerybox").siblings(":visible").length > 0) { + $("#togglequerybox").trigger('click'); + } + PMA_init_slider(); } - PMA_init_slider(); } }) // end $.post() }) // end SQL Query submit hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2033-ga46a49b
by Piotr Przybylski 10 Mar '11

10 Mar '11

The branch, master has been updated via a46a49b747f89cdc926fd7d2fd41237d6d060ee7 (commit) from 149af3e6872e9f0882aaf6fc51c38aa5657b558e (commit) - Log ----------------------------------------------------------------- commit a46a49b747f89cdc926fd7d2fd41237d6d060ee7 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Mar 10 18:48:16 2011 +0100 make PMA_changeClassForColumn work about 1/4th faster ----------------------------------------------------------------------- Summary of changes: js/sql.js | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/js/sql.js b/js/sql.js index aa49d8e..a7b8e62 100644 --- a/js/sql.js +++ b/js/sql.js @@ -998,10 +998,14 @@ function PMA_changeClassForColumn($this_th, newclass) { var th_index = $this_th.index(); // .eq() is zero-based th_index--; - var $tr_with_data = $this_th.closest('table').find('tbody tr ').has('td.data'); - $tr_with_data.each(function() { - $(this).find('td.data:eq('+th_index+')').toggleClass(newclass); - }); + var $tds = $this_th.closest('table').find('tbody tr').find('td.data:eq('+th_index+')'); + if ($this_th.data('has_class_'+newclass)) { + $tds.removeClass(newclass); + $this_th.data('has_class_'+newclass, false); + } else { + $tds.addClass(newclass); + $this_th.data('has_class_'+newclass, true); + } } $(document).ready(function() { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2032-g149af3e
by Piotr Przybylski 10 Mar '11

10 Mar '11

The branch, master has been updated via 149af3e6872e9f0882aaf6fc51c38aa5657b558e (commit) from 675677e8c574f47f3baafc93879e9103d46d3d8d (commit) - Log ----------------------------------------------------------------- commit 149af3e6872e9f0882aaf6fc51c38aa5657b558e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Mar 10 17:31:04 2011 +0100 fix @subpackage in file level docs for pmahomme ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_left.css.php | 2 +- themes/pmahomme/css/theme_print.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- themes/pmahomme/info.inc.php | 2 +- themes/pmahomme/layout.inc.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 5125163..757a3db 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -4,7 +4,7 @@ * navigation css file from theme Original * * @package phpMyAdmin-theme - * @subpackage Original + * @subpackage pmahomme */ // unplanned execution path diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php index 49a0d23..35f28a4 100644 --- a/themes/pmahomme/css/theme_print.css.php +++ b/themes/pmahomme/css/theme_print.css.php @@ -4,7 +4,7 @@ * print css file from theme Original * * @package phpMyAdmin-theme - * @subpackage Original + * @subpackage pmahomme */ ?> /* For printview */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 1f90e3d..3e63d05 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -4,7 +4,7 @@ * main css file from theme Original * * @package phpMyAdmin-theme - * @subpackage Original + * @subpackage pmahomme */ // unplanned execution path diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php index d9b4e56..a39a0fb 100644 --- a/themes/pmahomme/info.inc.php +++ b/themes/pmahomme/info.inc.php @@ -4,7 +4,7 @@ * Theme information * * @package phpMyAdmin-theme - * @subpackage Original + * @subpackage pmahomme */ /** diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index 604982a..3338256 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -5,7 +5,7 @@ * for detailed layout configuration please refer to the css files * * @package phpMyAdmin-theme - * @subpackage Original + * @subpackage pmahomme */ /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-2031-g675677e
by Marc Delisle 10 Mar '11

10 Mar '11

The branch, master has been updated via 675677e8c574f47f3baafc93879e9103d46d3d8d (commit) from 9deac3deb2f24e140684f2b2fdbae1c6216db0b6 (commit) - Log ----------------------------------------------------------------- commit 675677e8c574f47f3baafc93879e9103d46d3d8d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 10 07:13:44 2011 -0500 To save some space in the table creation dialog ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 21a0bfc..1f90e3d 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1593,6 +1593,10 @@ code.sql, div.sqlvalidate { width: 98%; } +textarea#partitiondefinition { + height:3em; +} + /* for elements that should be revealed only via js */ .hide { display: none; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ef80013335840d95a1989880119ca322b40726f8
by Michal Čihař 10 Mar '11

10 Mar '11

The branch, master has been updated via ef80013335840d95a1989880119ca322b40726f8 (commit) via 1df5d13f2b294734b39a4057312536b6c421ffcc (commit) via 266f1fc6334a37e041efc775f48a33e94f675ea8 (commit) via e46a864183b502010c3c408b2496f4904604f329 (commit) via 78d5b3cfd2023cc0474a524478bfb00b237a352d (commit) via 9b02d6dfc3730a36c144f7803995015e4c9d60b7 (commit) via d229ce7402f9da50980c3c675553e5c0b26f4dcb (commit) via e4526f666ff7dbfff3d3ad15b8592ca5c1ba17c5 (commit) via 921bdd235e2c37c588543a2dbc688d9ee54b99a5 (commit) via 0099c9548797f6b9819e4bda45bcb36d82e9f075 (commit) via 4c0ec8d90a81f52d84a45831da173f5a309063e3 (commit) via c69626c8f0e2da227f5833f417c47f3bae9dc504 (commit) via 29a586f2744070ebc1760ae371235613e2655cfa (commit) via c390cefae4559c371105116bc0b6e37c97f64614 (commit) via 96db2f59fc9f2828c499ab040c05d913e04c5ca5 (commit) via eac8f4314cdeb40d15f114f3cd18693964a9fc5a (commit) via d100b0168a601bae5cc62c78feca693a2e015d28 (commit) via 2372be14777821a9d9b287ebad931bdba88ba71d (commit) via 483147b2419ef8b19bead630755c4b95136ff645 (commit) via 85ed8f5b60e40b76ab15269d317b498db3c6f466 (commit) via eb733b0f6cca7759af15dd58243be81bc17e8c61 (commit) via 56cf81b705d8f1faaefbc8e3478830296e051ac9 (commit) via 16978880d24b35c05b338f90aa78d858baf10fe1 (commit) via 273d5c63f427e41611124409e2cd02645c3f91c2 (commit) via b084ac4fb53dfcde4be79565f43e16f521e3040b (commit) via af247d31c43d3b3e8807c5f49b113f93d63dc283 (commit) via 9fba8a4d1c11dbf5e1f9dd73817f9f4098958ad9 (commit) via d894613855b5b515dd9ee98711fdd5d985708f69 (commit) via 3a0e8965adb275573c6b73605937d2a7a01ab259 (commit) via d7784b334681423ab8b1cede1ad5e0544db0da0a (commit) via 8e5ddeb20bbbe60b04400bbebb50288e8d0b66ea (commit) via 96840fe3a2727c703ea26e0fef7476e100508b58 (commit) from a3268c31aab764a57b520a5549fd4be550fe45bf (commit) - Log ----------------------------------------------------------------- commit ef80013335840d95a1989880119ca322b40726f8 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 10 09:45:27 2011 +0100 Update translation commit 1df5d13f2b294734b39a4057312536b6c421ffcc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:49:37 2011 +0200 Translation update done using Pootle. commit 266f1fc6334a37e041efc775f48a33e94f675ea8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:49:26 2011 +0200 Translation update done using Pootle. commit e46a864183b502010c3c408b2496f4904604f329 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:46:40 2011 +0200 Translation update done using Pootle. commit 78d5b3cfd2023cc0474a524478bfb00b237a352d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:46:06 2011 +0200 Translation update done using Pootle. commit 9b02d6dfc3730a36c144f7803995015e4c9d60b7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:45:51 2011 +0200 Translation update done using Pootle. commit d229ce7402f9da50980c3c675553e5c0b26f4dcb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:45:35 2011 +0200 Translation update done using Pootle. commit e4526f666ff7dbfff3d3ad15b8592ca5c1ba17c5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:45:23 2011 +0200 Translation update done using Pootle. commit 921bdd235e2c37c588543a2dbc688d9ee54b99a5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:44:52 2011 +0200 Translation update done using Pootle. commit 0099c9548797f6b9819e4bda45bcb36d82e9f075 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:44:41 2011 +0200 Translation update done using Pootle. commit 4c0ec8d90a81f52d84a45831da173f5a309063e3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:43:17 2011 +0200 Translation update done using Pootle. commit c69626c8f0e2da227f5833f417c47f3bae9dc504 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:42:52 2011 +0200 Translation update done using Pootle. commit 29a586f2744070ebc1760ae371235613e2655cfa Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:42:42 2011 +0200 Translation update done using Pootle. commit c390cefae4559c371105116bc0b6e37c97f64614 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:37:48 2011 +0200 Translation update done using Pootle. commit 96db2f59fc9f2828c499ab040c05d913e04c5ca5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:37:29 2011 +0200 Translation update done using Pootle. commit eac8f4314cdeb40d15f114f3cd18693964a9fc5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:36:45 2011 +0200 Translation update done using Pootle. commit d100b0168a601bae5cc62c78feca693a2e015d28 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:36:33 2011 +0200 Translation update done using Pootle. commit 2372be14777821a9d9b287ebad931bdba88ba71d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:36:03 2011 +0200 Translation update done using Pootle. commit 483147b2419ef8b19bead630755c4b95136ff645 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:35:53 2011 +0200 Translation update done using Pootle. commit 85ed8f5b60e40b76ab15269d317b498db3c6f466 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:35:18 2011 +0200 Translation update done using Pootle. commit eb733b0f6cca7759af15dd58243be81bc17e8c61 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:35:00 2011 +0200 Translation update done using Pootle. commit 56cf81b705d8f1faaefbc8e3478830296e051ac9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:33:47 2011 +0200 Translation update done using Pootle. commit 16978880d24b35c05b338f90aa78d858baf10fe1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:33:35 2011 +0200 Translation update done using Pootle. commit 273d5c63f427e41611124409e2cd02645c3f91c2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:32:59 2011 +0200 Translation update done using Pootle. commit b084ac4fb53dfcde4be79565f43e16f521e3040b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:32:01 2011 +0200 Translation update done using Pootle. commit af247d31c43d3b3e8807c5f49b113f93d63dc283 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:31:45 2011 +0200 Translation update done using Pootle. commit 9fba8a4d1c11dbf5e1f9dd73817f9f4098958ad9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:30:51 2011 +0200 Translation update done using Pootle. commit d894613855b5b515dd9ee98711fdd5d985708f69 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:30:39 2011 +0200 Translation update done using Pootle. commit 3a0e8965adb275573c6b73605937d2a7a01ab259 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:29:41 2011 +0200 Translation update done using Pootle. commit d7784b334681423ab8b1cede1ad5e0544db0da0a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:29:29 2011 +0200 Translation update done using Pootle. commit 8e5ddeb20bbbe60b04400bbebb50288e8d0b66ea Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:29:09 2011 +0200 Translation update done using Pootle. commit 96840fe3a2727c703ea26e0fef7476e100508b58 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 10 02:29:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 132 +++++++++++++++++++++-------------------- po/es.po | 78 ++++++++++++++++++++----- 2 files changed, 131 insertions(+), 79 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index cfeaf84..3f3fe7c 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1370,79 +1370,83 @@ ser reemplazado por comandos más rápidos (revisa los ejemplos en </dd> <dt>booleano <span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span></dt> - <dd>Whether to count the number of tables for each database when preparing the -list of databases for the navigation frame. + <dd>Si contar el número de tablas en cada base de datos al preparar la lista de +bases de datos para el marco de navegación. </dd> - <dt><span -id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> -string</dt> - <dd>Name of session which will be used for signon authentication method. + <dt>cadena <span +id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span></dt> + <dd>El nombre de la sesión a utilizar para el método de autenticación 'signon'. </dd> - <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> -string</dt> - <dd>URL where user will be redirected to log in for signon authentication -method. Should be absolute including protocol. + <dt>cadena <span +id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span></dt> + <dd>URL donde redirigir al usuario para iniciar sesión en el método de +autenticación 'signon'. Debe ser una URL absoluta incluyendo el protocolo. </dd> - <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span> -string</dt> - <dd>URL where user will be redirected after logout (doesn't affect config -authentication method). Should be absolute including protocol. + <dt>cadena <span +id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span></dt> + <dd>URL donde el usuario será redirigido luego de finalizar sesión (no afecta el +método de autenticación 'config'). Debe ser una URL absoluta incluyendo el +protocolo. </dd> - <dt id="cfg_ServerDefault">$cfg['ServerDefault'] integer</dt> - <dd>If you have more than one server configured, you can set -<tt>$cfg['ServerDefault']</tt> to any one of them to autoconnect to that -server when phpMyAdmin is started, or set it to 0 to be given a list of -servers without logging in.<br /> - If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST -be set to that server.</dd> - - <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] boolean</dt> - <dd>Defines whether to refresh only parts of certain pages using Ajax -techniques. Applies only where a non-Ajax behavior is possible; for example, -the Designer feature is Ajax-only so this directive does not apply to it.</dd> - - <dt id="cfg_VersionCheck">$cfg['VersionCheck'] boolean</dt> - <dd>Enables check for latest versions using javascript on main phpMyAdmin page.</dd> - - <dt id="cfg_MaxDbList">$cfg['MaxDbList'] integer</dt> - <dd>The maximum number of database names to be displayed in the navigation frame -and the database list.</dd> - - <dt id="cfg_MaxTableList">$cfg['MaxTableList'] integer</dt> - <dd>The maximum number of table names to be displayed in the main panel's list -(except on the Export page). This limit is also enforced in the navigation -panel when in Light mode.</dd> - - <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] integer</dt> - <dd>The maximum number of characters when a SQL query is displayed. The default -limit of 1000 should be correct to avoid the display of tons of hexadecimal -codes that represent BLOBs, but some users have real SQL queries that are -longer than 1000 characters. Also, if a query's length exceeds this limit, -this query is not saved in the history.</dd> - - <dt id="cfg_OBGzip">$cfg['OBGzip'] string/boolean</dt> - <dd>Defines whether to use GZip output buffering for increased speed in <abbr -title="HyperText Transfer Protocol">HTTP</abbr> transfers.<br /> - Set to true/false for enabling/disabling. When set to 'auto' (string), -phpMyAdmin tries to enable output buffering and will automatically disable -it if your browser has some problems with buffering. IE6 with a certain -patch is known to cause data corruption when having enabled buffering.</dd> - - <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] boolean</dt> - <dd>Whether persistent connections should be used or not (mysql_connect or + <dt id="cfg_ServerDefault">Entero $cfg['ServerDefault']</dt> + <dd>Si se tiene más de un servidor configurado, puedes definir +<tt>$cfg['ServerDefault']</tt> a cualquiera de ellos para conectarse +automáticamente a ese servidor al iniciar phpMyAdmin, o definirlo como 0 +para proveer una lista de servidores sin iniciar sesión.<br /> + Si sólo tienes un servidor configurado, <tt>$cfg['ServerDefault']</tt> TIENE +que estar definido a ese servidor.</dd> + + <dt id="cfg_AjaxEnable">booleano $cfg['AjaxEnable']</dt> + <dd>Define si sólo se actualizan algunas partes de ciertas páginas utilizando +técnicas Ajax. Aplica sólo cuando un comportamiento sin Ajax es posible; por +ejemplo, la funcionalidad de Diseñador sólo funciona con Ajax por lo que +esta directiva no le aplica.</dd> + + <dt id="cfg_VersionCheck">booleano $cfg['VersionCheck']</dt> + <dd>Activa el chequeo para las últimas versiones utilizando javascript en la +página principal de phpMyAdmin.</dd> + + <dt id="cfg_MaxDbList">entero $cfg['MaxDbList']</dt> + <dd>La cantidad máxima de nombres de bases de datos a mostrar en el marco de +navegación y la lista de bases de datos.</dd> + + <dt id="cfg_MaxTableList">entero $cfg['MaxTableList']</dt> + <dd>La cantidad máxima de nombres de tablas a mostrar en la lista del panel +principal (excepto en la página de exportación). Este límite también es +forzado en el panel de navegación en el modo ligero.</dd> + + <dt id="cfg_MaxCharactersInDisplayedSQL">entero $cfg['MaxCharactersInDisplayedSQL']</dt> + <dd>El número máximo de caracteres a mostrar en una consulta SQL. El valor +predeterminado de 1000 debería de ser suficiente para evitar mostrar muchos +códigos hexadecimales que representan los BLOBs, pero algunos usuarios +tienen consultas SQLs reales de más de 1000 caracteres. También, si una +consulta excede este límite, no será guardada en el histórico.</dd> + + <dt id="cfg_OBGzip">cadena/booleano $cfg['OBGzip']</dt> + <dd>Si se utiliza un búfer de salida GZip para mayor velocidad en transferencias +<abbr title="HyperText Transfer Protocol">HTTP</abbr>.<br /> + Defina como 'true' o 'false' para habilitar o deshabilitarlo +respectivamente. Al definirlo como 'auto', phpMyAdmin intentará activarlo y +lo desactivará automáticamente si el navegador tiene problemas con él. Es +sabido que IE6 con ciertos parches causa corrupción de datos al habilitar +los búfers.</dd> + + <dt id="cfg_PersistentConnections">booleano $cfg['PersistentConnections']</dt> + <dd>Si se deben utilizar conexiones persistentes o no (mysql_connect o mysql_pconnect).</dd> - <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt> - <dd>Whether to force using https while accessing phpMyAdmin.</dd> + <dt id="cfg_ForceSSL">booleano $cfg['ForceSSL']</dt> + <dd>Si se debe forzar https al acceder a phpMyAdmin.</dd> - <dt id="cfg_ExecTimeLimit">$cfg['ExecTimeLimit'] integer [number of seconds]</dt> - <dd>Set the number of seconds a script is allowed to run. If seconds is set to -zero, no time limit is imposed.<br /> - This setting is used while importing/exporting dump files and in the -Synchronize feature but has no effect when PHP is running in safe mode.</dd> + <dt id="cfg_ExecTimeLimit">entero $cfg['ExecTimeLimit'] (número de segundos)</dt> + <dd>Configura la cantidad de segundos que se le permitirá ejecutar a un +script. Si es cero, no se impondrá ningún límite de tiempo.<br /> + Esta configuración es utilizada al importar/exportar archivos de volcado y +cuando en la funcionalidad de sincronización pero no tiene efecto cuando PHP +está ejecutando en modo seguro.</dd> - <dt id="cfg_SessionSavePath">$cfg['SessionSavePath'] string</dt> + <dt id="cfg_SessionSavePath">cadena $cfg['SessionSavePath']</dt> <dd>Path for storing session data (<a href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd> diff --git a/po/es.po b/po/es.po index 48f80e9..f1c4f63 100644 --- a/po/es.po +++ b/po/es.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-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-09 00:53+0200\n" +"PO-Revision-Date: 2011-03-10 02:49+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -3409,6 +3409,8 @@ msgid "" "Whether to count the number of tables for each database when preparing the " "list of databases for the navigation frame." msgstr "" +"Si contar el número de tablas en cada base de datos al preparar la lista de " +"bases de datos para el marco de navegación." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1278 @@ -3416,11 +3418,14 @@ msgid "" "<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</" "span> string" msgstr "" +"cadena <span " +"id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1279 msgid "Name of session which will be used for signon authentication method." msgstr "" +"El nombre de la sesión a utilizar para el método de autenticación 'signon'." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1281 @@ -3428,6 +3433,8 @@ msgid "" "<span id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span> " "string" msgstr "" +"cadena <span " +"id=\"cfg_Servers_SignonURL\">$cfg['Servers'][$i]['SignonURL']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1282 @@ -3435,6 +3442,8 @@ msgid "" "URL where user will be redirected to log in for signon authentication " "method. Should be absolute including protocol." msgstr "" +"URL donde redirigir al usuario para iniciar sesión en el método de " +"autenticación 'signon'. Debe ser una URL absoluta incluyendo el protocolo." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1284 @@ -3442,6 +3451,8 @@ msgid "" "<span id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span> " "string" msgstr "" +"cadena <span " +"id=\"cfg_Servers_LogoutURL\">$cfg['Servers'][$i]['LogoutURL']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1285 @@ -3449,11 +3460,14 @@ msgid "" "URL where user will be redirected after logout (doesn't affect config " "authentication method). Should be absolute including protocol." msgstr "" +"URL donde el usuario será redirigido luego de finalizar sesión (no afecta el " +"método de autenticación 'config'). Debe ser una URL absoluta incluyendo el " +"protocolo." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1288 msgid "$cfg['ServerDefault'] integer" -msgstr "" +msgstr "Entero $cfg['ServerDefault']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1289 @@ -3463,6 +3477,10 @@ msgid "" "phpMyAdmin is started, or set it to 0 to be given a list of servers without " "logging in." msgstr "" +"Si se tiene más de un servidor configurado, puedes definir " +"<tt>$cfg['ServerDefault']</tt> a cualquiera de ellos para conectarse " +"automáticamente a ese servidor al iniciar phpMyAdmin, o definirlo como 0 " +"para proveer una lista de servidores sin iniciar sesión." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1293 @@ -3470,12 +3488,13 @@ msgid "" "If you have only one server configured, <tt>$cfg['ServerDefault']</tt> MUST " "be set to that server." msgstr "" +"Si sólo tienes un servidor configurado, <tt>$cfg['ServerDefault']</tt> TIENE " +"que estar definido a ese servidor." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1296 -#, fuzzy msgid "$cfg['AjaxEnable'] boolean" -msgstr "$cfg['SuhosinDisableWarning'] boolean" +msgstr "booleano $cfg['AjaxEnable']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1297 @@ -3484,23 +3503,28 @@ msgid "" "techniques. Applies only where a non-Ajax behavior is possible; for example, " "the Designer feature is Ajax-only so this directive does not apply to it." msgstr "" +"Define si sólo se actualizan algunas partes de ciertas páginas utilizando " +"técnicas Ajax. Aplica sólo cuando un comportamiento sin Ajax es posible; por " +"ejemplo, la funcionalidad de Diseñador sólo funciona con Ajax por lo que " +"esta directiva no le aplica." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1302 -#, fuzzy msgid "$cfg['VersionCheck'] boolean" -msgstr "$cfg['SuhosinDisableWarning'] boolean" +msgstr "booleano $cfg['VersionCheck']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1303 msgid "" "Enables check for latest versions using javascript on main phpMyAdmin page." msgstr "" +"Activa el chequeo para las últimas versiones utilizando javascript en la " +"página principal de phpMyAdmin." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1306 msgid "$cfg['MaxDbList'] integer" -msgstr "" +msgstr "entero $cfg['MaxDbList']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1307 @@ -3508,11 +3532,13 @@ msgid "" "The maximum number of database names to be displayed in the navigation frame " "and the database list." msgstr "" +"La cantidad máxima de nombres de bases de datos a mostrar en el marco de " +"navegación y la lista de bases de datos." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1310 msgid "$cfg['MaxTableList'] integer" -msgstr "" +msgstr "entero $cfg['MaxTableList']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1311 @@ -3521,11 +3547,14 @@ msgid "" "(except on the Export page). This limit is also enforced in the navigation " "panel when in Light mode." msgstr "" +"La cantidad máxima de nombres de tablas a mostrar en la lista del panel " +"principal (excepto en la página de exportación). Este límite también es " +"forzado en el panel de navegación en el modo ligero." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1315 msgid "$cfg['MaxCharactersInDisplayedSQL'] integer" -msgstr "" +msgstr "entero $cfg['MaxCharactersInDisplayedSQL']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1316 @@ -3536,11 +3565,16 @@ msgid "" "longer than 1000 characters. Also, if a query's length exceeds this limit, " "this query is not saved in the history." msgstr "" +"El número máximo de caracteres a mostrar en una consulta SQL. El valor " +"predeterminado de 1000 debería de ser suficiente para evitar mostrar muchos " +"códigos hexadecimales que representan los BLOBs, pero algunos usuarios " +"tienen consultas SQLs reales de más de 1000 caracteres. También, si una " +"consulta excede este límite, no será guardada en el histórico." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1322 msgid "$cfg['OBGzip'] string/boolean" -msgstr "" +msgstr "cadena/booleano $cfg['OBGzip']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1323 @@ -3548,6 +3582,8 @@ msgid "" "Defines whether to use GZip output buffering for increased speed in <abbr " "title=\"HyperText Transfer Protocol\">HTTP</abbr> transfers." msgstr "" +"Si se utiliza un búfer de salida GZip para mayor velocidad en transferencias " +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1325 @@ -3557,11 +3593,16 @@ msgid "" "it if your browser has some problems with buffering. IE6 with a certain " "patch is known to cause data corruption when having enabled buffering." msgstr "" +"Defina como 'true' o 'false' para habilitar o deshabilitarlo " +"respectivamente. Al definirlo como 'auto', phpMyAdmin intentará activarlo y " +"lo desactivará automáticamente si el navegador tiene problemas con él. Es " +"sabido que IE6 con ciertos parches causa corrupción de datos al habilitar " +"los búfers." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1330 msgid "$cfg['PersistentConnections'] boolean" -msgstr "" +msgstr "booleano $cfg['PersistentConnections']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1331 @@ -3569,21 +3610,23 @@ msgid "" "Whether persistent connections should be used or not (mysql_connect or " "mysql_pconnect)." msgstr "" +"Si se deben utilizar conexiones persistentes o no (mysql_connect o " +"mysql_pconnect)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1334 msgid "$cfg['ForceSSL'] boolean" -msgstr "" +msgstr "booleano $cfg['ForceSSL']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1335 msgid "Whether to force using https while accessing phpMyAdmin." -msgstr "" +msgstr "Si se debe forzar https al acceder a phpMyAdmin." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1337 msgid "$cfg['ExecTimeLimit'] integer [number of seconds]" -msgstr "" +msgstr "entero $cfg['ExecTimeLimit'] (número de segundos)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1338 @@ -3591,6 +3634,8 @@ msgid "" "Set the number of seconds a script is allowed to run. If seconds is set to " "zero, no time limit is imposed." msgstr "" +"Configura la cantidad de segundos que se le permitirá ejecutar a un script. " +"Si es cero, no se impondrá ningún límite de tiempo." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1340 @@ -3598,11 +3643,14 @@ msgid "" "This setting is used while importing/exporting dump files and in the " "Synchronize feature but has no effect when PHP is running in safe mode." msgstr "" +"Esta configuración es utilizada al importar/exportar archivos de volcado y " +"cuando en la funcionalidad de sincronización pero no tiene efecto cuando PHP " +"está ejecutando en modo seguro." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1343 msgid "$cfg['SessionSavePath'] string" -msgstr "" +msgstr "cadena $cfg['SessionSavePath']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1344 hooks/post-receive -- phpMyAdmin localized documentation

1 0