- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12152-gd29674f
by Marc Delisle 29 Jul '11

29 Jul '11

The branch, master has been updated via d29674f9b18e1e26fa3fcb5f8aa83461aaa10f5e (commit) from dc0cd4735e08c41def58ccef83383685f294b2e5 (commit) - Log ----------------------------------------------------------------- commit d29674f9b18e1e26fa3fcb5f8aa83461aaa10f5e Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 29 10:06:49 2011 -0400 Better wording ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/messages.php b/js/messages.php index dee4d9d..69d940c 100644 --- a/js/messages.php +++ b/js/messages.php @@ -152,7 +152,7 @@ $js_messages['strFilters'] = __('Filters'); /* l10n: Filter as in "Start Filtering" */ $js_messages['strFilter'] = __('Filter'); $js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:'); -$js_messages['strIgnoreWhereAndGroup'] = __('Group queries, ignoring variable data in WHERE statements'); +$js_messages['strIgnoreWhereAndGroup'] = __('Group queries, ignoring variable data in WHERE clauses'); $js_messages['strSumRows'] = __('Sum of grouped rows:'); $js_messages['strTotal'] = __('Total:'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12150-gb2613f3
by Marc Delisle 29 Jul '11

29 Jul '11

The branch, master has been updated via b2613f34956dfd20f5b6442258629093580c6a66 (commit) from 808447af1ef9f117a7883ae0d1c8b56b366ba6c6 (commit) - Log ----------------------------------------------------------------- commit b2613f34956dfd20f5b6442258629093580c6a66 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jul 29 09:55:39 2011 -0400 Typo ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/messages.php b/js/messages.php index 17d0fad..dee4d9d 100644 --- a/js/messages.php +++ b/js/messages.php @@ -140,7 +140,7 @@ $js_messages['strDividedBy'] = __('Divided by %s:'); $js_messages['strFromSlowLog'] = __('From slow log'); $js_messages['strFromGeneralLog'] = __('From general log'); $js_messages['strAnalysingLogs'] = __('Analysing & loading logs. This may take a while.'); -$js_messages['strCountColumnExplanation'] = __('This columns shows the amount of identical queries that are grouped together. However only the SQL Text is being compared, thus the queries other attributes such as start time may differ.'); +$js_messages['strCountColumnExplanation'] = __('This columns shows the amount of identical queries that are grouped together. However only the SQL Text is being compared, thus the queries of other attributes such as start time may differ.'); $js_messages['strMoreCountColumnExplanation'] = __('Since grouping of INSERTs queries has been selected, INSERT queries into the same table are also being grouped together, disregarding of the inserted data.'); $js_messages['strLogDataLoaded'] = __('Log data loaded. Queries executed in this time span:'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12149-g808447a
by Madhura Jayaratne 28 Jul '11

28 Jul '11

The branch, master has been updated via 808447af1ef9f117a7883ae0d1c8b56b366ba6c6 (commit) via 11ad4fd992e51b86c127c95112ee313bdaaa9757 (commit) from c326cfeec420ca94296b7708df52fd4cab0fc450 (commit) - Log ----------------------------------------------------------------- commit 808447af1ef9f117a7883ae0d1c8b56b366ba6c6 Merge: c326cfeec420ca94296b7708df52fd4cab0fc450 11ad4fd992e51b86c127c95112ee313bdaaa9757 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Jul 29 06:39:58 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/footer.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f3c162..319658a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd +- bug #3313235 [interface] Error div misplaced 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php index aa1af7a..dbb1f1a 100644 --- a/libraries/footer.inc.php +++ b/libraries/footer.inc.php @@ -31,7 +31,7 @@ if (! PMA_isValid($_REQUEST['no_history']) && empty($GLOBALS['error_message']) } if ($GLOBALS['error_handler']->hasDisplayErrors()) { - echo '<div>'; + echo '<div class="clearfloat">'; $GLOBALS['error_handler']->dispErrors(); echo '</div>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12147-gc326cfe
by Piotr Przybylski 28 Jul '11

28 Jul '11

The branch, master has been updated via c326cfeec420ca94296b7708df52fd4cab0fc450 (commit) from e58eea5deece01151db13083ad3b0b9e33455570 (commit) - Log ----------------------------------------------------------------- commit c326cfeec420ca94296b7708df52fd4cab0fc450 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jul 28 13:32:38 2011 +0200 Comments ----------------------------------------------------------------------- Summary of changes: libraries/dbi/mysql.dbi.lib.php | 80 ++++++++++++++++++++++++++------------ libraries/dbi/mysqli.dbi.lib.php | 72 +++++++++++++++++---------------- 2 files changed, 92 insertions(+), 60 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 64ab026..0d6c697 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -27,7 +27,7 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { * @param string $user * @param string $password * @param int $client_flags - * @param boolean $persistent + * @param bool $persistent * @return mixed false on error or a mysql connection resource on success */ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent = false) @@ -56,9 +56,9 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist * * @param string $user mysql user name * @param string $password mysql user password - * @param boolean $is_controluser + * @param bool $is_controluser * @param array $server host/port/socket/persistent - * @param boolean $auxiliary_connection (when true, don't go back to login if connection fails) + * @param bool $auxiliary_connection (when true, don't go back to login if connection fails) * @return mixed false on error or a mysqli object on success */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) @@ -138,7 +138,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu * * @param string $dbname name of db to select * @param resource $link mysql link resource - * @return boolean + * @return bool */ function PMA_DBI_select_db($dbname, $link = null) { @@ -155,9 +155,9 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to run - * @param resource $link mysql link resource - * @param integer $options + * @param string $query query to run + * @param resource $link mysql link resource + * @param int $options * @return mixed */ function PMA_DBI_real_query($query, $link, $options) @@ -203,12 +203,12 @@ function PMA_DBI_fetch_row($result) return mysql_fetch_array($result, MYSQL_NUM); } -/* +/** * Adjusts the result pointer to an arbitrary row in the result * * @param $result * @param $offset - * @return boolean true on success, false on failure + * @return bool true on success, false on failure */ function PMA_DBI_data_seek($result, $offset) { @@ -230,7 +230,7 @@ function PMA_DBI_free_result($result) /** * Check if there are any more query results from a multi query * - * @return boolean false + * @return bool false */ function PMA_DBI_more_results() { // N.B.: PHP's 'mysql' extension does not support @@ -243,7 +243,7 @@ function PMA_DBI_more_results() { /** * Prepare next result from multi_query * - * @return boolean false + * @return boo false */ function PMA_DBI_next_result() { // N.B.: PHP's 'mysql' extension does not support @@ -255,7 +255,8 @@ function PMA_DBI_next_result() { /** * Returns a string representing the type of connection used - * @param resource $link mysql link + * + * @param resource $link mysql link * @return string type of connection used */ function PMA_DBI_get_host_info($link = null) @@ -272,8 +273,9 @@ function PMA_DBI_get_host_info($link = null) /** * Returns the version of the MySQL protocol used - * @param resource $link mysql link - * @return integer version of the MySQL protocol used + * + * @param resource $link mysql link + * @return int version of the MySQL protocol used */ function PMA_DBI_get_proto_info($link = null) { @@ -289,6 +291,7 @@ function PMA_DBI_get_proto_info($link = null) /** * returns a string that represents the client library version + * * @return string MySQL client library version */ function PMA_DBI_get_client_info() @@ -299,8 +302,8 @@ function PMA_DBI_get_client_info() /** * returns last error message or false if no errors occured * - * @param resource $link mysql link - * @return string|boolean $error or false + * @param resource $link mysql link + * @return string|bool $error or false */ function PMA_DBI_getError($link = null) { @@ -361,8 +364,8 @@ function PMA_DBI_getError($link = null) /** * returns the number of rows returned by last query * - * @param resource $result - * @return string|ineteger + * @param resource $result + * @return string|int */ function PMA_DBI_num_rows($result) { @@ -376,8 +379,8 @@ function PMA_DBI_num_rows($result) /** * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] * - * @param resource $link the mysql object - * @return string|ineteger + * @param resource $link the mysql object + * @return string|int */ function PMA_DBI_insert_id($link = null) { @@ -399,9 +402,9 @@ function PMA_DBI_insert_id($link = null) /** * returns the number of rows affected by last query * - * @param resource $link the mysql object - * @param boolean $get_from_cache - * @return string|integer + * @param resource $link the mysql object + * @param bool $get_from_cache + * @return string|int */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -423,8 +426,8 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) /** * returns metainfo for fields in $result * - * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) - * @param resource $result + * @todo add missing keys like in mysqli_query (orgname, orgtable, flags, decimals) + * @param resource $result * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) @@ -437,21 +440,48 @@ function PMA_DBI_get_fields_meta($result) return $fields; } +/** + * return number of fields in given $result + * + * @param resource $result + * @return int field count + */ function PMA_DBI_num_fields($result) { return mysql_num_fields($result); } +/** + * returns the length of the given field $i in $result + * + * @param resource $result + * @param int $i field + * @return int length of field + */ function PMA_DBI_field_len($result, $i) { return mysql_field_len($result, $i); } +/** + * returns name of $i. field in $result + * + * @param resource $result + * @param int $i field + * @return string name of $i. field in $result + */ function PMA_DBI_field_name($result, $i) { return mysql_field_name($result, $i); } +/** + * returns concatenated string of human readable field flags + * + * @param resource $result + * @param int $i field + * @return string field flags + */ function PMA_DBI_field_flags($result, $i) { return mysql_field_flags($result, $i); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 535b825..e3f017b 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -54,8 +54,8 @@ if (! defined('MYSQLI_TYPE_BIT')) { * @param int $server_port * @param string $server_socket * @param int $client_flags - * @param boolean $persistent - * @return boolean + * @param bool $persistent + * @return bool */ function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false) { @@ -76,9 +76,9 @@ function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_p * * @param string $user mysql user name * @param string $password mysql user password - * @param boolean $is_controluser + * @param bool $is_controluser * @param array $server host/port/socket - * @param boolean $auxiliary_connection (when true, don't go back to login if connection fails) + * @param bool $auxiliary_connection (when true, don't go back to login if connection fails) * @return mixed false on error or a mysqli object on success */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) @@ -175,10 +175,10 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to execute - * @param mysqli $link mysqli object - * @param integer $options - * @return mysqli_result|boolean + * @param string $query query to execute + * @param mysqli $link mysqli object + * @param int $options + * @return mysqli_result|bool */ function PMA_DBI_real_query($query, $link, $options) { @@ -226,12 +226,12 @@ function PMA_DBI_fetch_row($result) return mysqli_fetch_array($result, MYSQLI_NUM); } -/* +/** * Adjusts the result pointer to an arbitrary row in the result * * @param $result * @param $offset - * @return boolean true on success, false on failure + * @return bool true on success, false on failure */ function PMA_DBI_data_seek($result, $offset) { @@ -253,8 +253,8 @@ function PMA_DBI_free_result($result) /** * Check if there are any more query results from a multi query * - * @param mysqli $link the mysqli object - * @return boolean true or false + * @param mysqli $link the mysqli object + * @return bool true or false */ function PMA_DBI_more_results($link = null) { if (empty($link)) { @@ -270,8 +270,8 @@ function PMA_DBI_more_results($link = null) { /** * Prepare next result from multi_query * - * @param mysqli $link the mysqli object - * @return boolean true or false + * @param mysqli $link the mysqli object + * @return bool true or false */ function PMA_DBI_next_result($link = null) { if (empty($link)) { @@ -286,7 +286,8 @@ function PMA_DBI_next_result($link = null) { /** * Returns a string representing the type of connection used - * @param resource $link mysql link + * + * @param resource $link mysql link * @return string type of connection used */ function PMA_DBI_get_host_info($link = null) @@ -303,7 +304,8 @@ function PMA_DBI_get_host_info($link = null) /** * Returns the version of the MySQL protocol used - * @param resource $link mysql link + * + * @param resource $link mysql link * @return integer version of the MySQL protocol used */ function PMA_DBI_get_proto_info($link = null) @@ -320,6 +322,7 @@ function PMA_DBI_get_proto_info($link = null) /** * returns a string that represents the client library version + * * @return string MySQL client library version */ function PMA_DBI_get_client_info() @@ -330,8 +333,8 @@ function PMA_DBI_get_client_info() /** * returns last error message or false if no errors occured * - * @param resource $link mysql link - * @return string|boolean $error or false + * @param resource $link mysql link + * @return string|bool $error or false */ function PMA_DBI_getError($link = null) { @@ -381,8 +384,8 @@ function PMA_DBI_getError($link = null) /** * returns the number of rows returned by last query * - * @param mysqli_result $result - * @return string|ineteger + * @param mysqli_result $result + * @return string|int */ function PMA_DBI_num_rows($result) { @@ -397,8 +400,8 @@ function PMA_DBI_num_rows($result) /** * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] * - * @param mysqli $link the mysqli object - * @return string|ineteger + * @param mysqli $link the mysqli object + * @return string|int */ function PMA_DBI_insert_id($link = null) { @@ -421,9 +424,9 @@ function PMA_DBI_insert_id($link = null) /** * returns the number of rows affected by last query * - * @param mysqli $link the mysqli object + * @param mysqli $link the mysqli object * @param boolean $get_from_cache - * @return string|integer + * @return string|int */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -444,8 +447,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) /** * returns metainfo for fields in $result * - * @todo preserve orignal flags value - * @param mysqli_result $result + * @param mysqli_result $result * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) @@ -524,8 +526,8 @@ function PMA_DBI_get_fields_meta($result) /** * return number of fields in given $result * - * @param mysqli_result $result - * @return integer field count + * @param mysqli_result $result + * @return int field count */ function PMA_DBI_num_fields($result) { @@ -535,9 +537,9 @@ function PMA_DBI_num_fields($result) /** * returns the length of the given field $i in $result * - * @param mysqli_result $result - * @param integer $i field - * @return integer length of field + * @param mysqli_result $result + * @param int $i field + * @return int length of field */ function PMA_DBI_field_len($result, $i) { @@ -547,8 +549,8 @@ function PMA_DBI_field_len($result, $i) /** * returns name of $i. field in $result * - * @param mysqli_result $result - * @param integer $i field + * @param mysqli_result $result + * @param int $i field * @return string name of $i. field in $result */ function PMA_DBI_field_name($result, $i) @@ -559,8 +561,8 @@ function PMA_DBI_field_name($result, $i) /** * returns concatenated string of human readable field flags * - * @param mysqli_result $result - * @param integer $i field + * @param mysqli_result $result + * @param int $i field * @return string field flags */ function PMA_DBI_field_flags($result, $i) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12146-ge58eea5
by Michal Čihař 27 Jul '11

27 Jul '11

The branch, master has been updated via e58eea5deece01151db13083ad3b0b9e33455570 (commit) via ddef9580b6b48543465e36707be2a45e5a87334a (commit) via 3410cc1fa912686c7a5fea63d542cdc1ca2e3a8b (commit) via 5ba9ce1d6b1a942dbcda64c064900637bf9d5de7 (commit) via 7d7ef56692acae09b382331bf2901b39f84f4795 (commit) via 26931b4f70fdaa11685bfc8b47a9aad89aa9c9a8 (commit) via efaae7001e06d64923e4c0cfeedb3a914f3fdc00 (commit) via 6d5408ea535c9d4c5538f174c468e928108649fb (commit) via dd76c5b5a69fc9dee5dc445c4c2aa85a1f19f4f2 (commit) via e8c2cb5aa760aa0e4a4555bd47a80dd0bb6b3dbd (commit) via 33e7382650ae89dea8560ac13cf7c15de5835ca9 (commit) via d6675263e8dae7190e867b793a544384746f9ab5 (commit) via c13df8288304762d428e9f70fe2d467257185fbf (commit) via 895327632af4486b9e8fc73f4a93b3e789a667b7 (commit) via 5b41f8a4b63f32369e8daed96021098e7fdaa856 (commit) via 906a4247ce7c3f40d758c6f47d4641fae8ca7a20 (commit) via 2f0b9b89345f93c1d4fa0b7686e3c1fd798262d8 (commit) via 4acfb4ef1e3b1c48b7041084e2fe7baf312694f9 (commit) via 8b099a032c9e9a2190ec5a8ade772fc54d43d4a1 (commit) via faf1d05478398134d3260a79828bcd7aecf57699 (commit) via c8b37d803e119e8aa121206d0f2f8d6f7d651cb0 (commit) via 79098ab5f58a187d2643972cb449c434c6975837 (commit) via 162158d93cdefc8c917c3d8aef0e767653e920ef (commit) via 6f9f7267bb95c96359ed5507786ee043d4c8f4b7 (commit) via 676eb481216e88f310e15d2d6b1a7d57dad9f3f5 (commit) via ac617a75219315235a3de2e976392c82b6e73cc9 (commit) via b590279dd2e69ac225e95045f38fe82cc4ff7e5a (commit) via 11dae68730b6b00d0fbda07ee75605ccbdd56edc (commit) via b6c256b70e3de9d0f163ed7a21c1ef1f3d647897 (commit) via 6de769540f0a0db170b9b4183190e90a89909914 (commit) via 800a36c30cc48865eaad1d3949b7748f6f5d8443 (commit) via 2264fcd19981931b4e709aecbaab56f8bc394fc2 (commit) via 1d765356a8cb86180d8a776433f9ffb169fefedc (commit) via 8d315ac362f1d29fb38725ab68cf57b3130cfa07 (commit) via cb946e6529fe1f0dc27bcc823ee525809928078a (commit) via 7cd34b1d2280cc4738e3475b55d2e45f774fcda5 (commit) via 5ea775d7e395485cce8700e7877d6b566cc2e549 (commit) via a08b2bb69de6e46e11d541c62c03f8f0b51f8d67 (commit) via 244744cfd947fd299dfe97606d256bb7b3214960 (commit) via 756a11261b561dffbcd4ec7c5d7df35b2cc5c7b1 (commit) via 9ddcd5bfa4dbb0dd4b535f437cf9617909213964 (commit) via de3656a488b628af7448422d14c41cf529235c12 (commit) via 68da99bdf27887dabb60b5f3a85338943c768a9a (commit) via 52ffb4d5235673213aa676a9c4633ebe5b325bac (commit) via 8ade28f0299999237d4bcc3f35656fb788717e68 (commit) via 5ca5fb8a38d3e953fc22865c2f97bfdbded8fb71 (commit) via 9db269a164e8043bb858306e73d6bb63320399ad (commit) via a5c3a09b957fbcb2ee8748202a29a1c5577c3500 (commit) via f5088c52e6fa8b260c0272e99f45c4f6b792985e (commit) via 3858a22196e87c217603a1b1589a570f7eb2eeda (commit) via 19fd3cca5c810cc56251acf1871efe58fc0793bf (commit) via 5e65960866a352ddc427ac7829ce0af1095a4103 (commit) via 062a48731abbf1d2afaf6170d6fa36503213e75b (commit) via 88fdf41cd340d07949626ee4621e36862e1a335d (commit) via 2bce171ea2fe8a52155bf64a16b41a477150996f (commit) via f774184a8f5ba3a1ed2995099a940c48c25a90eb (commit) via b5f7fcd7108974550ba48ddc3ef650bba6567c78 (commit) via d5b81d421519afaf8586a58835fd46a4de8a965f (commit) via ab27efc90c1c5042e55b173aadb90a20300a32e4 (commit) via baac8ed6311e1a4d85ed8212680f3c2d1a8dbe46 (commit) via 8ad755ebc29b718bbf40d00452213b5efc2eced6 (commit) via c0bca1ed53bd90d19443e38ce2ad33d5ee48c7bf (commit) via 9e177ed3dd45903c09a424fe9111284efdfdaa1f (commit) via e7f918143a6953051671a39e0f7f036a59ee377a (commit) via d6ca1f29d4e9c5bc7f392f25f6ddaeb0d6768d39 (commit) via 937bfc9064e8e4da66f23bde3f4f0ddc4b4007a4 (commit) via 68ed8271c9d397493cf0461610d5a84e2aaf0888 (commit) via 1e77fd115db523fecb65dde1a87414102889a11f (commit) via 319c5d7398c436529efbc6e37def4fe42dda338c (commit) via 4c5e8f43abfc90967f8a5d77eb6744d6eb75cb80 (commit) via 9bbdb20f5d41138f9d4ae524b3542970917fb827 (commit) via 8e83232d91db6e724f4dffe3f0fcd7408204a2c3 (commit) via a3e9a87953b32646a92b38d06947224bf3f6e973 (commit) via b3e0371a2047aeb99669440f250fd11e8a115300 (commit) via d451c5ad6099fa7bdfba5a5b624918c3043869bf (commit) via 3594b1540f0124dee0c6f2281f07e2373e635ee4 (commit) via 3f426aa675277ee1b769201957bfff4e2bc8a38e (commit) via 822ebe52d67d7709097ffad28064a10774eaa4fe (commit) via 416fe3b7f1473a547ed3659c191ac9785f198942 (commit) via 837c44361ea4e472ddffecb3d4a34acdee95563d (commit) via 4beb223b644bc3d9996e3af78c5d763a533afd23 (commit) via 8c3a2dcbaaee316800c22f67b78a735cf551dd62 (commit) via f3660c91946d1366f305c5cedb483ec7127b9351 (commit) via ca66fa920fd2417ba0fd501ec15e9d113d77a540 (commit) via a716eb7ef73f6ab5323eda4e4a5d001cb10d7a1d (commit) via bb23eeeffcfd7e6ecf8da1b4b9df6b1c3d981149 (commit) via 7be8d0e843de20fcb58f565d7a4a015c171ce8d2 (commit) via 1ee0a9fa8a3ef11c330a03adcafe9d0aa277f22d (commit) via 4f991968bc4f0e7ea515dbd4ff6d67c8077e78ac (commit) via b1ccfd49cb9400d5f9c3e275b46048826d370067 (commit) via 86e49a80f844828b423423523f62826200e856cc (commit) via 0f57543a2aed01f8ce7271919910b459843235c7 (commit) via edc4bac85ab9599bc579ab54060ae7a93708d53c (commit) from 5f8842739de809166475ffb763dbaccb6d755728 (commit) - Log ----------------------------------------------------------------- commit e58eea5deece01151db13083ad3b0b9e33455570 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Jul 27 22:53:22 2011 +0200 Fixup commit ddef9580b6b48543465e36707be2a45e5a87334a Merge: 3410cc1fa912686c7a5fea63d542cdc1ca2e3a8b 5f8842739de809166475ffb763dbaccb6d755728 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jul 27 22:40:19 2011 +0200 Merge remote-tracking branch 'origin/master' commit 3410cc1fa912686c7a5fea63d542cdc1ca2e3a8b Merge: 5ba9ce1d6b1a942dbcda64c064900637bf9d5de7 e82682d0e4037d92305ad92cb5514e822e9a5abc Author: Pootle server <pootle(a)cihar.com> Date: Wed Jul 27 20:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 5ba9ce1d6b1a942dbcda64c064900637bf9d5de7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:54:37 2011 +0200 Translation update done using Pootle. commit 7d7ef56692acae09b382331bf2901b39f84f4795 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:54:29 2011 +0200 Translation update done using Pootle. commit 26931b4f70fdaa11685bfc8b47a9aad89aa9c9a8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:53:55 2011 +0200 Translation update done using Pootle. commit efaae7001e06d64923e4c0cfeedb3a914f3fdc00 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:53:28 2011 +0200 Translation update done using Pootle. commit 6d5408ea535c9d4c5538f174c468e928108649fb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:52:30 2011 +0200 Translation update done using Pootle. commit dd76c5b5a69fc9dee5dc445c4c2aa85a1f19f4f2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:50:44 2011 +0200 Translation update done using Pootle. commit e8c2cb5aa760aa0e4a4555bd47a80dd0bb6b3dbd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:49:38 2011 +0200 Translation update done using Pootle. commit 33e7382650ae89dea8560ac13cf7c15de5835ca9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:49:25 2011 +0200 Translation update done using Pootle. commit d6675263e8dae7190e867b793a544384746f9ab5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:49:06 2011 +0200 Translation update done using Pootle. commit c13df8288304762d428e9f70fe2d467257185fbf Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:48:53 2011 +0200 Translation update done using Pootle. commit 895327632af4486b9e8fc73f4a93b3e789a667b7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:48:36 2011 +0200 Translation update done using Pootle. commit 5b41f8a4b63f32369e8daed96021098e7fdaa856 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:48:25 2011 +0200 Translation update done using Pootle. commit 906a4247ce7c3f40d758c6f47d4641fae8ca7a20 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:48:09 2011 +0200 Translation update done using Pootle. commit 2f0b9b89345f93c1d4fa0b7686e3c1fd798262d8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:47:52 2011 +0200 Translation update done using Pootle. commit 4acfb4ef1e3b1c48b7041084e2fe7baf312694f9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:47:42 2011 +0200 Translation update done using Pootle. commit 8b099a032c9e9a2190ec5a8ade772fc54d43d4a1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:47:30 2011 +0200 Translation update done using Pootle. commit faf1d05478398134d3260a79828bcd7aecf57699 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:40:29 2011 +0200 Translation update done using Pootle. commit c8b37d803e119e8aa121206d0f2f8d6f7d651cb0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:39:56 2011 +0200 Translation update done using Pootle. commit 79098ab5f58a187d2643972cb449c434c6975837 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:39:33 2011 +0200 Translation update done using Pootle. commit 162158d93cdefc8c917c3d8aef0e767653e920ef Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:39:14 2011 +0200 Translation update done using Pootle. commit 6f9f7267bb95c96359ed5507786ee043d4c8f4b7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:39:07 2011 +0200 Translation update done using Pootle. commit 676eb481216e88f310e15d2d6b1a7d57dad9f3f5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:38:47 2011 +0200 Translation update done using Pootle. commit ac617a75219315235a3de2e976392c82b6e73cc9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:38:39 2011 +0200 Translation update done using Pootle. commit b590279dd2e69ac225e95045f38fe82cc4ff7e5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jul 27 16:38:31 2011 +0200 Translation update done using Pootle. commit 11dae68730b6b00d0fbda07ee75605ccbdd56edc Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 15:32:07 2011 +0200 Translation update done using Pootle. commit b6c256b70e3de9d0f163ed7a21c1ef1f3d647897 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 15:31:49 2011 +0200 Translation update done using Pootle. commit 6de769540f0a0db170b9b4183190e90a89909914 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 15:31:38 2011 +0200 Translation update done using Pootle. commit 800a36c30cc48865eaad1d3949b7748f6f5d8443 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 15:31:16 2011 +0200 Translation update done using Pootle. commit 2264fcd19981931b4e709aecbaab56f8bc394fc2 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 15:30:40 2011 +0200 Translation update done using Pootle. commit 1d765356a8cb86180d8a776433f9ffb169fefedc Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:52:54 2011 +0200 Translation update done using Pootle. commit 8d315ac362f1d29fb38725ab68cf57b3130cfa07 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:52:22 2011 +0200 Translation update done using Pootle. commit cb946e6529fe1f0dc27bcc823ee525809928078a Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:50:40 2011 +0200 Translation update done using Pootle. commit 7cd34b1d2280cc4738e3475b55d2e45f774fcda5 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:50:04 2011 +0200 Translation update done using Pootle. commit 5ea775d7e395485cce8700e7877d6b566cc2e549 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:49:26 2011 +0200 Translation update done using Pootle. commit a08b2bb69de6e46e11d541c62c03f8f0b51f8d67 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:49:15 2011 +0200 Translation update done using Pootle. commit 244744cfd947fd299dfe97606d256bb7b3214960 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:49:07 2011 +0200 Translation update done using Pootle. commit 756a11261b561dffbcd4ec7c5d7df35b2cc5c7b1 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:47:54 2011 +0200 Translation update done using Pootle. commit 9ddcd5bfa4dbb0dd4b535f437cf9617909213964 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:47:43 2011 +0200 Translation update done using Pootle. commit de3656a488b628af7448422d14c41cf529235c12 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:47:27 2011 +0200 Translation update done using Pootle. commit 68da99bdf27887dabb60b5f3a85338943c768a9a Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:47:13 2011 +0200 Translation update done using Pootle. commit 52ffb4d5235673213aa676a9c4633ebe5b325bac Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:46:47 2011 +0200 Translation update done using Pootle. commit 8ade28f0299999237d4bcc3f35656fb788717e68 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:46:35 2011 +0200 Translation update done using Pootle. commit 5ca5fb8a38d3e953fc22865c2f97bfdbded8fb71 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:45:10 2011 +0200 Translation update done using Pootle. commit 9db269a164e8043bb858306e73d6bb63320399ad Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:44:57 2011 +0200 Translation update done using Pootle. commit a5c3a09b957fbcb2ee8748202a29a1c5577c3500 Author: Martin Lacina <martin(a)whistler.sk> Date: Wed Jul 27 14:44:20 2011 +0200 Translation update done using Pootle. commit f5088c52e6fa8b260c0272e99f45c4f6b792985e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 12:14:38 2011 +0200 Translation update done using Pootle. commit 3858a22196e87c217603a1b1589a570f7eb2eeda Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 12:12:46 2011 +0200 Translation update done using Pootle. commit 19fd3cca5c810cc56251acf1871efe58fc0793bf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:59:39 2011 +0200 Translation update done using Pootle. commit 5e65960866a352ddc427ac7829ce0af1095a4103 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:53:45 2011 +0200 Translation update done using Pootle. commit 062a48731abbf1d2afaf6170d6fa36503213e75b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:45:41 2011 +0200 Translation update done using Pootle. commit 88fdf41cd340d07949626ee4621e36862e1a335d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:24:27 2011 +0200 Translation update done using Pootle. commit 2bce171ea2fe8a52155bf64a16b41a477150996f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:21:26 2011 +0200 Translation update done using Pootle. commit f774184a8f5ba3a1ed2995099a940c48c25a90eb Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jul 27 11:21:02 2011 +0200 Translation update done using Pootle. commit b5f7fcd7108974550ba48ddc3ef650bba6567c78 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:41:36 2011 +0200 Translation update done using Pootle. commit d5b81d421519afaf8586a58835fd46a4de8a965f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:41:27 2011 +0200 Translation update done using Pootle. commit ab27efc90c1c5042e55b173aadb90a20300a32e4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:40:48 2011 +0200 Translation update done using Pootle. commit baac8ed6311e1a4d85ed8212680f3c2d1a8dbe46 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:40:11 2011 +0200 Translation update done using Pootle. commit 8ad755ebc29b718bbf40d00452213b5efc2eced6 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:35:31 2011 +0200 Translation update done using Pootle. commit c0bca1ed53bd90d19443e38ce2ad33d5ee48c7bf Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:33:27 2011 +0200 Translation update done using Pootle. commit 9e177ed3dd45903c09a424fe9111284efdfdaa1f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:29:37 2011 +0200 Translation update done using Pootle. commit e7f918143a6953051671a39e0f7f036a59ee377a Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:28:59 2011 +0200 Translation update done using Pootle. commit d6ca1f29d4e9c5bc7f392f25f6ddaeb0d6768d39 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:26:53 2011 +0200 Translation update done using Pootle. commit 937bfc9064e8e4da66f23bde3f4f0ddc4b4007a4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:26:25 2011 +0200 Translation update done using Pootle. commit 68ed8271c9d397493cf0461610d5a84e2aaf0888 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:25:50 2011 +0200 Translation update done using Pootle. commit 1e77fd115db523fecb65dde1a87414102889a11f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:25:15 2011 +0200 Translation update done using Pootle. commit 319c5d7398c436529efbc6e37def4fe42dda338c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:24:47 2011 +0200 Translation update done using Pootle. commit 4c5e8f43abfc90967f8a5d77eb6744d6eb75cb80 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:24:06 2011 +0200 Translation update done using Pootle. commit 9bbdb20f5d41138f9d4ae524b3542970917fb827 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:23:50 2011 +0200 Translation update done using Pootle. commit 8e83232d91db6e724f4dffe3f0fcd7408204a2c3 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:23:32 2011 +0200 Translation update done using Pootle. commit a3e9a87953b32646a92b38d06947224bf3f6e973 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:23:22 2011 +0200 Translation update done using Pootle. commit b3e0371a2047aeb99669440f250fd11e8a115300 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:22:47 2011 +0200 Translation update done using Pootle. commit d451c5ad6099fa7bdfba5a5b624918c3043869bf Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:21:51 2011 +0200 Translation update done using Pootle. commit 3594b1540f0124dee0c6f2281f07e2373e635ee4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:21:15 2011 +0200 Translation update done using Pootle. commit 3f426aa675277ee1b769201957bfff4e2bc8a38e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:21:05 2011 +0200 Translation update done using Pootle. commit 822ebe52d67d7709097ffad28064a10774eaa4fe Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:20:49 2011 +0200 Translation update done using Pootle. commit 416fe3b7f1473a547ed3659c191ac9785f198942 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Jul 26 18:20:34 2011 +0200 Translation update done using Pootle. commit 837c44361ea4e472ddffecb3d4a34acdee95563d Merge: 4beb223b644bc3d9996e3af78c5d763a533afd23 ad4975b82d6beb67d78c0e64092ef29f98a257e3 Author: Pootle server <pootle(a)cihar.com> Date: Tue Jul 26 16:40:10 2011 +0200 Merge remote-tracking branch 'origin/master' commit 4beb223b644bc3d9996e3af78c5d763a533afd23 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:39:09 2011 +0200 Translation update done using Pootle. commit 8c3a2dcbaaee316800c22f67b78a735cf551dd62 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:28:53 2011 +0200 Translation update done using Pootle. commit f3660c91946d1366f305c5cedb483ec7127b9351 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:22:47 2011 +0200 Translation update done using Pootle. commit ca66fa920fd2417ba0fd501ec15e9d113d77a540 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:18:49 2011 +0200 Translation update done using Pootle. commit a716eb7ef73f6ab5323eda4e4a5d001cb10d7a1d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:08:25 2011 +0200 Translation update done using Pootle. commit bb23eeeffcfd7e6ecf8da1b4b9df6b1c3d981149 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:06:06 2011 +0200 Translation update done using Pootle. commit 7be8d0e843de20fcb58f565d7a4a015c171ce8d2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:04:32 2011 +0200 Translation update done using Pootle. commit 1ee0a9fa8a3ef11c330a03adcafe9d0aa277f22d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:03:04 2011 +0200 Translation update done using Pootle. commit 4f991968bc4f0e7ea515dbd4ff6d67c8077e78ac Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 12:00:11 2011 +0200 Translation update done using Pootle. commit b1ccfd49cb9400d5f9c3e275b46048826d370067 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 11:59:50 2011 +0200 Translation update done using Pootle. commit 86e49a80f844828b423423523f62826200e856cc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 11:59:00 2011 +0200 Translation update done using Pootle. commit 0f57543a2aed01f8ce7271919910b459843235c7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 11:58:46 2011 +0200 Translation update done using Pootle. commit edc4bac85ab9599bc579ab54060ae7a93708d53c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jul 26 11:34:30 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 73 +++++++++++++++++++++++++-------------------------------- po/es.po | 78 +++++++++++++++++++++++++------------------------------------ po/ja.po | 57 ++++++++++++++++++++------------------------ po/sk.po | 50 ++++++++++++++++++++-------------------- 4 files changed, 115 insertions(+), 143 deletions(-) diff --git a/po/el.po b/po/el.po index 561be74..ca875f0 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-20 11:01+0200\n" +"PO-Revision-Date: 2011-07-26 18:41+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -1206,7 +1206,6 @@ msgid "Pause monitor" msgstr "Παύση εποπτείας" #: js/messages.php:114 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." msgstr "Το general_log και το slow_query_log είναι ενεργοποιημένα." @@ -1220,7 +1219,6 @@ msgid "slow_query_log is enabled." msgstr "Το slow_query_log είναι ενεργοποιημένα." #: js/messages.php:117 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "Το slow_query_log και το general_log είναι απενεργοποιημένα." @@ -1283,7 +1281,6 @@ msgid "Set long_query_time to %ds" msgstr "Ορισμός του long_query_time σε %dδ" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." @@ -1365,10 +1362,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Φίλτρο" +msgstr "Φίλτρα" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 @@ -1377,23 +1373,22 @@ msgstr "Φίλτρο" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Φιλτράρισμα ερωτημάτων ανά λέξη/κανονική έκφραση:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" msgstr "" +"Ομαδοποίηση ερωτημάτων, αγνοώντας τα δεδομένα μεταβλητής στις δηλώσεις WHERE" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Αριθμός εισαχθέντων γραμμών" +msgstr "Άθροισμα ομαδοποιημένων γραμμών" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Σύνολο" +msgstr "Σύνολο:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1531,10 +1526,9 @@ msgid "Change" msgstr "Αλλαγή" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Μέγιστος χρόνος εκτέλεσης" +msgstr "Χρόνος εκτέλεσης ερωτήματος" #: js/messages.php:211 msgid "Hide search criteria" @@ -1550,10 +1544,9 @@ msgid "Ignore" msgstr "Παράληψη" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Προσθήκη στήλης" +msgstr "Προσθήκη στηλών" #: js/messages.php:221 msgid "Select referenced key" @@ -1870,13 +1863,12 @@ msgstr "Μέγεθος γραμματοσειράς" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Το αρχείο δεν ήταν αρχείο αποστολής." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Άγνωστο σφάλμα στην αποστολή αρχείου." +msgstr "Άγνωστο σφάλμα κατά την αποστολή αρχείου." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1922,11 +1914,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Σφάλμα κατά τη μετακίνηση αρχείου αποστολής." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Αδύνατη η ανάγνωση (μετακίνηση) του αρχείου αποστολής." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2482,10 +2474,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s μέρες, %s ώρες, %s λεπτά %s δευτερόλεπτα" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Παράμετροι ρουτίνας" +msgstr "Απολεσθείσα παράμετρος:" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 @@ -6317,10 +6308,9 @@ msgid "" msgstr "Οι ακόλουθες δομές δημιουργήθηκαν ή αλλάχτηκαν. Εδώ μπορείτε να:" #: libraries/import.lib.php:1069 -#, fuzzy #| msgid "View a structure`s contents by clicking on its name" msgid "View a structure's contents by clicking on its name" -msgstr "Δείτε τα περιεχόμενα δομής πατώντας στο όνομα" +msgstr "Προβολή των περιεχομένων δομής πατώντας στο όνομά της" #: libraries/import.lib.php:1070 msgid "" @@ -6328,10 +6318,9 @@ msgid "" msgstr "Αλλάξτε τις ρυθμίσεις πατώντας τον αντίστοιχο σύνδεσμο «Επιλογές»" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Επεξεργαστεί τη δομή από τον σύνδεσμο «Δομή»" +msgstr "Επεξεργαστείτε τη δομή πατώντας τον σύνδεσμο «Δομή»" #: libraries/import.lib.php:1074 msgid "Go to database" @@ -10042,7 +10031,6 @@ msgid "Monitor Instructions" msgstr "Οδηγίες Εποπτείας" #: server_status.php:1364 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" @@ -10059,11 +10047,13 @@ msgid "" msgstr "" "Η Εποπτεία phpMyAdmin μπορεί να σας βοηθήσει να βελτιστοποιήσετε τη ρύθμιση " "του διακομιστή και να καταγράφει χρονοβόρα\n" -" ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output " -"σε «TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log." +"ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output σε " +"«TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log. " +"Σημειώστε, ωστόσο, ότι το\n" +"general_log παράγει πολλά δεδομένα και αυξάνει τη χρήση πόρων του διακομιστή " +"μέχρι και 15%" #: server_status.php:1373 -#, fuzzy #| msgid "" #| "<b>Using the monitor:</b><br/>\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10107,14 +10097,7 @@ msgstr "" " αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. " "Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να " "βρείτε τι προκάλεσε αυτή\n" -" την έντονη δραστηριότητα.</p>\n" -" <p><b>Σημειώστε:</b>\n" -" Ενεργοποιώντας το general_log ίσως αυξήσει τη φόρτωση του διακομιστή " -"μεταξύ 5-15%. Επίσης, έχετε υπόψη ότι η δημιουργία στατιστικών από τις " -"καταγραφές είναι μια \n" -" πολύ απαιτητική σε πόρους εργασία, έτσι σας προτείνουμε να επιλέξετε " -"μια μικρή επέκταση χρόνου.\n" -" </p>" +" την έντονη δραστηριότητα.</p>" #: server_status.php:1383 msgid "" @@ -10126,6 +10109,13 @@ msgid "" "not required any more.\n" " " msgstr "" +"<b>Σημειώστε:</b>\n" +" Η ενεργοποίηση του general_log μπορεί να αυξήσει τη χρήση των πόρων " +"του συστήματος κατά 5-15%. Επίσης, λάβετε υπόψη ότι η δημιουργία στατιστικών " +"από τις καταγραφές είναι μια εργασία που απαιτεί έντονη χρήση πόρων, για " +"αυτό σας προτείνεται να χρησιμοποιήσετε μικρό χρονικό όριο και να " +"απενεργοποιήσετε το general_log και να αδειάσετε τον πίνακά του μόλις η " +"εποπτεία δεν είναι πλέον απαραίτητη. " #: server_status.php:1396 msgid "CPU Usage" @@ -10193,11 +10183,13 @@ msgstr "Επιλεγμένο εύρος χρόνου:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Λήψη μόνο των δηλώσεων SELECT,INSERT,UPDATE και DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" msgstr "" +"Απομάκρυνση δεδομένων μεταβλητών στις δηλώσεις INSERT για καλύτερη " +"ομαδοποιήση" #: server_status.php:1473 msgid "" @@ -10208,10 +10200,9 @@ msgstr "" "αποτελέσματα ομοδοποιούνται ανά κείμενο ερωτήματος." #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Τύπος ερωτήματος" +msgstr "Αναλυτής ερωτήματος" #: server_status.php:1512 #, php-format diff --git a/po/es.po b/po/es.po index c124744..af4cbe2 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-19 22:29+0200\n" +"PO-Revision-Date: 2011-07-27 16:54+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -1212,7 +1212,6 @@ msgid "Pause monitor" msgstr "Pausar monitorización" #: js/messages.php:114 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." msgstr "«general_log» y «slow_query_log» activos." @@ -1226,7 +1225,6 @@ msgid "slow_query_log is enabled." msgstr "«slow_query_log» activo." #: js/messages.php:117 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "«slow_query_log» y «general_log» desactivados." @@ -1288,7 +1286,6 @@ msgid "Set long_query_time to %ds" msgstr "Definir «long_query_time» a %ds" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." @@ -1296,9 +1293,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" -"No posee permisos de superusuario para cambiar estas variables. Por favor " -"inicie sesión con la cuenta root o contacte a su administrador de base de " -"datos." +"No posee permisos para cambiar estas variables. Por favor inicie sesión con " +"la cuenta root o contacte a su administrador de base de datos." #: js/messages.php:132 msgid "Change settings" @@ -1370,10 +1366,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Filtrar" +msgstr "Filtros" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 @@ -1382,23 +1377,21 @@ msgstr "Filtrar" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Filtrar consultas por palabra/expresión regular:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" -msgstr "" +msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Número de filas insertadas" +msgstr "Suma de filas agrupadas:" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Total" +msgstr "Total:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 @@ -1537,10 +1530,9 @@ msgid "Change" msgstr "Cambiar" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Tiempo máximo de ejecución" +msgstr "Tiempo de ejecución de la consulta" #: js/messages.php:211 msgid "Hide search criteria" @@ -1556,10 +1548,9 @@ msgid "Ignore" msgstr "Ignorar" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Añadir columna" +msgstr "Agregar columnas" #: js/messages.php:221 msgid "Select referenced key" @@ -1876,13 +1867,12 @@ msgstr "Tamaño de fuente" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "El archivo no era un archivo subido." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Error desconocido al subir el archivo." +msgstr "Error desconocido durante subida." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -1928,11 +1918,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Error al mover el archivo subido." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "No se puede leer el archivo subido (y movido)." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2490,10 +2480,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s días, %s horas, %s minutos y %s segundos" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Parámetros de rutina" +msgstr "Parámetro faltante:" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 @@ -6349,10 +6338,9 @@ msgid "" msgstr "Las siguientes estructureas fueron creadas o alteradas. Puedes:" #: libraries/import.lib.php:1069 -#, fuzzy #| msgid "View a structure`s contents by clicking on its name" msgid "View a structure's contents by clicking on its name" -msgstr "Ver los contenidos de una estructura pulsando en su nombre" +msgstr "Puede ver los contenidos de una estructura pulsando en su nombre" #: libraries/import.lib.php:1070 msgid "" @@ -6362,10 +6350,9 @@ msgstr "" "correspondiente" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Edite su estructura siguiendo el enlace \"Estructura\"" +msgstr "Edite la estructura siguiendo el enlace \"Estructura\"" #: libraries/import.lib.php:1074 msgid "Go to database" @@ -10079,7 +10066,6 @@ msgid "Monitor Instructions" msgstr "Instrucciones de monitorización" #: server_status.php:1364 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" @@ -10096,11 +10082,12 @@ msgid "" msgstr "" "El monitorizador de phpMyAdmin puede asistir en la optimización de la " "configuración del servidor y rastrear consultas que toman mucho tiempo. Para " -"esto último va a necesitar que «log_output» esté definido como 'TABLE' y " -"tener activado «slow_query_log» o «general_log»." +"esto último necesitará que «log_output» esté definido como 'TABLE' y tener " +"activado «slow_query_log» o «general_log». Note, sin embargo, que " +"«general_log» produce mucha información y aumenta la carga en el servidor " +"hasta en un 15%" #: server_status.php:1373 -#, fuzzy #| msgid "" #| "<b>Using the monitor:</b><br/>\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10141,14 +10128,7 @@ msgstr "" "<p>Cuando vea un pico repentino de actividad, seleccione el intervalo de " "tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y " "arrastrando sobre el gráfico. Esto cargará las estadísticas de los " -"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</" -"p>\n" -"<p><b>Notar que:</b>\n" -"Activar «general_log» puede aumentar la carga en el servidor hast un 5-15%. " -"También esté al tanto que generar estadísticas de los registros es una tarea " -"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo " -"más pequeño posible.\n" -"</p>" +"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</p>" #: server_status.php:1383 msgid "" @@ -10160,6 +10140,13 @@ msgid "" "not required any more.\n" " " msgstr "" +"<b>Notar que:</b>\n" +"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. " +"También esté al tanto que generar estadísticas de los registros es una " +"tarea muy intensiva por lo que se recomienda seleccionar un período de " +"tiempo lo más pequeño posible y desactivar «general_log» y vaciar sus tablas " +"una vez que ya no se necesite monitorizar.\n" +" " #: server_status.php:1396 msgid "CPU Usage" @@ -10227,11 +10214,11 @@ msgstr "Rango de tiempo seleccionado:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Sólo recuperar sentencias SELECT, INSERT, UPDATE y DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Eliminar datos variables en sentencias INSERT para mejor agrupación" #: server_status.php:1473 msgid "" @@ -10242,10 +10229,9 @@ msgstr "" "se agruparán por el texto de la consulta." #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Tipo de consulta" +msgstr "Analizador de consultas" #: server_status.php:1512 #, php-format diff --git a/po/ja.po b/po/ja.po index ef9c015..c38e202 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-24 04:22+0200\n" +"PO-Revision-Date: 2011-07-27 12:14+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1118,15 +1118,14 @@ msgstr "接続／プロセス" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 -#, fuzzy #| msgid "Connections since last refresh" msgid "Questions since last refresh" -msgstr "更新間隔中の接続数" +msgstr "更新間隔中の問い合わせ数" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "問い合わせ数（サーバで実行された命令文）" #: js/messages.php:91 server_status.php:617 msgid "Query statistics" @@ -1158,10 +1157,9 @@ msgstr "平均負荷" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Suggestions:" msgid "Questions" -msgstr "提案：" +msgstr "問い合わせ" #: js/messages.php:103 server_status.php:894 msgid "Traffic" @@ -1186,7 +1184,7 @@ msgstr "モニタリンググラフを追加する" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "少なくとも１つの系列を追加してください" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052 @@ -1244,7 +1242,7 @@ msgstr "" msgid "" "Following settings will be applied globally and reset to default on server " "restart:" -msgstr "" +msgstr "以下の設定は、グローバルに適用され、サーバの再起動時にはデフォルトにリセットされます。" #. l10n: %s is FILE or TABLE #: js/messages.php:124 @@ -1255,17 +1253,17 @@ msgstr "出力をファイルに保存する" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:126 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "有効" +msgstr "%s を有効にする" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:128 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "無効" +msgstr "%s を無効にする" #. l10n: %d seconds #: js/messages.php:130 @@ -1277,19 +1275,17 @@ msgstr "" msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." -msgstr "" +msgstr "これらの変数を変更することはできません。root でログインするか、データベース管理者に連絡してください。" #: js/messages.php:132 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "ユーザ設定の管理" +msgstr "設定の変更" #: js/messages.php:133 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "詳細設定" +msgstr "現在の設定" #: js/messages.php:135 server_status.php:1393 msgid "Chart Title" @@ -1349,7 +1345,6 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" msgstr "フィルタ" @@ -1535,7 +1530,6 @@ msgid "Ignore" msgstr "無視" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" msgstr "カラムを追加する" @@ -1855,13 +1849,12 @@ msgstr "フォントサイズ" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "アップロードされたファイルではありません。" #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "ファイルのアップロード中に予期しないエラーが発生しました。" +msgstr "アップロード中に予期しないエラーが発生しました。" #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -2455,10 +2448,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 日 %s 時間 %s 分 %s 秒" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "ルーチンのパラメータ" +msgstr "パラメータがありません：" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 @@ -6932,7 +6924,7 @@ msgstr "ルーチンタイプが不正です: \"%s\"" #: libraries/rte/rte_routines.lib.php:268 msgid "Sorry, we failed to restore the dropped routine." -msgstr "" +msgstr "申し訳ありませんが、削除されたルーチンの復元に失敗しました。" #: libraries/rte/rte_routines.lib.php:273 #, php-format @@ -7058,7 +7050,7 @@ msgstr "関数" #: libraries/rte/rte_triggers.lib.php:89 msgid "Sorry, we failed to restore the dropped trigger." -msgstr "" +msgstr "申し訳ありませんが、削除されたトリガの復元に失敗しました。" #: libraries/rte/rte_triggers.lib.php:94 #, php-format @@ -9041,10 +9033,10 @@ msgstr "関連リンク" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:738 -#, fuzzy, php-format +#, php-format #| msgid "Network traffic since startup: %s" msgid "Questions since startup: %s" -msgstr "起動以後のネットワークトラフィック：%s" +msgstr "起動以後の問い合わせ数：%s" #: server_status.php:744 server_status.php:779 server_status.php:895 #: server_status.php:940 @@ -9074,10 +9066,10 @@ msgid "Network traffic since startup: %s" msgstr "起動以後のネットワークトラフィック：%s" #: server_status.php:852 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "この MySQL サーバの稼働時間: %s (起動時刻: %s)" +msgstr "この MySQL サーバの稼働時間: %1$s (起動時刻: %2$s)" #: server_status.php:862 msgid "" @@ -9843,6 +9835,9 @@ msgid "" " general_log produces a lot of data and increases server load by up " "to 15%" msgstr "" +"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output " +"を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log " +"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" #: server_status.php:1373 msgid "" @@ -10858,7 +10853,7 @@ msgstr "カラムを選択してください (最低 1 つ)" #: tbl_select.php:278 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "または検索条件 (WHERE 節の内容) を追加してください" +msgstr "検索条件 (WHERE 節の内容) を追加してください" #: tbl_select.php:285 msgid "Number of rows per page" diff --git a/po/sk.po b/po/sk.po index 99677c0..caf7e4e 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-14 15:30+0200\n" +"PO-Revision-Date: 2011-07-27 15:32+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\n" @@ -1131,7 +1131,7 @@ msgstr "Spojení od posledného obnovenia" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Dopyty (príkazy vykonané na serveri)" #: js/messages.php:91 server_status.php:617 msgid "Query statistics" @@ -1139,15 +1139,15 @@ msgstr "Štatistika dopytov" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Využitie CPU" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Systémová pamäť" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Stránkovacia oblasť" #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1433 msgid "MiB" @@ -1159,14 +1159,13 @@ msgstr "KiB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Priemerné vyťaženie" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "Verzia" +msgstr "Dopyty" #: js/messages.php:103 server_status.php:894 msgid "Traffic" @@ -1178,22 +1177,21 @@ msgid "Settings" msgstr "Nastavenia" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Odstrániť databázu" +msgstr "Odstrániť graf" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Upraviť popisy a série" #: js/messages.php:107 msgid "Add chart to grid" -msgstr "" +msgstr "Pridať graf do mriežky" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Pridajte prosím aspoň jednu hodnotu do série" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052 @@ -1212,19 +1210,19 @@ msgstr "" #: js/messages.php:114 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "general_log a slow_query_log sú povolené." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log je povolený." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log je povolený." #: js/messages.php:117 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "slow_query_log a general_log sú zakázané." #: js/messages.php:118 msgid "log_output is not set to TABLE." @@ -5305,20 +5303,18 @@ msgid "%d is not valid row number." msgstr "%d nie je platné číslo riadku." #: libraries/display_tbl.lib.php:433 -#, fuzzy #| msgid "Start" msgid "Start row" -msgstr "Štart" +msgstr "Prvý riadok" #: libraries/display_tbl.lib.php:435 msgid "Number of rows" msgstr "Počet riadkov" #: libraries/display_tbl.lib.php:440 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Viac" +msgstr "Režim" #: libraries/display_tbl.lib.php:442 msgid "horizontal" @@ -5448,9 +5444,8 @@ msgid "Visualize GIS data" msgstr "Zobraziť GIS data" #: libraries/display_tbl.lib.php:2526 -#, fuzzy msgid "Create view" -msgstr "Vytvoriť relaciu" +msgstr "Vytvoriť pohľad" #: libraries/display_tbl.lib.php:2626 msgid "Link not found" @@ -5704,7 +5699,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Hlavičky metadát" #: libraries/engines/pbms.lib.php:61 msgid "" @@ -5733,13 +5728,16 @@ msgstr "" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Veľkosť vyrovnávacej pamäte indexu" #: libraries/engines/pbxt.lib.php:23 msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" +"Množstvo pamäte vyhradenej pre vyrovnávaciu pamät indexu. Štandardná hodnota " +"je 32MB. Pamät tu priradená je použitá výhradne pre vyrovnávaciu pamäť " +"indexových stránok." #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" @@ -5771,6 +5769,8 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Maximálna veľkosť transakčného logu pred jeho pretočením a vytvorením " +"nového. Štandardná hodnota je 16MB." #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12053-g5f88427
by Piotr Przybylski 27 Jul '11

27 Jul '11

The branch, master has been updated via 5f8842739de809166475ffb763dbaccb6d755728 (commit) from e82682d0e4037d92305ad92cb5514e822e9a5abc (commit) - Log ----------------------------------------------------------------- commit 5f8842739de809166475ffb763dbaccb6d755728 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 21:26:28 2011 +0200 Remove invalid usage of $php_errormsg ----------------------------------------------------------------------- Summary of changes: libraries/auth/config.auth.lib.php | 8 +------- libraries/auth/signon.auth.lib.php | 2 -- libraries/dbi/mysql.dbi.lib.php | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 5c98d25..e90e0bf 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -66,15 +66,9 @@ function PMA_auth_set_user() */ function PMA_auth_fails() { - global $php_errormsg, $cfg; - $conn_error = PMA_DBI_getError(); if (!$conn_error) { - if (isset($php_errormsg)) { - $conn_error = $php_errormsg; - } else { - $conn_error = __('Cannot connect: invalid settings.'); - } + $conn_error = __('Cannot connect: invalid settings.'); } // Defines the charset to be used diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index a829faa..0a079b2 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -238,8 +238,6 @@ function PMA_auth_fails() $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); } elseif (PMA_DBI_getError()) { $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); - } elseif (isset($php_errormsg)) { - $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; } else { $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index ed8a93a..64ab026 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -63,7 +63,7 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) { - global $cfg, $php_errormsg; + global $cfg; if ($server) { $server_port = (empty($server['port'])) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12052-ge82682d
by Piotr Przybylski 27 Jul '11

27 Jul '11

The branch, master has been updated via e82682d0e4037d92305ad92cb5514e822e9a5abc (commit) via b9ff7b7ce279391e5a2538c182ee0419e3456fa3 (commit) via f43517efb525b8e4cfc387822308c206f32ba6ee (commit) via 46cd0f9a09e3a3fd0f2bb3b9b018282390c4e813 (commit) via b0ce7c20c4595a8a093177583cbdd5e15c6b6dca (commit) via 69ac50958439cc32f4fa313ebb096d90b3a10746 (commit) via 2141b5fe81d71d08524a11251a38fe5663b51ac7 (commit) from f89a16ed81e111abd7cf55d506ec944b4697ba4e (commit) - Log ----------------------------------------------------------------- commit e82682d0e4037d92305ad92cb5514e822e9a5abc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 19:54:22 2011 +0200 Simplify PMA_DBI_free_result It was never used with multiple arguments commit b9ff7b7ce279391e5a2538c182ee0419e3456fa3 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 19:51:09 2011 +0200 Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) commit f43517efb525b8e4cfc387822308c206f32ba6ee Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 19:37:51 2011 +0200 mysql extension - remove 'persistent' parameter Was named 'persistant' and never used/documented commit 46cd0f9a09e3a3fd0f2bb3b9b018282390c4e813 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 19:01:15 2011 +0200 Comments commit b0ce7c20c4595a8a093177583cbdd5e15c6b6dca Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 17:31:23 2011 +0200 Improve readability commit 69ac50958439cc32f4fa313ebb096d90b3a10746 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 17:25:20 2011 +0200 This should be checked in common, not in dbi library commit 2141b5fe81d71d08524a11251a38fe5663b51ac7 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 27 17:20:14 2011 +0200 Fix incorrect variable name persistant > persistent ----------------------------------------------------------------------- Summary of changes: Documentation.html | 8 ++- libraries/common.inc.php | 5 ++ libraries/dbi/mysql.dbi.lib.php | 97 ++++++++++++++++++-------- libraries/dbi/mysqli.dbi.lib.php | 139 ++++++++++++++++++++++---------------- 4 files changed, 160 insertions(+), 89 deletions(-) diff --git a/Documentation.html b/Documentation.html index 33bfa85..26673cb 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1391,8 +1391,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> 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 - mysql_pconnect).</dd> + <dd>Whether <a href="http://php.net/manual/en/features.persistent-connections.php">persistent connections</a> + should be used or not. Works with following extensions: + <ul> + <li>mysql (<a href="http://php.net/manual/en/function.mysql-pconnect.php">mysql_pconnect</a>),</li> + <li>mysqli (requires PHP 5.3.0 or newer, <a href="http://php.net/manual/en/mysqli.persistconns.php">more information</a>).</li> + </ul></dd> <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt> <dd>Whether to force using https while accessing phpMyAdmin.</dd> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 53cde17..2b2cf60 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -899,6 +899,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { unset($login_without_password_is_forbidden); //Clean up after you! } + // if using TCP socket is not needed + if (strtolower($cfg['Server']['connect_type']) == 'tcp') { + $cfg['Server']['socket'] = ''; + } + // Try to connect MySQL with the control user profile (will be used to // get the privileges list for the current user but the true user link // must be open after this one so it would be default one for all the diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index aa099eb..ed8a93a 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -20,18 +20,28 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { unset($client_api); } -function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistant=false) +/** + * Helper function for connecting to the database server + * + * @param string $server + * @param string $user + * @param string $password + * @param int $client_flags + * @param boolean $persistent + * @return mixed false on error or a mysql connection resource on success + */ +function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent = false) { global $cfg; if (empty($client_flags)) { - if ($cfg['PersistentConnections'] || $persistant) { + if ($cfg['PersistentConnections'] || $persistent) { $link = @mysql_pconnect($server, $user, $password); } else { $link = @mysql_connect($server, $user, $password); } } else { - if ($cfg['PersistentConnections'] || $persistant) { + if ($cfg['PersistentConnections'] || $persistent) { $link = @mysql_pconnect($server, $user, $password, $client_flags); } else { $link = @mysql_connect($server, $user, $password, false, $client_flags); @@ -40,11 +50,14 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist return $link; } + /** + * connects to the database server + * * @param string $user mysql user name * @param string $password mysql user password * @param boolean $is_controluser - * @param array $server host/port/socket/persistant + * @param array $server host/port/socket/persistent * @param boolean $auxiliary_connection (when true, don't go back to login if connection fails) * @return mixed false on error or a mysqli object on success */ @@ -59,9 +72,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $server_socket = (empty($server['socket'])) ? '' : ':' . $server['socket']; - $server_persistant = (empty($server['persistant'])) - ? false - : true; } else { $server_port = (empty($cfg['Server']['port'])) ? '' @@ -71,10 +81,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu : ':' . $cfg['Server']['socket']; } - if (strtolower($cfg['Server']['connect_type']) == 'tcp') { - $cfg['Server']['socket'] = ''; - } - $client_flags = 0; // always use CLIENT_LOCAL_FILES as defined in mysql_com.h @@ -101,9 +107,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistant); + $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL); } else { - $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistant); + $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL); } } if (empty($link)) { @@ -128,11 +134,11 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } /** - * select a db + * selects given database * - * @param string $dbname name of db to select - * @param resource $link mysql link resource - * @return boolean success + * @param string $dbname name of db to select + * @param resource $link mysql link resource + * @return boolean */ function PMA_DBI_select_db($dbname, $link = null) { @@ -149,9 +155,9 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to run + * @param string $query query to run * @param resource $link mysql link resource - * @param integer $options + * @param integer $options * @return mixed */ function PMA_DBI_real_query($query, $link, $options) @@ -165,15 +171,33 @@ function PMA_DBI_real_query($query, $link, $options) } } +/** + * returns array of rows with associative and numeric keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_array($result) { return mysql_fetch_array($result, MYSQL_BOTH); } +/** + * returns array of rows with associative keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_assoc($result) { return mysql_fetch_array($result, MYSQL_ASSOC); } +/** + * returns array of rows with numeric keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_row($result) { return mysql_fetch_array($result, MYSQL_NUM); @@ -192,17 +216,14 @@ function PMA_DBI_data_seek($result, $offset) } /** - * Frees the memory associated with the results + * Frees memory associated with the result * - * @param result $result,... one or more mysql result resources + * @param resource $result */ -function PMA_DBI_free_result() +function PMA_DBI_free_result($result) { - foreach (func_get_args() as $result) { - if (is_resource($result) - && get_resource_type($result) === 'mysql result') { - mysql_free_result($result); - } + if (is_resource($result) && get_resource_type($result) === 'mysql result') { + mysql_free_result($result); } } @@ -337,6 +358,12 @@ function PMA_DBI_getError($link = null) return $error; } +/** + * returns the number of rows returned by last query + * + * @param resource $result + * @return string|ineteger + */ function PMA_DBI_num_rows($result) { if (!is_bool($result)) { @@ -346,6 +373,12 @@ function PMA_DBI_num_rows($result) } } +/** + * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] + * + * @param resource $link the mysql object + * @return string|ineteger + */ function PMA_DBI_insert_id($link = null) { if (empty($link)) { @@ -366,9 +399,9 @@ function PMA_DBI_insert_id($link = null) /** * returns the number of rows affected by last query * - * @param object mysql $link the mysql object - * @param boolean $get_from_cache - * @return string integer + * @param resource $link the mysql object + * @param boolean $get_from_cache + * @return string|integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -388,7 +421,11 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) } /** + * returns metainfo for fields in $result + * * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) + * @param resource $result + * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 0cd7c2f..535b825 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -44,6 +44,34 @@ if (! defined('MYSQLI_TYPE_BIT')) { } /** + * Helper function for connecting to the database server + * + * @param mysqli $link + * @param string $host + * @param string $user + * @param string $password + * @param string $dbname + * @param int $server_port + * @param string $server_socket + * @param int $client_flags + * @param boolean $persistent + * @return boolean + */ +function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false) +{ + global $cfg; + + if ($cfg['PersistentConnections'] || $persistent) { + $host = 'p:' . $host; + } + if ($client_flags === null) { + return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket); + } else { + return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags); + } +} + +/** * connects to the database server * * @param string $user mysql user name @@ -55,6 +83,8 @@ if (! defined('MYSQLI_TYPE_BIT')) { */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) { + global $cfg; + if ($server) { $server_port = (empty($server['port'])) ? false @@ -66,17 +96,12 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu ? 'localhost' : $server['host']; } else { - $server_port = (empty($GLOBALS['cfg']['Server']['port'])) + $server_port = (empty($cfg['Server']['port'])) ? false - : (int) $GLOBALS['cfg']['Server']['port']; - $server_socket = (empty($GLOBALS['cfg']['Server']['socket'])) + : (int) $cfg['Server']['port']; + $server_socket = (empty($cfg['Server']['socket'])) ? null - : $GLOBALS['cfg']['Server']['socket']; - } - - - if (strtolower($GLOBALS['cfg']['Server']['connect_type']) == 'tcp') { - $GLOBALS['cfg']['Server']['socket'] = ''; + : $cfg['Server']['socket']; } // NULL enables connection to the default socket @@ -88,23 +113,23 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $client_flags = 0; /* Optionally compress connection */ - if ($GLOBALS['cfg']['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) { + if ($cfg['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) { $client_flags |= MYSQLI_CLIENT_COMPRESS; } /* Optionally enable SSL */ - if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { + if ($cfg['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { $client_flags |= MYSQLI_CLIENT_SSL; } if (!$server) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); + $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); // Retry with empty password if we're allowed to - if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); + if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { + $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { - $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); + $return_value = @PMA_DBI_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); } if ($return_value == false) { @@ -131,9 +156,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu /** * selects given database * - * @param string $dbname database name to select - * @param object mysqli $link the mysqli object - * @return boolean true or false + * @param string $dbname database name to select + * @param mysqli $link the mysqli object + * @return boolean */ function PMA_DBI_select_db($dbname, $link = null) { @@ -150,10 +175,10 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to execute - * @param object mysqli $link mysqli object - * @param integer $options - * @return mixed true, false or result object + * @param string $query query to execute + * @param mysqli $link mysqli object + * @param integer $options + * @return mysqli_result|boolean */ function PMA_DBI_real_query($query, $link, $options) { @@ -171,8 +196,8 @@ function PMA_DBI_real_query($query, $link, $options) /** * returns array of rows with associative and numeric keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_array($result) { @@ -182,8 +207,8 @@ function PMA_DBI_fetch_array($result) /** * returns array of rows with associative keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_assoc($result) { @@ -193,8 +218,8 @@ function PMA_DBI_fetch_assoc($result) /** * returns array of rows with numeric keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_row($result) { @@ -214,23 +239,21 @@ function PMA_DBI_data_seek($result, $offset) } /** - * Frees the memory associated with the results + * Frees memory associated with the result * - * @param result $result,... one or more mysql result resources + * @param mysqli_result $result */ -function PMA_DBI_free_result() +function PMA_DBI_free_result($result) { - foreach (func_get_args() as $result) { - if ($result instanceof mysqli_result) { - mysqli_free_result($result); - } + if ($result instanceof mysqli_result) { + mysqli_free_result($result); } } /** * Check if there are any more query results from a multi query * - * @param object mysqli $link the mysqli object + * @param mysqli $link the mysqli object * @return boolean true or false */ function PMA_DBI_more_results($link = null) { @@ -247,7 +270,7 @@ function PMA_DBI_more_results($link = null) { /** * Prepare next result from multi_query * - * @param object mysqli $link the mysqli object + * @param mysqli $link the mysqli object * @return boolean true or false */ function PMA_DBI_next_result($link = null) { @@ -356,8 +379,10 @@ function PMA_DBI_getError($link = null) } /** + * returns the number of rows returned by last query * - * @param object mysqli result $result + * @param mysqli_result $result + * @return string|ineteger */ function PMA_DBI_num_rows($result) { @@ -372,10 +397,10 @@ function PMA_DBI_num_rows($result) /** * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] * - * @param object mysqli $link the mysqli object - * @return string ineteger + * @param mysqli $link the mysqli object + * @return string|ineteger */ -function PMA_DBI_insert_id($link = '') +function PMA_DBI_insert_id($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -396,9 +421,9 @@ function PMA_DBI_insert_id($link = '') /** * returns the number of rows affected by last query * - * @param object mysqli $link the mysqli object - * @param boolean $get_from_cache - * @return string integer + * @param mysqli $link the mysqli object + * @param boolean $get_from_cache + * @return string|integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -420,8 +445,8 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) * returns metainfo for fields in $result * * @todo preserve orignal flags value - * @param object mysqli result $result - * @return array meta info for fields in $result + * @param mysqli_result $result + * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) { @@ -499,8 +524,8 @@ function PMA_DBI_get_fields_meta($result) /** * return number of fields in given $result * - * @param object mysqli result $result - * @return integer field count + * @param mysqli_result $result + * @return integer field count */ function PMA_DBI_num_fields($result) { @@ -510,9 +535,9 @@ function PMA_DBI_num_fields($result) /** * returns the length of the given field $i in $result * - * @param object mysqli result $result - * @param integer $i field - * @return integer length of field + * @param mysqli_result $result + * @param integer $i field + * @return integer length of field */ function PMA_DBI_field_len($result, $i) { @@ -522,9 +547,9 @@ function PMA_DBI_field_len($result, $i) /** * returns name of $i. field in $result * - * @param object mysqli result $result - * @param integer $i field - * @return string name of $i. field in $result + * @param mysqli_result $result + * @param integer $i field + * @return string name of $i. field in $result */ function PMA_DBI_field_name($result, $i) { @@ -534,9 +559,9 @@ function PMA_DBI_field_name($result, $i) /** * returns concatenated string of human readable field flags * - * @param object mysqli result $result - * @param integer $i field - * @return string field flags + * @param mysqli_result $result + * @param integer $i field + * @return string field flags */ function PMA_DBI_field_flags($result, $i) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12045-gf89a16e
by Marc Delisle 27 Jul '11

27 Jul '11

The branch, master has been updated via f89a16ed81e111abd7cf55d506ec944b4697ba4e (commit) via f45c4292c1eccbb10569e78219b2bb32eb139852 (commit) via 5bd6aa27ad08983263baaaafeda39d474d8c919d (commit) via 1635c5c0bce85d69b496a3ef03e075fa2042e413 (commit) from ad4975b82d6beb67d78c0e64092ef29f98a257e3 (commit) - Log ----------------------------------------------------------------- commit f89a16ed81e111abd7cf55d506ec944b4697ba4e Merge: f45c4292c1eccbb10569e78219b2bb32eb139852 ad4975b82d6beb67d78c0e64092ef29f98a257e3 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed Jul 27 19:57:08 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f45c4292c1eccbb10569e78219b2bb32eb139852 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Wed Jul 27 19:56:23 2011 +0530 included tbl change.js file to the tbl select.php file commit 5bd6aa27ad08983263baaaafeda39d474d8c919d Merge: 1635c5c0bce85d69b496a3ef03e075fa2042e413 489e8f128578972ba6b92bd05c7c7caae95a8bd4 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Mon Jul 25 22:24:52 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1635c5c0bce85d69b496a3ef03e075fa2042e413 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Mon Jul 25 22:22:13 2011 +0530 Ajaxify the Alter table order in Table operations ----------------------------------------------------------------------- Summary of changes: js/functions.js | 32 ++++++++++++++++++++++++++++++++ tbl_operations.php | 19 ++++++++++++++----- tbl_select.php | 1 + 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index d7694f4..bbe00b5 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1937,6 +1937,38 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Change Table' /** + * jQuery coding for 'Table operations'. Used on tbl_operations.php + * Attach Ajax Event handlers for Table operations + */ +$(document).ready(function() { + /** + *Ajax action for submitting the "Alter table order by" + **/ + $("#alterTableOrderby.ajax").live('submit', function(event) { + event.preventDefault(); + $form = $(this); + + PMA_prepareForAjaxRequest($form); + /*variables which stores the common attributes*/ + $.post($form.attr('action'), $form.serialize()+"&submitorderby=Go", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + } else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + });//end of alterTableOrderby ajax submit +}, 'top.frame_content'); //end $(document).ready for 'Table operations' + + +/** * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js * as it was also required on db_create.php * diff --git a/tbl_operations.php b/tbl_operations.php index 11021ba..3481fd1 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -216,25 +216,34 @@ if ($reread_info) { unset($reread_info); /** - * Displays top menu links + * Displays top menu links in non ajax requests */ -require_once './libraries/tbl_links.inc.php'; - +if (!isset($_REQUEST['ajax_request'])) { + require_once './libraries/tbl_links.inc.php'; +} if (isset($result) && empty($message_to_show)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; if (empty($_message)) { - $_message = $result ? __('Your SQL query has been executed successfully') : __('Error'); + $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; + if ( $GLOBALS['is_ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data); + } } if (! empty($warning_messages)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); $_message->isError(true); + if ( $GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($_message, false); + } unset($warning_messages); } + PMA_showMessage($_message, $sql_query, $_type); unset($_message, $_type); } @@ -258,7 +267,7 @@ unset($local_query); ?>  <div class="operations_half_width"> -<form method="post" action="tbl_operations.php"> +<form method="post" id="alterTableOrderby" action="tbl_operations.php" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <fieldset id="fieldset_table_order"> <legend><?php echo __('Alter table order by'); ?></legend> diff --git a/tbl_select.php b/tbl_select.php index 52e8b93..c6b0a35 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -19,6 +19,7 @@ require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'tbl_select.js'; +$GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12041-gad4975b
by Rouslan Placella 26 Jul '11

26 Jul '11

The branch, master has been updated via ad4975b82d6beb67d78c0e64092ef29f98a257e3 (commit) via 402a832e93192a043b79bc379ff5be80a93a8da1 (commit) via 871aaa9b641714af2137de5d67c137c8017580bd (commit) via cc99e0405536b2d886897c269a4877c05ba156f9 (commit) from 9525cac85cb206f6ab6da2f56f85e613f17b601b (commit) - Log ----------------------------------------------------------------- commit ad4975b82d6beb67d78c0e64092ef29f98a257e3 Merge: 9525cac85cb206f6ab6da2f56f85e613f17b601b 402a832e93192a043b79bc379ff5be80a93a8da1 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Jul 26 14:39:20 2011 +0100 Merge branch 'QA_3_4' Conflicts: ChangeLog Documentation.html README libraries/Config.class.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + themes/pmahomme/css/theme_left.css.php | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49a5b64..9f3c162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ phpMyAdmin - ChangeLog + AJAX for table Structure column Add 3.4.5.0 (not yet released) +- bug #3375325 [interface] Page list in navigation frame looks odd 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 89a7efb..8ed6707 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -141,15 +141,22 @@ ul#databaseList span { } ul#databaseList a { + color: #333; + background: url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; display: block; - padding:5px; + padding: 5px; font-style: normal; } +div#navidbpageselector { + margin: 0.1em; + text-align: center; +} + div#navidbpageselector a, -ul#databaseList a { - background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; - color: #333; +div#navidbpageselector select{ + color: #333; + margin: 0.2em; } ul#databaseList ul { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-57-g402a832
by Rouslan Placella 26 Jul '11

26 Jul '11

The branch, QA_3_4 has been updated via 402a832e93192a043b79bc379ff5be80a93a8da1 (commit) from 871aaa9b641714af2137de5d67c137c8017580bd (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + themes/pmahomme/css/theme_left.css.php | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03daef0..5b02857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.5.0 (not yet released) +- bug #3375325 [interface] Page list in navigation frame looks odd 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 467e70a..990feeb 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -113,15 +113,22 @@ ul#databaseList span { } ul#databaseList a { + color: #333; + background: url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; display: block; - padding:5px; + padding: 5px; font-style: normal; } +div#navidbpageselector { + margin: 0.1em; + text-align: center; +} + div#navidbpageselector a, -ul#databaseList a { - background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; - color: #333; +div#navidbpageselector select{ + color: #333; + margin: 0.2em; } ul#databaseList ul { hooks/post-receive -- phpMyAdmin

1 0