Git February 2011

git@phpmyadmin.net

5 participants
230 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-812-g60f85e1

by Marc Delisle

The branch, master has been updated via 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) from aef93ba59230af6932cbdfea83a1f60d56676794 (commit) - Log ----------------------------------------------------------------- commit 60f85e193449f02cb81550be8dc3476d0b04e812 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:55:51 2011 -0500 Improve full mode navi display when CountTables is false ----------------------------------------------------------------------- Summary of changes: navigation.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/navigation.php b/navigation.php index ef191fe..381b561 100644 --- a/navigation.php +++ b/navigation.php @@ -423,18 +423,23 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { . '?' . $common_url_query; ?>', 'main'); return false;"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + // Might be unset if CountTables directive is false + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> <?php } else { - // with only 1 db available we dont need to refresh left frame + // with only 1 db available we dont need to refresh navi frame // on db selection, only phpmain ?> <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] @@ -442,12 +447,16 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { id="<?php echo htmlspecialchars($db['name']); ?>" title="<?php echo htmlspecialchars($db['comment']); ?>"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-811-gaef93ba

by Marc Delisle

The branch, master has been updated via aef93ba59230af6932cbdfea83a1f60d56676794 (commit) from 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) - Log ----------------------------------------------------------------- commit aef93ba59230af6932cbdfea83a1f60d56676794 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:44:33 2011 -0500 Bug #3178935 Navigation full mode: no expansion ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index c162aa2..ef191fe 100644 --- a/navigation.php +++ b/navigation.php @@ -453,7 +453,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { </a> <?php } - if ($db['num_tables']) { + if (($GLOBALS['cfg']['Server']['CountTables'] === false) || $db['num_tables']) { if (isset($tables_full[$db['name']])) { $tables = PMA_getTableList($db['name'], $tables_full[$db['name']]); } elseif (isset($tables_full[strtolower($db['name'])])) { hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-810-g8cd7179

by Madhura Jayaratne

The branch, master has been updated via 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) via da82fe392b0ac802284abee3810aae9f2bc4b381 (commit) from e831df2a32e7aa7f420fca1c65b797891a298fca (commit) - Log ----------------------------------------------------------------- commit 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 Merge: da82fe392b0ac802284abee3810aae9f2bc4b381 e831df2a32e7aa7f420fca1c65b797891a298fca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:56:20 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit da82fe392b0ac802284abee3810aae9f2bc4b381 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:54:36 2011 +0530 Bug #3183970 Losing SQL history ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 18504e2..9588853 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -22,7 +22,7 @@ if (! defined('PHPMYADMIN')) { */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { - // Avoid caching of the number of rows affected; for example, this function + // Avoid caching of the number of rows affected; for example, this function // is called for tracking purposes but we want to display the correct number // of rows affected by the original query, not by the query generated for // tracking. @@ -760,10 +760,6 @@ function PMA_getHistory($username) { $cfgRelation = PMA_getRelationsParam(); - if (isset($_SESSION['sql_history'])) { - return array_reverse($_SESSION['sql_history']); - } - if (! $cfgRelation['historywork']) { return false; } hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-808-ge831df2

by Marc Delisle

The branch, master has been updated via e831df2a32e7aa7f420fca1c65b797891a298fca (commit) from 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) - Log ----------------------------------------------------------------- commit e831df2a32e7aa7f420fca1c65b797891a298fca Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 08:23:09 2011 -0500 Bug #3185710 No window with the confirmation of this operation ----------------------------------------------------------------------- Summary of changes: js/sql.js | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 8173b5e..be6a7ab 100644 --- a/js/sql.js +++ b/js/sql.js @@ -230,10 +230,17 @@ $(document).ready(function() { $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { - // fade out previous success message, if any + // fade out previous messages, if any $('.success').fadeOut(); + $('.sqlquery_message').fadeOut(); // show a message that stays on screen $('#sqlqueryform').before(data.message); + // and display the query + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-807-g2410839

by Madhura Jayaratne

The branch, master has been updated via 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) from 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) - Log ----------------------------------------------------------------- commit 2410839251d72a6947d291f0174a85bcf9b53e53 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 11:47:42 2011 +0530 Should be NULL, not 'NULL' ----------------------------------------------------------------------- Summary of changes: js/sql.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index fd38843..8173b5e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -649,9 +649,10 @@ $(document).ready(function() { for (var key in params_to_submit) { value = params_to_submit[key]; if (value.length == 0) { - value = 'NULL'; + sql_query += ' ' + key + "=NULL, "; + } else { + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-806-g2a754b2

by Madhura Jayaratne

The branch, master has been updated via 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) from 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) - Log ----------------------------------------------------------------- commit 2a754b25e44212a9d3cca035f29c86705ac8c2da Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 07:35:12 2011 +0530 Bug #3184827 Inline edit fails on some tables ----------------------------------------------------------------------- Summary of changes: js/sql.js | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/sql.js b/js/sql.js index d286348..fd38843 100644 --- a/js/sql.js +++ b/js/sql.js @@ -643,12 +643,16 @@ $(document).ready(function() { */ var sql_query = 'UPDATE ' + window.parent.table + ' SET '; - $.each(params_to_submit, function(key, value) { - if(value.length == 0) { - value = 'NULL' - } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; - }) + // $.each() not used here since it cause problems when there is a column + // in the table with the name 'length'. See bug #3184827 + var value; + for (var key in params_to_submit) { + value = params_to_submit[key]; + if (value.length == 0) { + value = 'NULL'; + } + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; + } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); sql_query += ' WHERE ' + PMA_urldecode(where_clause); hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-805-g82a1d45

by Madhura Jayaratne

The branch, master has been updated via 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) via bd8126735f5dce0e894f2e7e549a6322f30936ca (commit) from 66282adec9a900d98afa910f78d97352c75d300a (commit) - Log ----------------------------------------------------------------- commit 82a1d451d1fad0164b4efde5b89a7f4f989b18ba Merge: bd8126735f5dce0e894f2e7e549a6322f30936ca 66282adec9a900d98afa910f78d97352c75d300a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:36:15 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bd8126735f5dce0e894f2e7e549a6322f30936ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:34:19 2011 +0530 Inline edit fails for foreign keys. ----------------------------------------------------------------------- Summary of changes: sql.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql.php b/sql.php index 0232620..3655d87 100644 --- a/sql.php +++ b/sql.php @@ -65,9 +65,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value $foreignData = PMA_getForeignData($foreigners, $column, false, '', ''); - $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); - - if( $dropdown == '<option value=""> </option>'."\n" ) { + if ($foreignData['disp_row'] == null) { //Handle the case when number of values is more than $cfg['ForeignKeyMaxLimit'] $_url_params = array( 'db' => $db, @@ -80,6 +78,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value .'>' . __('Browse foreign values') . '</a>'; } else { + $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); $dropdown = '<select>' . $dropdown . '</select>'; } hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-803-g66282ad

by Michal Čihař

The branch, master has been updated via 66282adec9a900d98afa910f78d97352c75d300a (commit) via e822d0802e327ddb2d393eb7416bab3096a759d9 (commit) from 054e265cdbae052c3d66956e90cd5fabf52fe0d9 (commit) - Log ----------------------------------------------------------------- commit 66282adec9a900d98afa910f78d97352c75d300a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 17 17:49:28 2011 +0100 Update ignore list commit e822d0802e327ddb2d393eb7416bab3096a759d9 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 17 17:48:38 2011 +0100 Drop 5 years old spec file for Fedora. ----------------------------------------------------------------------- Summary of changes: contrib/packaging/Fedora/phpMyAdmin-http.conf | 12 -- contrib/packaging/Fedora/phpMyAdmin.spec | 162 ------------------------- themes/.gitignore | 1 + 3 files changed, 1 insertions(+), 174 deletions(-) delete mode 100644 contrib/packaging/Fedora/phpMyAdmin-http.conf delete mode 100644 contrib/packaging/Fedora/phpMyAdmin.spec diff --git a/contrib/packaging/Fedora/phpMyAdmin-http.conf b/contrib/packaging/Fedora/phpMyAdmin-http.conf deleted file mode 100644 index 4fb1041..0000000 --- a/contrib/packaging/Fedora/phpMyAdmin-http.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# MySQL server administration. -# -Alias /phpMyAdmin /var/www/myadmin - -<Directory /var/www/myadmin> - DirectoryIndex index.php - Options Indexes Includes ExecCGI - AllowOverride None - Order deny,allow - Allow from all -</Directory> diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec deleted file mode 100644 index 5906da1..0000000 --- a/contrib/packaging/Fedora/phpMyAdmin.spec +++ /dev/null @@ -1,162 +0,0 @@ -%define _myadminpath /var/www/myadmin -%define pkgrelease rc1 -%define microrelease 1 - -Name: phpMyAdmin -Version: 2.8.0 -Release: %{pkgrelease}.%{microrelease} -License: GPL -Group: Applications/Databases/Interfaces -Source0: http://prdownloads.sourceforge.net/phpmyadmin/%{name}-%{version}-%{pkgrelea… -Source1: phpMyAdmin-http.conf -URL: http://sourceforge.net/projects/phpmyadmin/ -Requires: mysql -Requires: php-mysql -Buildarch: noarch -BuildRoot: %{_tmppath}/%{name}-root - -Summary: phpMyAdmin - web-based MySQL administration - -%description -phpMyAdmin can manage a whole MySQL-server (needs a super-user) but -also a single database. To accomplish the latter you'll need a -properly set up MySQL-user which can read/write only the desired -database. It's up to you to look up the appropiate part in the MySQL -manual. Currently phpMyAdmin can: - - create and drop databases - - create, copy, drop and alter tables - - delete, edit and add fields - - execute any SQL-statement, even batch-queries - - manage keys on fields - - load text files into tables - - create (*) and read dumps of tables - - export (*) and import data to CSV values - - administer multiple servers and single databases - - check referencial integrity - - create complex queries automatically connecting required tables - - create PDF graphics of your database layout - - communicate in more than 38 different languages - - -%prep -%setup -q -n %{name}-%{version}-%{pkgrelease} - - -%build - - -%install -[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && \ - rm -rf "${RPM_BUILD_ROOT}" - -# Create directories. - -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/{css,js,lang,libraries,themes} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{auth,dbg,dbi,engines} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,tcpdf,import} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/transformations -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/tcpdf/font -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/{darkblue_orange,original} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/darkblue_orange/{css,img} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/original/{css,img} - -# Install files. - -install libraries/config.default.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}"/config.inc.php -install *.{php,ico} "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install ChangeLog LICENSE README "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install Documentation.html docs.css "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install css/* "${RPM_BUILD_ROOT}%{_myadminpath}/css"/ -install js/* "${RPM_BUILD_ROOT}%{_myadminpath}/js"/ -install lang/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/lang"/ -install libraries/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries"/ -install libraries/auth/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/auth"/ -install libraries/dbg/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/dbg"/ -install libraries/dbi/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/dbi"/ -install libraries/engines/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/engines"/ -install libraries/export/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/export"/ -install libraries/tcpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf"/ -install libraries/tcpdf/font/*.{php,z} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf/font"/ -install libraries/import/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/import"/ -install libraries/transformations/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/transformations"/ -install themes/darkblue_orange/*.{php,png} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange"/ -install themes/darkblue_orange/css/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange/css"/ -install themes/darkblue_orange/img/*.{png,ico} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange/img"/ -install themes/original/*.{php,png} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original"/ -install themes/original/css/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original/css"/ -install themes/original/img/*.{png,ico} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original/img"/ - -# Create documentation directories. - -DOCROOT="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" -install -d "${DOCROOT}" -install -d "${DOCROOT}"/{lang,scripts,transformations} - -# Install documentation files. - -install RELEASE-DATE-* "${DOCROOT}"/ -install CREDITS ChangeLog INSTALL LICENSE "${DOCROOT}"/ -install README TODO "${DOCROOT}"/ -install Documentation.* docs.css "${DOCROOT}"/ -install lang/*.sh "${DOCROOT}"/lang/ -install scripts/* "${DOCROOT}"/scripts/ -install libraries/tcpdf/README "${DOCROOT}"/README.tcpdf -install libraries/import/README "${DOCROOT}"/README.import -install libraries/transformations/README "${DOCROOT}"/transformations/ -install libraries/transformations/TEMPLATE* "${DOCROOT}"/transformations/ -install libraries/transformations/*.sh "${DOCROOT}"/transformations/ - -# Install configuration file for Apache. - -install -d "${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d" -install "%{SOURCE1}" \ - "${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf" - -# Generate non-configuration file list. - -(cd "${RPM_BUILD_ROOT}"; ls -d ."%{_myadminpath}"/*) | - sed -e '/\/config\.inc\.php$/d' -e 's/^.//' > files.list - - - -%clean -[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && \ - rm -rf "${RPM_BUILD_ROOT}" - - -%files -f files.list -%defattr(644, root, root, 755) -%doc %{_docdir}/%{name}-%{version} -%dir %{_myadminpath} -%attr(640,root,apache) %config(noreplace) %verify(not size mtime md5) %{_myadminpath}/config.inc.php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/conf.d/* - - -%changelog -* Thu Feb 23 2006 Patrick Monnerat <pm(a)datasphere.ch> -- Version 2.8.0-rc1.1. - -* Thu Dec 22 2005 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Path "nullpw" to allow trying connection with null password after failure. -- Version 2.7.0-pl1.1. - -* Mon Aug 22 2005 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.6.3-pl1. - -* Wed Jul 21 2004 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.5.7-pl1. - -* Fri Nov 22 2002 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.3.0-rc1. diff --git a/themes/.gitignore b/themes/.gitignore index 8b50898..7d874cb 100644 --- a/themes/.gitignore +++ b/themes/.gitignore @@ -29,3 +29,4 @@ xp_blue xp_dirty xp_green xp_silver +emphasis hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-801-g054e265

by Michal Čihař

The branch, master has been updated via 054e265cdbae052c3d66956e90cd5fabf52fe0d9 (commit) from 54e959ee59a2dcd2cd4cda8f08c436c60cab8984 (commit) - Log ----------------------------------------------------------------- commit 054e265cdbae052c3d66956e90cd5fabf52fe0d9 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 17 17:17:21 2011 +0100 Remove useless reference to feature tracker ----------------------------------------------------------------------- Summary of changes: sql.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sql.php b/sql.php index 0e59896..0232620 100644 --- a/sql.php +++ b/sql.php @@ -364,7 +364,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } // Measure query time. - // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23… $querytime_before = array_sum(explode(' ', microtime())); $result = @PMA_DBI_try_query($full_sql_query, null, PMA_DBI_QUERY_STORE); hooks/post-receive -- phpMyAdmin

13 years, 7 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-800-g54e959e

by Michal Čihař

The branch, master has been updated via 54e959ee59a2dcd2cd4cda8f08c436c60cab8984 (commit) via 3c2d9d54d3ce1b39789b3ba7130ec142f9fec9f1 (commit) via f109bfa3d3792b81bf9443180589b97cd460b61e (commit) via 44b172c3ccd75f8a33739fd5d133df258be9c911 (commit) via cb02247cd288018982def4ad63ba444f765c5c1b (commit) via 6e1a835f35bcb52760ac8cb37c47a531e4669d25 (commit) via 09ccf11e592d9382fe9debf84708d159dd852d72 (commit) via 8e0c36fe8d1a7b4e029ae9550b8fa37191ae9daa (commit) via 37da50bedea6d7c1267b4d8d77c5d5e98830632b (commit) via cae8cd5d33f713ebab8fad46e4717933f8d64082 (commit) via 9faa3cb6dea27f071b32e6e1ef0ab831ec0a511c (commit) via 1c74baf32dfe77ec3400b8556078bca7a84dd2b6 (commit) via 20868c2592880b07c377cfd62add297acd0cc485 (commit) via 659468bdc67f5ab4da04913ed57d236a0c641c97 (commit) via 83b5655cc96ea3eddd17aff3fcdc856dc8491b38 (commit) via 377e865f933af8673077a8b349596607f7ecc313 (commit) via 0b5825ca9cecb6232c033624d62e334ce834d784 (commit) via d411a6c10d66f254006be0c25f2cf97f3ee228c5 (commit) via 1de65f630cd11d2d0e1f620fb7da6e5be66b3fec (commit) via d58a023c0da790049e9e8a39f02e0f71f0f32dca (commit) via 09ad8db3057b5e11c722653970d0818fe86327ae (commit) via 04aa4c5bdbbac334df5ce9c6758eaf924bfa9a77 (commit) via ea4bcd0334df4652b6895e6ab9dc19721b43af79 (commit) via accc99c0885ae2e587a60774d4a68d4fdfb04106 (commit) via d04bcf5e0d0353fbaa570352a37d92bf018d66bc (commit) via b079aea614e92fbe236d879f1ff9717008f7d3ff (commit) via 2b097423bb9237961acaa8f2e053a97fe8305884 (commit) via 9408da93bab0eda67054882aa7e4452a3a8a039b (commit) via 42edb3321c0107b75df97b3a12fa8c5178b928cf (commit) via b38aad28a136f3387fdb2e02fee5927858aa116f (commit) via b769efd951c56bbe2d71f7369c5496405b703928 (commit) via 2f19a7f0cc3c513706abd83df737c85fcc04a0bb (commit) via 553ce2cc4d3c6a962a93981c58737a4ff89139fa (commit) via 110bcad7d9586fa152f3cd63152a7e1cd039962b (commit) via b8a3a8ddeb07e6c02cf9350a29f73b74a9d85583 (commit) via ec7da25cacf2e82a9f472423c1b00e976036d606 (commit) via bd57a8fae806d74cc551b459815a3e748ae6a959 (commit) via e8be9a087fe2111f27e164f35744fdc4cfd1380c (commit) via a5039d3513854af5121e68f76db8c7a5fc078089 (commit) via 5676625bce40c78f0ce3870337d3f59c6d244e53 (commit) via 2061b621996a6b19cf2a12c725734256399de776 (commit) via 575cecc70fb8e62bf861e9adea1266f6cdb2f05a (commit) via ca0515251342a966c317c21e124e7e14e9fcbf24 (commit) via ae4b67ddfcc8c9db38946dd62cc47c3a0b294c32 (commit) via 18f942c66707dfeb18d9a84f17624000f39d5474 (commit) from 4a6adc7e29afe6fd8c4c57ab4e552a344755751d (commit) - Log ----------------------------------------------------------------- commit 54e959ee59a2dcd2cd4cda8f08c436c60cab8984 Merge: 3c2d9d54d3ce1b39789b3ba7130ec142f9fec9f1 4a6adc7e29afe6fd8c4c57ab4e552a344755751d Author: Pootle server <pootle(a)cihar.com> Date: Thu Feb 17 14:40:05 2011 +0100 Merge remote branch 'origin/master' commit 3c2d9d54d3ce1b39789b3ba7130ec142f9fec9f1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:07:10 2011 +0200 Translation update done using Pootle. commit f109bfa3d3792b81bf9443180589b97cd460b61e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:06:30 2011 +0200 Translation update done using Pootle. commit 44b172c3ccd75f8a33739fd5d133df258be9c911 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:05:58 2011 +0200 Translation update done using Pootle. commit cb02247cd288018982def4ad63ba444f765c5c1b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:05:41 2011 +0200 Translation update done using Pootle. commit 6e1a835f35bcb52760ac8cb37c47a531e4669d25 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:05:34 2011 +0200 Translation update done using Pootle. commit 09ccf11e592d9382fe9debf84708d159dd852d72 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:05:26 2011 +0200 Translation update done using Pootle. commit 8e0c36fe8d1a7b4e029ae9550b8fa37191ae9daa Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:04:19 2011 +0200 Translation update done using Pootle. commit 37da50bedea6d7c1267b4d8d77c5d5e98830632b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:03:51 2011 +0200 Translation update done using Pootle. commit cae8cd5d33f713ebab8fad46e4717933f8d64082 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:03:33 2011 +0200 Translation update done using Pootle. commit 9faa3cb6dea27f071b32e6e1ef0ab831ec0a511c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:03:19 2011 +0200 Translation update done using Pootle. commit 1c74baf32dfe77ec3400b8556078bca7a84dd2b6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:03:02 2011 +0200 Translation update done using Pootle. commit 20868c2592880b07c377cfd62add297acd0cc485 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:02:38 2011 +0200 Translation update done using Pootle. commit 659468bdc67f5ab4da04913ed57d236a0c641c97 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:01:52 2011 +0200 Translation update done using Pootle. commit 83b5655cc96ea3eddd17aff3fcdc856dc8491b38 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:01:36 2011 +0200 Translation update done using Pootle. commit 377e865f933af8673077a8b349596607f7ecc313 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:01:17 2011 +0200 Translation update done using Pootle. commit 0b5825ca9cecb6232c033624d62e334ce834d784 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 14:00:47 2011 +0200 Translation update done using Pootle. commit d411a6c10d66f254006be0c25f2cf97f3ee228c5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:58:56 2011 +0200 Translation update done using Pootle. commit 1de65f630cd11d2d0e1f620fb7da6e5be66b3fec Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:58:40 2011 +0200 Translation update done using Pootle. commit d58a023c0da790049e9e8a39f02e0f71f0f32dca Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:58:22 2011 +0200 Translation update done using Pootle. commit 09ad8db3057b5e11c722653970d0818fe86327ae Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:58:04 2011 +0200 Translation update done using Pootle. commit 04aa4c5bdbbac334df5ce9c6758eaf924bfa9a77 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:57:51 2011 +0200 Translation update done using Pootle. commit ea4bcd0334df4652b6895e6ab9dc19721b43af79 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:52:22 2011 +0200 Translation update done using Pootle. commit accc99c0885ae2e587a60774d4a68d4fdfb04106 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:52:08 2011 +0200 Translation update done using Pootle. commit d04bcf5e0d0353fbaa570352a37d92bf018d66bc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:51:56 2011 +0200 Translation update done using Pootle. commit b079aea614e92fbe236d879f1ff9717008f7d3ff Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:51:41 2011 +0200 Translation update done using Pootle. commit 2b097423bb9237961acaa8f2e053a97fe8305884 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:51:18 2011 +0200 Translation update done using Pootle. commit 9408da93bab0eda67054882aa7e4452a3a8a039b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:50:53 2011 +0200 Translation update done using Pootle. commit 42edb3321c0107b75df97b3a12fa8c5178b928cf Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:50:43 2011 +0200 Translation update done using Pootle. commit b38aad28a136f3387fdb2e02fee5927858aa116f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:50:33 2011 +0200 Translation update done using Pootle. commit b769efd951c56bbe2d71f7369c5496405b703928 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:50:04 2011 +0200 Translation update done using Pootle. commit 2f19a7f0cc3c513706abd83df737c85fcc04a0bb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:49:52 2011 +0200 Translation update done using Pootle. commit 553ce2cc4d3c6a962a93981c58737a4ff89139fa Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:49:11 2011 +0200 Translation update done using Pootle. commit 110bcad7d9586fa152f3cd63152a7e1cd039962b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:48:45 2011 +0200 Translation update done using Pootle. commit b8a3a8ddeb07e6c02cf9350a29f73b74a9d85583 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:47:52 2011 +0200 Translation update done using Pootle. commit ec7da25cacf2e82a9f472423c1b00e976036d606 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:47:15 2011 +0200 Translation update done using Pootle. commit bd57a8fae806d74cc551b459815a3e748ae6a959 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:46:57 2011 +0200 Translation update done using Pootle. commit e8be9a087fe2111f27e164f35744fdc4cfd1380c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:46:39 2011 +0200 Translation update done using Pootle. commit a5039d3513854af5121e68f76db8c7a5fc078089 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:46:16 2011 +0200 Translation update done using Pootle. commit 5676625bce40c78f0ce3870337d3f59c6d244e53 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:46:06 2011 +0200 Translation update done using Pootle. commit 2061b621996a6b19cf2a12c725734256399de776 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:45:47 2011 +0200 Translation update done using Pootle. commit 575cecc70fb8e62bf861e9adea1266f6cdb2f05a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:45:29 2011 +0200 Translation update done using Pootle. commit ca0515251342a966c317c21e124e7e14e9fcbf24 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:45:18 2011 +0200 Translation update done using Pootle. commit ae4b67ddfcc8c9db38946dd62cc47c3a0b294c32 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:45:02 2011 +0200 Translation update done using Pootle. commit 18f942c66707dfeb18d9a84f17624000f39d5474 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Feb 17 13:44:36 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 116 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 55 insertions(+), 61 deletions(-) diff --git a/po/es.po b/po/es.po index 3cdd049..6b712df 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-02-17 11:03+0100\n" -"PO-Revision-Date: 2011-02-16 19:13+0200\n" +"PO-Revision-Date: 2011-02-17 14:07+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -1138,7 +1138,7 @@ msgstr "Seleccione la clave referenciada" #: js/messages.php:97 msgid "Select Foreign Key" -msgstr "Seleccione la clave foránea (foreign key)" +msgstr "Seleccione la clave foránea" #: js/messages.php:98 msgid "Please select the primary key or a unique key" @@ -1607,8 +1607,7 @@ msgstr "Tabla %s ahora se llama %s" #: libraries/Theme.class.php:160 #, php-format msgid "No valid image path for theme %s found!" -msgstr "" -"¡No se halló la ruta de imágenes para la plantilla de interfaz (theme) %s!" +msgstr "¡No se halló la ruta de imágenes para el tema %s!" #: libraries/Theme.class.php:380 msgid "No preview available." @@ -1621,19 +1620,17 @@ msgstr "tómelo" #: libraries/Theme_Manager.class.php:109 #, php-format msgid "Default theme %s not found!" -msgstr "¡No se halló la plantilla de interfaz (theme) predeterminada %s!" +msgstr "¡No se halló el tema predeterminado %s!" #: libraries/Theme_Manager.class.php:147 #, php-format msgid "Theme %s not found!" -msgstr "¡No se halló la plantilla de interfaz (theme) %s!" +msgstr "¡No se halló el tema %s!" #: libraries/Theme_Manager.class.php:215 #, php-format msgid "Theme path not found for theme %s!" -msgstr "" -"¡No se halló la ruta de la plantilla de interfaz (theme) para la plantilla " -"%s!" +msgstr "¡No se halló la ruta del tema %s!" #: libraries/Theme_Manager.class.php:291 test/theme.php:160 themes.php:20 #: themes.php:40 @@ -1740,7 +1737,7 @@ msgstr "" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "El archivo %s no contiene ningún id de clave " +msgstr "El archivo %s no contiene ningún id de clave" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 @@ -1975,11 +1972,11 @@ msgstr "No pudo conectarse a un validador de SQL!" #: libraries/common.lib.php:1140 libraries/config/messages.inc.php:462 msgid "Explain SQL" -msgstr "Explicar SQL (Explain)" +msgstr "Explicar SQL" #: libraries/common.lib.php:1143 msgid "Skip Explain SQL" -msgstr "Saltar la explicación del SQL (Explain)" +msgstr "Omitir la explicación del SQL" #: libraries/common.lib.php:1177 msgid "Without PHP Code" @@ -2332,8 +2329,7 @@ msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" "Si el usuario habilitado puede elegir cualquier servidor MySQL en el " -"formulario de inicio de sesión para la autenticación con cookies (cookie " -"auth)" +"formulario de inicio de sesión para la autenticación con cookies" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" @@ -2568,7 +2564,7 @@ msgstr "Tiempo máximo de ejecución" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" -msgstr "Enviar (genera un archivo descargable)" +msgstr "Guardar como archivo" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:236 msgid "Character set of the file" @@ -2725,7 +2721,7 @@ msgstr "Utilizar inserciones con retraso" #: libraries/config/messages.inc.php:123 libraries/export/sql.php:53 msgid "Disable foreign key checks" -msgstr "Deshabilitar la revisión de las claves foráneas (foreign keys)" +msgstr "Deshabilitar la revisión de las claves foráneas" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" @@ -3708,7 +3704,8 @@ msgstr "Conexión de compresión" #: libraries/config/messages.inc.php:371 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure" msgstr "" -"Cómo conectar con el servidor, mantenga el tcp en caso de no estar seguro" +"Cómo conectar con el servidor, mantenga el valor [kbd]tcp[/kbd] en caso de " +"no estar seguro" #: libraries/config/messages.inc.php:372 msgid "Connection type" @@ -5043,19 +5040,19 @@ msgstr "" #: libraries/engines/innodb.lib.php:34 msgid "Buffer pool size" -msgstr "Tamaño de la memoria (búfer) de tránsito común" +msgstr "Tamaño de la reserva de búfers" #: libraries/engines/innodb.lib.php:35 msgid "" "The size of the memory buffer InnoDB uses to cache data and indexes of its " "tables." msgstr "" -"El tamaño de la memoria intermedia (búfer) usado por InnoDB para almacenar, " -"en el cache, los datos e índices de sus tablas." +"El tamaño del búfer de memoria usado por InnoDB para almacenar, en el cache, " +"los datos e índices de sus tablas." #: libraries/engines/innodb.lib.php:134 msgid "Buffer Pool" -msgstr "Total de memoria del búfer" +msgstr "Reserva de búfers" #: libraries/engines/innodb.lib.php:135 server_status.php:432 msgid "InnoDB Status" @@ -5063,7 +5060,7 @@ msgstr "Estado del InnoDB" #: libraries/engines/innodb.lib.php:163 msgid "Buffer Pool Usage" -msgstr "Total de memoria del búfer consumido" +msgstr "Uso de la reserva de búfers" #: libraries/engines/innodb.lib.php:171 msgid "pages" @@ -5095,7 +5092,7 @@ msgstr "Páginas vinculadas" #: libraries/engines/innodb.lib.php:224 msgid "Buffer Pool Activity" -msgstr "Actividad de la memoria (búfer) de tránsito común" +msgstr "Actividad de la reserva de búfers" #: libraries/engines/innodb.lib.php:228 msgid "Read requests" @@ -5371,7 +5368,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" -msgstr "Tamaño de la memoria (búfer) de la transacción" +msgstr "Tamaño del búfer de la transacción" #: libraries/engines/pbxt.lib.php:43 msgid "" @@ -5557,7 +5554,7 @@ msgstr "Descripción de la tabla (continúa)" #: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 msgid "Display foreign key relationships" -msgstr "Mostrar relaciones de clave foránea (foreign keys)" +msgstr "Mostrar relaciones de clave foránea" #: libraries/export/latex.php:59 libraries/export/odt.php:45 msgid "Display comments" @@ -5765,7 +5762,7 @@ msgstr "RELACIONES PARA LA TABLA" #: libraries/export/sql.php:873 libraries/export/xml.php:38 #: libraries/tbl_triggers.lib.php:18 msgid "Triggers" -msgstr "(Evento) desencadenante" +msgstr "Disparadores" #: libraries/export/sql.php:885 msgid "Structure for view" @@ -6846,12 +6843,12 @@ msgid "" "Displays a clickable thumbnail. The options are the maximum width and height " "in pixels. The original aspect ratio is preserved." msgstr "" -"Muestra un thumbnail que puede abrirse mediante un clic; opciones: width, " -"height en píxeles (mantiene la proporción original)." +"Muestra una miniatura que puede abrirse mediante un clic. Las opciones son " +"la altura y anchura máxima en píxeles. La proporción original es mantenida." #: libraries/transformations/image_jpeg__link.inc.php:9 msgid "Displays a link to download this image." -msgstr "Muestra un enlace a esta imagen (i.e., blob descarga directa)." +msgstr "Muestra un enlace para descargar esta imagen." #: libraries/transformations/text_plain__dateformat.inc.php:9 msgid "" @@ -7571,7 +7568,7 @@ msgstr "Ver el volcado (schema) de la base de datos" #: server_privileges.php:31 server_privileges.php:273 msgid "Includes all privileges except GRANT." -msgstr "Incluye todos los privilegios excepto GRANT (CONCEDER)." +msgstr "Incluye todos los privilegios excepto GRANT." #: server_privileges.php:32 server_privileges.php:199 #: server_privileges.php:522 @@ -7712,13 +7709,12 @@ msgstr "" #: server_privileges.php:559 msgid "Allows the user to ask where the slaves / masters are." msgstr "" -"Da el derecho al usuario para preguntar dónde están los \"esclavos / masters" -"\"." +"Da el derecho al usuario para preguntar dónde están los esclavos / maestros." #: server_privileges.php:58 server_privileges.php:204 #: server_privileges.php:560 msgid "Needed for the replication slaves." -msgstr "Necesario para los \"esclavos\" de replicación." +msgstr "Necesario para los esclavos de replicación." #: server_privileges.php:59 server_privileges.php:187 #: server_privileges.php:446 server_privileges.php:510 @@ -7733,8 +7729,7 @@ msgstr "Concede acceso a la lista completa de bases de datos." #: server_privileges.php:61 server_privileges.php:211 #: server_privileges.php:213 server_privileges.php:526 msgid "Allows performing SHOW CREATE VIEW queries." -msgstr "" -"Permite llevar a cabo las consultas SHOW CREATE VIEW (MOSTRAR CREAR VER)." +msgstr "Permite llevar a cabo las consultas SHOW CREATE VIEW." #: server_privileges.php:62 server_privileges.php:194 #: server_privileges.php:553 @@ -7756,7 +7751,7 @@ msgstr "" #: server_privileges.php:64 server_privileges.php:208 #: server_privileges.php:542 msgid "Allows creating and dropping triggers" -msgstr "Permite crear y eliminar un evento desencadenante" +msgstr "Permite crear y eliminar un disparador" #: server_privileges.php:65 server_privileges.php:189 #: server_privileges.php:452 server_privileges.php:512 @@ -8122,7 +8117,7 @@ msgid "" "should see a message informing you, that this server <b>is</b> configured as " "master" msgstr "" -"Una vez reiniciado el servidor MySQL, pulse el botón \"Continuar\". A " +"Una vez reiniciado el servidor MySQL, pulse el botón Continuar. A " "continuación deberás ver un mensaje informando que el servidor <b>está</b> " "configurado como maestro" @@ -8384,8 +8379,8 @@ msgstr "El número de páginas actualmente sucias." #: server_status.php:69 msgid "The number of buffer pool pages that have been requested to be flushed." msgstr "" -"El número de páginas en la memoria (búfer) de tránsito común que se ha " -"solicitado sean vaciadas." +"El número de páginas de la reserva de búfers que se ha solicitado sean " +"vaciadas." #: server_status.php:70 msgid "The number of free pages." @@ -8397,9 +8392,9 @@ msgid "" "being read or written or that can't be flushed or removed for some other " "reason." msgstr "" -"El número de páginas aseguradas en la memoria (búfer) de tránsito común " -"InnoDB. Estas son páginas en fase de lectura o escritura o que no pueden ser " -"vaciadas o removidas por alguna otra razón." +"El número de páginas aseguradas en la reserva de búfers InnoDB. Estas son " +"páginas en fase de lectura o escritura o que no pueden ser vaciadas o " +"removidas por alguna otra razón." #: server_status.php:72 msgid "" @@ -8415,7 +8410,7 @@ msgstr "" #: server_status.php:73 msgid "Total size of buffer pool, in pages." -msgstr "Tamaño total de la memoria (búfer) de tránsito común, en páginas." +msgstr "Tamaño total de la reserva de búfers, en páginas." #: server_status.php:74 msgid "" @@ -8443,9 +8438,8 @@ msgid "" "The number of logical reads that InnoDB could not satisfy from buffer pool " "and had to do a single-page read." msgstr "" -"El número de lecturas lógicas que InnoDB no pudo satisfacer de la memoria " -"(búfer) de tránsito común y donde fue necesario hacer lectura de página " -"sencilla." +"El número de lecturas lógicas que InnoDB no pudo satisfacer la reserva de " +"búfers y donde fue necesario hacer lectura de página sencilla." #: server_status.php:78 msgid "" @@ -8455,16 +8449,16 @@ msgid "" "counter counts instances of these waits. If the buffer pool size was set " "properly, this value should be small." msgstr "" -"Normalmente, las escrituras a la memoria de tránsito común InnoDB suceden en " -"el trasfondo. Sin embargo, de ser necesario leer o crear una página y " -"existen páginas limpias disponibles, es necesario esperar que las páginas " -"sean vaciadas previamente. Este contador cuenta las instancias de estas " -"esperas. Si los parámetros del tamaño de la memoria de tránsito común se " -"fijaron apropiadamente, este valor será pequeño." +"Normalmente, las escrituras a la reserva de búfers InnoDB suceden en segundo " +"plano. Sin embargo, de ser necesario leer o crear una página y existen " +"páginas limpias disponibles, es necesario esperar que las páginas sean " +"vaciadas previamente. Este contador cuenta las instancias de estas esperas. " +"Si los parámetros del tamaño de la reserva de búfers se fijaron " +"apropiadamente, este valor será pequeño." #: server_status.php:79 msgid "The number writes done to the InnoDB buffer pool." -msgstr "El número de escrituras hechas a la memoria de tránsito común InnoDB." +msgstr "El número de escrituras hechas a la reserva de búfers InnoDB." #: server_status.php:80 msgid "The number of fsync() operations so far." @@ -8528,7 +8522,7 @@ msgstr "El número de escrituras físicas al archivo de registro." #: server_status.php:93 msgid "The number of fsync() writes done to the log file." -msgstr "El número de escrituras fsyncs hechas al archivo de registro." +msgstr "El número de escrituras fsync() hechas al archivo de registro." #: server_status.php:94 msgid "The number of pending log file fsyncs." @@ -8770,8 +8764,8 @@ msgid "" "The number of joins that used ranges on the first table. (It's normally not " "critical even if this is big.)" msgstr "" -"El número de vínculos (joins) que usaron rangos en la primera tabla. " -"(Normalmente no es crítico aun cuando sea grande.)" +"El número de vínculos (joins) que usaron rangos en la primera tabla " +"(normalmente no es crítico aun cuando sea grande)." #: server_status.php:137 msgid "The number of joins that did a full scan of the first table." @@ -8819,7 +8813,7 @@ msgid "" "is large, you should consider increasing the value of the sort_buffer_size " "system variable." msgstr "" -"El número de pasadas de fusión (merge) que el algoritmo organizar ha debido " +"El número de pasadas de combinación que el algoritmo organizar ha debido " "hacer. Si este valor es grande, debe considerar incrementar el valor de la " "varible de sistema sort_buffer_size." @@ -8915,7 +8909,7 @@ msgstr "Vínculos (Joins)" #: server_status.php:384 msgid "Sorting" -msgstr "Organizando (sorting)" +msgstr "Ordenación" #: server_status.php:386 msgid "Transaction coordinator" @@ -9815,7 +9809,7 @@ msgstr "Copiar la tabla a (base de datos<b>.</b>tabla):" #: tbl_operations.php:560 msgid "Switch to copied table" -msgstr "Cambiar (switch) a la tabla copiada" +msgstr "Cambiar a la tabla copiada" #: tbl_operations.php:572 msgid "Table maintenance" @@ -9951,7 +9945,7 @@ msgstr "No se seleccionaron filas" #: tbl_select.php:109 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "Hacer una consulta (comodín: \"%\")" +msgstr "Hacer una \"consulta basada en ejemplo\" (comodín: \"%\")" #: tbl_select.php:233 msgid "Select columns (at least one):" @@ -10222,7 +10216,7 @@ msgstr "Se actualizó el perfil." #: view_create.php:141 msgid "VIEW name" -msgstr "(VIEW) VER nombre" +msgstr "VER nombre" #: view_operations.php:91 msgid "Rename view to" hooks/post-receive -- phpMyAdmin

13 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git February 2011