- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6487-g6d88345
by Piotr Przybylski 01 Jul '11

01 Jul '11

The branch, master has been updated via 6d883454046623718bd777e0f6044eb57a65a55e (commit) via e6b1d479cff08bbbc70539e98dfc060f19261b95 (commit) via 5021bae02fbba6ef7fa232670f0a134cc6b1ce8c (commit) via b23294197674816d7e575d67b4306f7cbfa3cf51 (commit) from d5dd8a2d37f0fab931df449d4c6a744821a78afb (commit) - Log ----------------------------------------------------------------- commit 6d883454046623718bd777e0f6044eb57a65a55e Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:48:14 2011 +0200 Remove DBI from moved functions' names commit e6b1d479cff08bbbc70539e98dfc060f19261b95 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:45:08 2011 +0200 Move PMA_DBI_get_column_values and PMA_DBI_get_table_indexes to server_synchronize.lib.php They are used only there, no need to parse 1,5 KB of code on every page load commit 5021bae02fbba6ef7fa232670f0a134cc6b1ce8c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:34:25 2011 +0200 Remove unused PMA_DBI_get_table_data commit b23294197674816d7e575d67b4306f7cbfa3cf51 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sat Jul 2 00:30:09 2011 +0200 Whitespace and comments ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 70 ++++++++++++++++++++------------ libraries/database_interface.lib.php | 73 ---------------------------------- libraries/server_synchronize.lib.php | 64 +++++++++++++++++++++++++++--- 3 files changed, 101 insertions(+), 106 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 0e0b9c8..b355c02 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1117,6 +1117,7 @@ $cfg['DefaultTabDatabase'] = 'db_structure.php'; */ $cfg['DefaultTabTable'] = 'sql.php'; + /******************************************************************************* * Export defaults */ @@ -1824,6 +1825,7 @@ $cfg['Export']['xml_export_contents'] = true; */ $cfg['Export']['yaml_structure_or_data'] = 'data'; + /******************************************************************************* * Import defaults */ @@ -2411,6 +2413,7 @@ $cfg['UserprefsDisallow'] = array(); */ $cfg['UserprefsDeveloperTab'] = false; + /******************************************************************************* * Window title settings */ @@ -2521,7 +2524,9 @@ $cfg['DefaultQueryDatabase'] = ''; /******************************************************************************* * SQL Query box settings * These are the links display in all of the SQL Query boxes - * + */ + +/** * @global array $cfg['SQLQuery'] */ $cfg['SQLQuery'] = array(); @@ -2593,7 +2598,7 @@ $cfg['SaveDir'] = ''; $cfg['TempDir'] = ''; -/** +/******************************************************************************* * Misc. settings */ @@ -2635,7 +2640,12 @@ $cfg['LinkLengthLimit'] = 2000; */ $cfg['DisableMultiTableMaintenance'] = false; + /******************************************************************************* + * SQL Parser + */ + +/** * SQL Parser Settings * * @global array $cfg['SQP'] @@ -2665,6 +2675,10 @@ $cfg['SQP']['fmtIndUnit'] = 'em'; /******************************************************************************* + * SQL Validator + */ + +/** * If you wish to use the SQL Validator service, you should be aware of the * following: * All SQL statements are stored anonymously for statistical purposes. @@ -2699,6 +2713,10 @@ $cfg['SQLValidator']['password'] = ''; /******************************************************************************* * Developers ONLY! + */ + +/** + * Debugging settings * * @global array $cfg['DBG'] */ @@ -2934,29 +2952,29 @@ if ($cfg['ShowFunctionFields']) { 'TIME' => 'FUNC_DATE', 'YEAR' => 'FUNC_DATE', - 'CHAR' => 'FUNC_CHAR', - 'VARCHAR' => 'FUNC_CHAR', - 'TINYTEXT' => 'FUNC_CHAR', - 'TEXT' => 'FUNC_CHAR', - 'MEDIUMTEXT' => 'FUNC_CHAR', - 'LONGTEXT' => 'FUNC_CHAR', - 'BINARY' => 'FUNC_CHAR', - 'VARBINARY' => 'FUNC_CHAR', - 'TINYBLOB' => 'FUNC_CHAR', - 'MEDIUMBLOB' => 'FUNC_CHAR', - 'BLOB' => 'FUNC_CHAR', - 'LONGBLOB' => 'FUNC_CHAR', - 'ENUM' => '', - 'SET' => '', - - 'GEOMETRY' => 'FUNC_SPATIAL', - 'POINT' => 'FUNC_SPATIAL', - 'LINESTRING' => 'FUNC_SPATIAL', - 'POLYGON' => 'FUNC_SPATIAL', - 'MULTIPOINT' => 'FUNC_SPATIAL', - 'MULTILINESTRING' => 'FUNC_SPATIAL', - 'MULTIPOLYGON' => 'FUNC_SPATIAL', - 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', + 'CHAR' => 'FUNC_CHAR', + 'VARCHAR' => 'FUNC_CHAR', + 'TINYTEXT' => 'FUNC_CHAR', + 'TEXT' => 'FUNC_CHAR', + 'MEDIUMTEXT' => 'FUNC_CHAR', + 'LONGTEXT' => 'FUNC_CHAR', + 'BINARY' => 'FUNC_CHAR', + 'VARBINARY' => 'FUNC_CHAR', + 'TINYBLOB' => 'FUNC_CHAR', + 'MEDIUMBLOB' => 'FUNC_CHAR', + 'BLOB' => 'FUNC_CHAR', + 'LONGBLOB' => 'FUNC_CHAR', + 'ENUM' => '', + 'SET' => '', + + 'GEOMETRY' => 'FUNC_SPATIAL', + 'POINT' => 'FUNC_SPATIAL', + 'LINESTRING' => 'FUNC_SPATIAL', + 'POLYGON' => 'FUNC_SPATIAL', + 'MULTIPOINT' => 'FUNC_SPATIAL', + 'MULTILINESTRING' => 'FUNC_SPATIAL', + 'MULTIPOLYGON' => 'FUNC_SPATIAL', + 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL', ); @@ -3103,8 +3121,6 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW', 'pk_char36' => 'UUID', ); - - } // end if /** diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index bcafbb1..e6d4094 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -843,79 +843,6 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) return $fields; } -/** - * array PMA_DBI_get_column_values (string $database, string $table, string $column , mysql db link $link = null) - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param string $column name of the column to retrieve data from - * @param mixed $link mysql link resource - * @return array $field_values - */ - -function PMA_DBI_get_column_values($database, $table, $column, $link = null) -{ - $query = 'SELECT '; - for($i=0; $i< sizeof($column); $i++) - { - $query.= PMA_backquote($column[$i]); - if($i < (sizeof($column)-1)) - { - $query.= ', '; - } - } - $query.= ' FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table); - $field_values = PMA_DBI_fetch_result($query, null, null, $link); - - if (! is_array($field_values) || count($field_values) < 1) { - return false; - } - return $field_values; -} -/** - * array PMA_DBI_get_table_data (string $database, string $table, mysql db link $link = null) - * - * @param string $database name of database - * @param string $table name of table to retrieve columns from - * @param mixed $link mysql link resource - * @return array $result - */ - - function PMA_DBI_get_table_data($database, $table, $link = null) - { - - $result = PMA_DBI_fetch_result( - 'SELECT * FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table), - null,null, $link); - - if (! is_array($result) || count($result) < 1) { - return false; - } - return $result; - } - -/** -* array PMA_DBI_get_table_indexes($database, $table, $link = null) -* -* @param string $database name of database -* @param string $table name of the table whose indexes are to be retreived -* @param mixed $link mysql link resource -* @return array $indexes -*/ - -function PMA_DBI_get_table_indexes($database, $table, $link = null) -{ - - $indexes = PMA_DBI_fetch_result( - 'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table), - null, null, $link); - - if (! is_array($indexes) || count($indexes) < 1) { - return false; - } - return $indexes; -} - /** * returns value of given mysql server variable * diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8f276be..1d8aaa5 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -107,7 +107,7 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching $fields_num[$matching_table_index] = sizeof($fld); $matching_tables_keys[$matching_table_index] = $is_key; - $source_result_set = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); + $source_result_set = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $is_key, $src_link); $source_size = sizeof($source_result_set); $trg_fld_results = PMA_DBI_get_columns($trg_db, $matching_table[$matching_table_index], true, $trg_link); @@ -309,11 +309,11 @@ function PMA_dataDiffInTables($src_db, $trg_db, $src_link, $trg_link, &$matching function PMA_findDeleteRowsFromTargetTables(&$delete_array, $matching_table, $matching_table_index, $trg_keys, $src_keys, $trg_db, $trg_link,$src_db, $src_link) { if (isset($trg_keys[$matching_table_index])) { - $target_key_values = PMA_DBI_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); + $target_key_values = PMA_get_column_values($trg_db, $matching_table[$matching_table_index], $trg_keys[$matching_table_index], $trg_link); $target_row_size = sizeof($target_key_values); } if (isset($src_keys[$matching_table_index])) { - $source_key_values = PMA_DBI_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); + $source_key_values = PMA_get_column_values($src_db, $matching_table[$matching_table_index], $src_keys[$matching_table_index], $src_link); $source_size = sizeof($source_key_values); } $all_keys_match = 1; @@ -1115,7 +1115,7 @@ function PMA_removeColumnsFromTargetTable($trg_db, $trg_link, $matching_tables, * indexes to be altered in $alter_indexes_array and indexes to be removed from target table in $remove_indexes_array. * Only keyname and uniqueness characteristic of the indexes are altered. * @uses sizeof() -* @uses PMA_DBI_get_table_indexes() +* @uses PMA_get_table_indexes() * * @param $src_db name of source database * @param $trg_db name of target database @@ -1133,8 +1133,8 @@ function PMA_indexesDiffInTables($src_db, $trg_db, $src_link, $trg_link, $matchi &$alter_indexes_array, &$remove_indexes_array, $table_counter) { //Gets indexes information for source and target table - $source_indexes[$table_counter] = PMA_DBI_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); - $target_indexes[$table_counter] = PMA_DBI_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); + $source_indexes[$table_counter] = PMA_get_table_indexes($src_db, $matching_tables[$table_counter],$src_link); + $target_indexes[$table_counter] = PMA_get_table_indexes($trg_db, $matching_tables[$table_counter],$trg_link); for ($a = 0; $a < sizeof($source_indexes[$table_counter]); $a++) { $found = false; $z = 0; @@ -1338,4 +1338,56 @@ function PMA_syncDisplayBeginTableRow($odd_row) { echo '">'; return $odd_row; } + +/** + * array PMA_get_column_values (string $database, string $table, string $column , mysql db link $link = null) + * + * @param string $database name of database + * @param string $table name of table to retrieve columns from + * @param string $column name of the column to retrieve data from + * @param mixed $link mysql link resource + * @return array $field_values + */ + +function PMA_get_column_values($database, $table, $column, $link = null) +{ + $query = 'SELECT '; + for($i=0; $i< sizeof($column); $i++) + { + $query.= PMA_backquote($column[$i]); + if($i < (sizeof($column)-1)) + { + $query.= ', '; + } + } + $query.= ' FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table); + $field_values = PMA_DBI_fetch_result($query, null, null, $link); + + if (! is_array($field_values) || count($field_values) < 1) { + return false; + } + return $field_values; +} + +/** +* array PMA_get_table_indexes($database, $table, $link = null) +* +* @param string $database name of database +* @param string $table name of the table whose indexes are to be retreived +* @param mixed $link mysql link resource +* @return array $indexes +*/ + +function PMA_get_table_indexes($database, $table, $link = null) +{ + + $indexes = PMA_DBI_fetch_result( + 'SHOW INDEXES FROM ' .PMA_backquote($database) . '.' . PMA_backquote($table), + null, null, $link); + + if (! is_array($indexes) || count($indexes) < 1) { + return false; + } + return $indexes; +} ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6483-gd5dd8a2
by Piotr Przybylski 01 Jul '11

01 Jul '11

The branch, master has been updated via d5dd8a2d37f0fab931df449d4c6a744821a78afb (commit) via a28d43abf3948f44d036a009462d48cedf597b5b (commit) via 56d4b081a0020d03b988d322a39ac4a05d803384 (commit) via f53f5d76473c7d88ebd8b8a361ffb7a5d1643cb4 (commit) from 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 (commit) - Log ----------------------------------------------------------------- commit d5dd8a2d37f0fab931df449d4c6a744821a78afb Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:35:38 2011 +0200 Fix PMA_DBI_get_columns commit a28d43abf3948f44d036a009462d48cedf597b5b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:31:21 2011 +0200 Updated MySQL function list commit 56d4b081a0020d03b988d322a39ac4a05d803384 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 20:01:37 2011 +0200 Remove STDDEV_* and VAR_* Standard deviation and variance make no sense when called with one argument commit f53f5d76473c7d88ebd8b8a361ffb7a5d1643cb4 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Jul 1 18:33:23 2011 +0200 Changed background color for invalid inputs ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 67 +++++++++++++++++++++++++++---- libraries/database_interface.lib.php | 2 +- tbl_replace.php | 30 +++++++++----- themes/pmahomme/css/theme_right.css.php | 2 +- 4 files changed, 80 insertions(+), 21 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 1a478b7..0e0b9c8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2824,14 +2824,19 @@ if ($cfg['ShowFunctionFields']) { 'CHAR', 'CHAR_LENGTH', 'COMPRESS', + 'CONNECTION_ID', 'COS', 'COT', 'CRC32', 'CURDATE', 'CURRENT_USER', 'CURTIME', + 'DATABASE', 'DATE', 'DAYNAME', + 'DAYOFMONTH', + 'DAYOFWEEK', + 'DAYOFYEAR', 'DEGREES', 'DES_DECRYPT', 'DES_ENCRYPT', @@ -2841,35 +2846,53 @@ if ($cfg['ShowFunctionFields']) { 'FROM_DAYS', 'FROM_UNIXTIME', 'HEX', + 'HOUR', 'INET_ATON', 'INET_NTOA', + 'LAST_DAY', 'LENGTH', 'LN', + 'LOAD_FILE', 'LOG', 'LOG10', 'LOG2', 'LOWER', + 'LTRIM', 'MD5', + 'MICROSECOND', + 'MINUTE', + 'MONTH', + 'MONTHNAME', 'NOW', 'OCT', 'OLD_PASSWORD', 'ORD', 'PASSWORD', + 'PI', + 'QUARTER', + 'QUOTE', 'RADIANS', 'RAND', 'REVERSE', 'ROUND', + 'RTRIM', + 'SECOND', 'SEC_TO_TIME', 'SHA1', + 'SIGN', + 'SIN', 'SOUNDEX', 'SPACE', 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', + 'SYSDATE', 'TAN', + 'TIME', 'TIMESTAMP', 'TIME_TO_SEC', + 'TO_DAYS', + 'TRIM', 'UNCOMPRESS', + 'UNCOMPRESSED_LENGTH', 'UNHEX', 'UNIX_TIMESTAMP', 'UPPER', @@ -2878,9 +2901,12 @@ if ($cfg['ShowFunctionFields']) { 'UTC_TIME', 'UTC_TIMESTAMP', 'UUID', - 'VAR_POP', - 'VAR_SAMP', + 'VERSION', + 'WEEK', + 'WEEKDAY', + 'WEEKOFYEAR', 'YEAR', + 'YEARWEEK', ); /** @@ -2945,20 +2971,27 @@ if ($cfg['ShowFunctionFields']) { 'CHAR', 'CURRENT_USER', 'COMPRESS', + 'DATABASE', 'DAYNAME', 'DES_DECRYPT', 'DES_ENCRYPT', 'ENCRYPT', 'HEX', 'INET_NTOA', + 'LOAD_FILE', 'LOWER', + 'LTRIM', 'MD5', + 'MONTHNAME', 'OLD_PASSWORD', 'PASSWORD', + 'QUOTE', 'REVERSE', + 'RTRIM', 'SHA1', 'SOUNDEX', 'SPACE', + 'TRIM', 'UNCOMPRESS', 'UNHEX', 'UPPER', @@ -2972,8 +3005,11 @@ if ($cfg['ShowFunctionFields']) { 'DATE', 'FROM_DAYS', 'FROM_UNIXTIME', + 'LAST_DAY', 'NOW', 'SEC_TO_TIME', + 'SYSDATE', + 'TIME', 'TIMESTAMP', 'UTC_DATE', 'UTC_TIME', @@ -2991,31 +3027,46 @@ if ($cfg['ShowFunctionFields']) { 'BIT_COUNT', 'CEILING', 'CHAR_LENGTH', + 'CONNECTION_ID', 'COS', 'COT', 'CRC32', + 'DAYOFMONTH', + 'DAYOFWEEK', + 'DAYOFYEAR', 'DEGREES', 'EXP', 'FLOOR', + 'HOUR', 'INET_ATON', 'LENGTH', 'LN', 'LOG', 'LOG2', 'LOG10', + 'MICROSECOND', + 'MINUTE', + 'MONTH', 'OCT', 'ORD', + 'PI', + 'QUARTER', 'RADIANS', 'RAND', 'ROUND', + 'SECOND', + 'SIGN', + 'SIN', 'SQRT', - 'STDDEV_POP', - 'STDDEV_SAMP', 'TAN', + 'TO_DAYS', 'TIME_TO_SEC', + 'UNCOMPRESSED_LENGTH', 'UNIX_TIMESTAMP', - 'VAR_POP', - 'VAR_SAMP', + 'WEEK', + 'WEEKDAY', + 'WEEKOFYEAR', + 'YEARWEEK', ), 'FUNC_SPATIAL' => array( diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 50ae58b..bcafbb1 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -836,7 +836,7 @@ function PMA_DBI_get_columns($database, $table, $full = false, $link = null) $fields = PMA_DBI_fetch_result( 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table), - 'Field', ($full ? null : 'Field'), $link); + 'Field', null, $link); if (! is_array($fields) || count($fields) < 1) { return false; } diff --git a/tbl_replace.php b/tbl_replace.php index b0c71e6..ab20d29 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -130,18 +130,27 @@ if (isset($_REQUEST['where_clause'])) { $query = array(); $value_sets = array(); $func_no_param = array( - 'NOW', + 'CONNECTION_ID', + 'CURRENT_USER', 'CURDATE', 'CURTIME', + 'DATABASE', + 'LAST_INSERT_ID', + 'NOW', + 'PI', + 'RAND', + 'SYSDATE', + 'UNIX_TIMESTAMP', + 'USER', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', - 'UNIX_TIMESTAMP', - 'RAND', - 'USER', - 'LAST_INSERT_ID', 'UUID', - 'CURRENT_USER', + 'VERSION', +); +$func_optional_param = array( + 'RAND', + 'UNIX_TIMESTAMP', ); foreach ($loop_array as $rownumber => $where_clause) { @@ -225,16 +234,15 @@ foreach ($loop_array as $rownumber => $where_clause) { if (empty($me_funcs[$key])) { $cur_value = $val; - } elseif ('UNIX_TIMESTAMP' === $me_funcs[$key] && $val != "''") { - $cur_value = $me_funcs[$key] . '(' . $val . ')'; } elseif ('UUID' === $me_funcs[$key]) { /* This way user will know what UUID new row has */ $uuid = PMA_DBI_fetch_value('SELECT UUID()'); $cur_value = "'" . $uuid . "'"; - } elseif (in_array($me_funcs[$key], $func_no_param)) { - $cur_value = $me_funcs[$key] . '()'; - } else { + } elseif (!in_array($me_funcs[$key], $func_no_param) + || ($val != "''" && in_array($me_funcs[$key], $func_optional_param))) { $cur_value = $me_funcs[$key] . '(' . $val . ')'; + } else { + $cur_value = $me_funcs[$key] . '()'; } // i n s e r t diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ba5a926..272c17b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1729,7 +1729,7 @@ table#serverconnection_trg_local { */ input[type=text].invalid_value, .invalid_value { - background:#F00; + background:#FFCCCC; } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6479-g9fde1b5
by Madhura Jayaratne 01 Jul '11

01 Jul '11

The branch, master has been updated via 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 (commit) via 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) from 2279fd9c98ee43acba942d08c0dd3ca987748a1c (commit) - Log ----------------------------------------------------------------- commit 9fde1b5b23c00a1c9be499122f5d46d4d9b257f3 Merge: 2279fd9c98ee43acba942d08c0dd3ca987748a1c 4d1540cc1c8136040968bcfb3a4629aad2551b3a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Jul 1 23:00:57 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/export.js | 25 +++++++++++++++---------- libraries/display_export.lib.php | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9d455e..b5a0cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser +- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/export.js b/js/export.js index 1cf9de5..3fd3c00 100644 --- a/js/export.js +++ b/js/export.js @@ -89,18 +89,23 @@ $(document).ready(function() { /** * Toggles the disabling of the "save to file" options */ +function toggle_save_to_file() { + if($("#radio_dump_asfile:checked").length == 0) { + $("#ul_save_asfile > li").fadeTo('fast', 0.4); + $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); + $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); + } else { + $("#ul_save_asfile > li").fadeTo('fast', 1); + $("#ul_save_asfile > li > input").removeAttr('disabled'); + $("#ul_save_asfile > li> select").removeAttr('disabled'); + } +} + $(document).ready(function() { + toggle_save_to_file(); $("input[type='radio'][name='output_format']").change(function() { - if($("#radio_dump_asfile:checked").length == 0) { - $("#ul_save_asfile > li").fadeTo('fast', 0.4); - $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); - $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); - } else { - $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeAttr('disabled'); - $("#ul_save_asfile > li> select").removeAttr('disabled'); - } - }); + toggle_save_to_file(); + }); }); /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 9f10d77..e47b170 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) { <?php } ?> </ul> </li> - <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> + <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> </ul> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3-14-g4d1540c
by Madhura Jayaratne 01 Jul '11

01 Jul '11

The branch, QA_3_4 has been updated via 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) from 614639a5c5d94b9c693f7ec6e32c1a6e71a7e203 (commit) - Log ----------------------------------------------------------------- commit 4d1540cc1c8136040968bcfb3a4629aad2551b3a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Jul 1 22:58:35 2011 +0530 bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/export.js | 25 +++++++++++++++---------- libraries/display_export.lib.php | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71db213..4e47917 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser +- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/export.js b/js/export.js index 1cf9de5..3fd3c00 100644 --- a/js/export.js +++ b/js/export.js @@ -89,18 +89,23 @@ $(document).ready(function() { /** * Toggles the disabling of the "save to file" options */ +function toggle_save_to_file() { + if($("#radio_dump_asfile:checked").length == 0) { + $("#ul_save_asfile > li").fadeTo('fast', 0.4); + $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); + $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); + } else { + $("#ul_save_asfile > li").fadeTo('fast', 1); + $("#ul_save_asfile > li > input").removeAttr('disabled'); + $("#ul_save_asfile > li> select").removeAttr('disabled'); + } +} + $(document).ready(function() { + toggle_save_to_file(); $("input[type='radio'][name='output_format']").change(function() { - if($("#radio_dump_asfile:checked").length == 0) { - $("#ul_save_asfile > li").fadeTo('fast', 0.4); - $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); - $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); - } else { - $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeAttr('disabled'); - $("#ul_save_asfile > li> select").removeAttr('disabled'); - } - }); + toggle_save_to_file(); + }); }); /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 87c3a8e..3bc9c7f 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -325,7 +325,7 @@ if(isset($_GET['sql_query'])) { <?php } ?> </ul> </li> - <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> + <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> </ul> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7
by Michal Čihař 01 Jul '11

01 Jul '11

The branch, master has been updated via 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7 (commit) from 47f8b5b5dd42059dd6e0a723355ba7532121f5a0 (commit) - Log ----------------------------------------------------------------- commit 381d6b4d2f3d894e4ca6ceed4c4ca0ae6c9f95f7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jul 1 16:20:07 2011 +0200 Remove adbard ----------------------------------------------------------------------- Summary of changes: theme/index.html.tmpl | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl index 66b1035..f1ceebd 100644 --- a/theme/index.html.tmpl +++ b/theme/index.html.tmpl @@ -170,17 +170,6 @@ new TWTR.Widget({ <a href="http://www.intertwingly.net/code/venus/"><img class="button" src="images/venus.png" width="80" height="15" alt="[Venus]"></a> </p> -<h3>Advertisement</h3> -<p> - -<script type='text/javascript'> - var ab_h = '22e342dc6a6a99267a46f18fc5dcecf1'; - var ab_s = 'e837f957b30be6f80f9c06167253766a'; -</script> -<script type='text/javascript' src='http://cdn1.adbard.net/js/ab2.js'></script> - -</p> - <h3>Planetarium</h3> <p> <ul> hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6477-g2279fd9
by Michal Čihař 01 Jul '11

01 Jul '11

The branch, master has been updated via 2279fd9c98ee43acba942d08c0dd3ca987748a1c (commit) via e35bd7e265f6e3645aabebb5ca3e35aadd7c0466 (commit) via 71e32b614618c46c3094f17bcc566959ba3d3db8 (commit) via 246367f86e6dfc929ce36e86af87562b09b10eb7 (commit) via 0a7a170413058960ae97429aab458b5b0cf22e24 (commit) via 2fa65ecb9f16540b466fec8bd8bbec6638ea16ad (commit) via 8a1080e6339c6cc7a587861c32375d43e0aaf152 (commit) via 085e3ae448afd505779e248a273272fb7859d530 (commit) via 0d5c862daeae6e2d72f4ca9cbdb92d68c44a2426 (commit) via edcfcfb4bcda7e5889aaba0e90336830ada2ccb3 (commit) via 77d6daf4f8bd12f6a51c33cd32172deee248667c (commit) via 204007d24825d12d6f90cce16815daa2b7284d36 (commit) via d0ddec83e479f5f88fabaf8f79fd5518e8c3da1f (commit) via 33b1a5f354e8068fdcc828ca5023abd43f231bff (commit) from cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea (commit) - Log ----------------------------------------------------------------- commit 2279fd9c98ee43acba942d08c0dd3ca987748a1c Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:48:41 2011 +0200 Translation update done using Pootle. commit e35bd7e265f6e3645aabebb5ca3e35aadd7c0466 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:37:17 2011 +0200 Translation update done using Pootle. commit 71e32b614618c46c3094f17bcc566959ba3d3db8 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:24:34 2011 +0200 Translation update done using Pootle. commit 246367f86e6dfc929ce36e86af87562b09b10eb7 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:22:08 2011 +0200 Translation update done using Pootle. commit 0a7a170413058960ae97429aab458b5b0cf22e24 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:19:53 2011 +0200 Translation update done using Pootle. commit 2fa65ecb9f16540b466fec8bd8bbec6638ea16ad Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:19:36 2011 +0200 Translation update done using Pootle. commit 8a1080e6339c6cc7a587861c32375d43e0aaf152 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:17:29 2011 +0200 Translation update done using Pootle. commit 085e3ae448afd505779e248a273272fb7859d530 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:12:51 2011 +0200 Translation update done using Pootle. commit 0d5c862daeae6e2d72f4ca9cbdb92d68c44a2426 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:42 2011 +0200 Translation update done using Pootle. commit edcfcfb4bcda7e5889aaba0e90336830ada2ccb3 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:19 2011 +0200 Translation update done using Pootle. commit 77d6daf4f8bd12f6a51c33cd32172deee248667c Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:10:16 2011 +0200 Translation update done using Pootle. commit 204007d24825d12d6f90cce16815daa2b7284d36 Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:09:57 2011 +0200 Translation update done using Pootle. commit d0ddec83e479f5f88fabaf8f79fd5518e8c3da1f Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:09:41 2011 +0200 Translation update done using Pootle. commit 33b1a5f354e8068fdcc828ca5023abd43f231bff Author: wiltave <wiltave(a)gmail.com> Date: Thu Jun 30 23:05:38 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b28f6e..cf21f9a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ 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-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-15 13:55+0200\n" -"Last-Translator: Jose Ivan Bezerra Vilarouca Filho <joseivan(a)lavid.ufpb.br>\n" +"PO-Revision-Date: 2011-06-30 23:48+0200\n" +"Last-Translator: <wiltave(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -412,7 +412,7 @@ msgstr[1] "%s tabelas" #: db_qbe.php:41 msgid "You have to choose at least one column to display" -msgstr "Deve escolher pelo menos uma coluna para exibir" +msgstr "Você deve escolher pelo menos uma coluna para exibir" #: db_qbe.php:186 msgid "Switch to" @@ -514,10 +514,10 @@ msgstr[0] "" msgstr[1] "" #: db_routines.php:167 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "Permitir executar stored routines." +msgstr "Resultados da execução da rotina %s" #: db_routines.php:187 libraries/import.lib.php:153 sql.php:678 #: tbl_change.php:180 tbl_get_field.php:34 @@ -7212,7 +7212,7 @@ msgstr "Nenhum" #: libraries/tbl_properties.inc.php:378 msgid "As defined:" -msgstr "" +msgstr "Como definido:" #: libraries/tbl_properties.inc.php:497 tbl_structure.php:155 #: tbl_structure.php:160 tbl_structure.php:605 @@ -7255,9 +7255,8 @@ msgid "PARTITION definition" msgstr "Definição da PARTIÇÃO" #: libraries/tbl_properties.inc.php:776 -#, fuzzy msgid "+ Add a value" -msgstr "Adicionar novo usuário" +msgstr "+ Adicionar um valor" #: libraries/transformations/application_octetstream__download.inc.php:9 #, fuzzy @@ -10449,7 +10448,7 @@ msgstr "" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" -msgstr "Navegador distingue valores" +msgstr "Procurar valores distintos" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add primary key" @@ -10514,10 +10513,9 @@ msgid "Propose table structure" msgstr "Propor estrutura da tabela" #: tbl_structure.php:676 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add column" -msgstr "Adicionar %s campo(s)" +msgstr "Adicionar coluna" #: tbl_structure.php:690 msgid "At End of Table" @@ -10619,7 +10617,7 @@ msgstr "Excluir dados de monitoramento desta tabela" #, fuzzy #| msgid "No databases" msgid "No data" -msgstr "Sem bases" +msgstr "Não existem dados" #: tbl_tracking.php:453 tbl_tracking.php:510 msgid "Date" @@ -10664,7 +10662,7 @@ msgid "Version" msgstr "Versão" #: tbl_tracking.php:692 -#, fuzzy, php-format +#, php-format msgid "Deactivate tracking for %s.%s" msgstr "Desativar rastreamento para %s.%s" @@ -10687,12 +10685,14 @@ msgid "Create version %s of %s.%s" msgstr "Criar versão %s de %s.%s" #: tbl_tracking.php:724 +#, fuzzy msgid "Track these data definition statements:" -msgstr "" +msgstr "Rastrear estas instruções de definição de dados:" #: tbl_tracking.php:732 +#, fuzzy msgid "Track these data manipulation statements:" -msgstr "" +msgstr "Rastrear estas instruções de manipulação de dados:" #: tbl_tracking.php:740 msgid "Create version" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 1e1ed41354c775cbe25e3b708c549c78e4bf3b95
by Herman van Rink 30 Jun '11

30 Jun '11

The branch, master has been updated via 1e1ed41354c775cbe25e3b708c549c78e4bf3b95 (commit) from 706e5cc6875189e28a09b331a366e26d725846ad (commit) - Log ----------------------------------------------------------------- commit 1e1ed41354c775cbe25e3b708c549c78e4bf3b95 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Jun 30 22:38:08 2011 +0200 Added trailing period to announcement_summary fields ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-1 | 2 +- templates/security/PMASA-2011-3 | 2 +- templates/security/PMASA-2011-4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/security/PMASA-2011-1 b/templates/security/PMASA-2011-1 index b43ae07..0350dd5 100644 --- a/templates/security/PMASA-2011-1 +++ b/templates/security/PMASA-2011-1 @@ -9,7 +9,7 @@ PMASA-2011-1 </py:def> <py:def function="announcement_summary"> -Path disclosure when some files have been removed +Path disclosure when some files have been removed. </py:def> <py:def function="announcement_description"> diff --git a/templates/security/PMASA-2011-3 b/templates/security/PMASA-2011-3 index 215554e..d48bad0 100644 --- a/templates/security/PMASA-2011-3 +++ b/templates/security/PMASA-2011-3 @@ -11,7 +11,7 @@ PMASA-2011-3 </py:def> <py:def function="announcement_summary"> -XSS vulnerability on Tracking page +XSS vulnerability on Tracking page. </py:def> <py:def function="announcement_description"> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4 index 7909027..8ea0026 100644 --- a/templates/security/PMASA-2011-4 +++ b/templates/security/PMASA-2011-4 @@ -11,7 +11,7 @@ PMASA-2011-4 </py:def> <py:def function="announcement_summary"> -URL redirection to untrusted site +URL redirection to untrusted site. </py:def> <py:def function="announcement_description"> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb
by Michal Čihař 30 Jun '11

30 Jun '11

The branch, master has been updated via 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb (commit) via 1c843b57f8395f2b19ffc154963bc15f52ffbae8 (commit) via 565956aee0a8148bd0f22717baec00e9454276bc (commit) via ae26ae730a335abab1a22ec00d3954e1d79144b1 (commit) via 07384919d51327a998dcd8e2cf99e688708c3048 (commit) via 054220cf32f5d1aaa892cb9e6501fb50305fc408 (commit) via 957e90b5b687248727d55edc80eb7385488587d0 (commit) via 622f96978313cd3adc54b8c08679515e86c696d4 (commit) via 8b3e491b7356b5c7b50b5b96603cd6da664dd89f (commit) via 0d1cb8d58d7c08a1193af7c867b19ca25e460738 (commit) via 5e5705f626891324d659b8b00e73ef55482bc02a (commit) from 54729ef4cb20ae59c804eef595c75057dd170e90 (commit) - Log ----------------------------------------------------------------- commit 0c2863c91c919d7def3b7f2cd7b423e14d7ad2eb Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jun 30 12:00:52 2011 +0200 Update commit 1c843b57f8395f2b19ffc154963bc15f52ffbae8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jun 28 18:30:19 2011 +0200 Translation update done using Pootle. commit 565956aee0a8148bd0f22717baec00e9454276bc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jun 28 18:29:40 2011 +0200 Translation update done using Pootle. commit ae26ae730a335abab1a22ec00d3954e1d79144b1 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Tue Jun 28 16:46:23 2011 +0200 Translation update done using Pootle. commit 07384919d51327a998dcd8e2cf99e688708c3048 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Tue Jun 28 16:46:15 2011 +0200 Translation update done using Pootle. commit 054220cf32f5d1aaa892cb9e6501fb50305fc408 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Tue Jun 28 16:46:09 2011 +0200 Translation update done using Pootle. commit 957e90b5b687248727d55edc80eb7385488587d0 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Tue Jun 28 16:46:00 2011 +0200 Translation update done using Pootle. commit 622f96978313cd3adc54b8c08679515e86c696d4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 27 19:45:09 2011 +0200 Translation update done using Pootle. commit 8b3e491b7356b5c7b50b5b96603cd6da664dd89f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 27 19:44:06 2011 +0200 Translation update done using Pootle. commit 0d1cb8d58d7c08a1193af7c867b19ca25e460738 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 27 19:42:22 2011 +0200 Translation update done using Pootle. commit 5e5705f626891324d659b8b00e73ef55482bc02a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jun 27 19:42:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 19 +++++++++++-------- output/tr/Documentation.html | 6 ++++-- po/en_GB.po | 12 +++++++++--- po/es.po | 14 ++++++++++++-- po/tr.po | 6 +++++- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index f878e4b..4c50256 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -156,8 +156,9 @@ o enlaces de descarga title="Frequently Asked Questions">FAQ</abbr> 3.6)</a></li> <li>usar mysqli, la extensión mejorada de MySQL <a href="#faq1_17"> (vea <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17)</a></li> - <li>create, edit, call, export and drop stored procedures and functions</li> - <li>create, edit, export and drop events and triggers</li> + <li>crear, editar, ejecutar y eliminar funciones y procedimientos almacenados +(«stored procedures»)</li> + <li>crear, editar, exportar y eliminar eventos y disparadores</li> <li>comunicarse en <a href="http://www.phpmyadmin.net/home_page/translations.php">62 lenguajes distintos</a> @@ -5585,9 +5586,10 @@ una forma de comunicación entre procesos.</li> <li><a href="http://www.wikipedia.org/wiki/Secure_Sockets_Layer">SSL (Secure Sockets Layer)</a> - un protocolo criptográfico que provee comunicaciones seguras en internet.</li> - <li><a href="http://en.wikipedia.org/wiki/Stored_procedure">Stored procedure</a> -- a subroutine available to applications accessing a relational database -system</li> + <li><a +href="http://es.wikipedia.org/wiki/Procedimiento_almacenado">Procedimiento +almacenado «stored procedure»</a> - una subrutina disponible para las +aplicaciones que acceden a un sistema de bases de datos relacionales</li> <li><a href="http://www.wikipedia.org/wiki/SQL">SQL</a> - lenguaje estructurado de consultas</li> <li><a href="http://www.wikipedia.org/wiki/Table_%28database%29">tabla</a> - @@ -5601,9 +5603,10 @@ tipo de formato de archivación de archivos.</li> <li><a href="http://www.wikipedia.org/wiki/TCP">TCP (Transmission Control Protocol)</a> - uno de los protocolos clave en el conjunto de protocolos de internet.</li> - <li><a href="http://en.wikipedia.org/wiki/Database_trigger">trigger</a> - a -procedural code that is automatically executed in response to certain events -on a particular table or view in a database</li> + <li><a +href="http://es.wikipedia.org/wiki/Trigger_(base_de_datos)">disparador</a> - +un código procedural que es ejecutado automáticamente en respuesta a ciertos +eventos en una tabla o vista particular de una base de datos</li> <li><a href="http://www.acko.net/node/56">UFPDF</a> - extensión Unicode/UTF-8 para FPDF</li> <li><a href="http://www.wikipedia.org/wiki/URL">URL (Uniform Resource diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 71bc879..7df02a8 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -162,8 +162,10 @@ href="#faq3_6">(<abbr title="Sıkça Sorulan Sorular">SSS</abbr> 3.6'ya bakın)</a></li> <li>mysqli, gelişmiş MySQL uzantılarını destekleyebilir <a href="#faq1_17"> (<abbr title="Sıkça Sorulan Sorular">SSS</abbr> 1.17'ye bakın)</a></li> - <li>create, edit, call, export and drop stored procedures and functions</li> - <li>create, edit, export and drop events and triggers</li> + <li>depolanan işlemleri ve işlevleri oluşturabilir, düzenleyebilir, çağırabilir, +dışa aktarabilir ve kaldırabilir</li> + <li>olayları ve tetikleyicileri oluşturabilir, düzenleyebilir, çağırabilir, dışa +aktarabilir ve kaldırabilir</li> <li><a href="http://www.phpmyadmin.net/home_page/translations.php">62 farklı dilde</a> iletişim kurabilir </li> diff --git a/po/en_GB.po b/po/en_GB.po index f9144dc..01a71b1 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lis\n"age/translations.php">62 farklır, dışa3]��+��"qR�+��R�+��xR�+��S�+�s�+�ho�+��+��`��R�+6 ��!�!��x$o�+��"qR�+�R�+��pR�+O��+�xR�+��+��+��+��S�+x$o�+��`��R�+�!�!��N�+p��"qR�+�R�+��pR�+O��@��8��s�+�p��xR�+��S�+p��@��R�+GHIJKMNOP��H�%�+��"qR�+�R�+��0��+�xR�+0o�+��+��+��+��+��S�+H�%�+��P��R�+8�%�+��R�+(�%�+��R�+�%�+��R�+ ��+�xR�+��+`��(�+�wR�+��+��y(�+�wR�+��+��Z(�+�wR�+��+0o�+��+��+�4o�+��+��+��S�+��+0��R�+#%')*-.035678:<=��p[��+P��"qR�+8?o�+�xR�+�4o�+�9o�+��S�+cf��+��p[��+P�� R�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�2��+��F@6�+F@6�+?��+��+�wR�+�s�+��B@6�+Г��O��t�+��B@6�+��R�ts.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:29+0300\n" -"PO-Revision-Date: 2011-06-23 00:03+0200\n" +"PO-Revision-Date: 2011-06-28 16:46+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -396,12 +396,12 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:140 msgid "create, edit, call, export and drop stored procedures and functions" -msgstr "" +msgstr "create, edit, call, export and drop stored procedures and functions" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:141 msgid "create, edit, export and drop events and triggers" -msgstr "" +msgstr "create, edit, export and drop events and triggers" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -13969,6 +13969,9 @@ msgid "" "a> - a subroutine available to applications accessing a relational database " "system" msgstr "" +"<a href=\"http://en.wikipedia.org/wiki/Stored_procedure\">Stored procedure</a> " +"- a subroutine available to applications accessing a relational database " +"system" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5159 @@ -14022,6 +14025,9 @@ msgid "" "procedural code that is automatically executed in response to certain events " "on a particular table or view in a database" msgstr "" +"<a href=\"http://en.wikipedia.org/wiki/Database_trigger\">trigger</a> - a " +"procedural code that is automatically executed in response to certain events " +"on a particular table or view in a database" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5173 diff --git a/po/es.po b/po/es.po index a764856..a5f1e5e 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:28+0300\n" -"PO-Revision-Date: 2011-06-21 15:46+0200\n" +"PO-Revision-Date: 2011-06-27 19:45+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -405,11 +405,13 @@ msgstr "" #: orig-docs/Documentation.html:140 msgid "create, edit, call, export and drop stored procedures and functions" msgstr "" +"crear, editar, ejecutar y eliminar funciones y procedimientos almacenados " +"(«stored procedures»)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:141 msgid "create, edit, export and drop events and triggers" -msgstr "" +msgstr "crear, editar, exportar y eliminar eventos y disparadores" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 @@ -14325,6 +14327,10 @@ msgid "" "a> - a subroutine available to applications accessing a relational database " "system" msgstr "" +"<a " +"href=\"http://es.wikipedia.org/wiki/Procedimiento_almacenado\">Procedimiento " +"almacenado «stored procedure»</a> - una subrutina disponible para las " +"aplicaciones que acceden a un sistema de bases de datos relacionales" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5159 @@ -14380,6 +14386,10 @@ msgid "" "procedural code that is automatically executed in response to certain events " "on a particular table or view in a database" msgstr "" +"<a " +"href=\"http://es.wikipedia.org/wiki/Trigger_(base_de_datos)\">disparador</a> - " +"un código procedural que es ejecutado automáticamente en respuesta a " +"ciertos eventos en una tabla o vista particular de una base de datos" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5173 diff --git a/po/tr.po b/po/tr.po index 5308187..0e9acb7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:28+0300\n" -"PO-Revision-Date: 2011-06-26 12:18+0200\n" +"PO-Revision-Date: 2011-06-28 18:30+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -407,11 +407,15 @@ msgstr "" #: orig-docs/Documentation.html:140 msgid "create, edit, call, export and drop stored procedures and functions" msgstr "" +"depolanan işlemleri ve işlevleri oluşturabilir, düzenleyebilir, çağırabilir, " +"dışa aktarabilir ve kaldırabilir" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:141 msgid "create, edit, export and drop events and triggers" msgstr "" +"olayları ve tetikleyicileri oluşturabilir, düzenleyebilir, çağırabilir, dışa " +"aktarabilir ve kaldırabilir" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:142 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6463-gcbf00bc
by Piotr Przybylski 29 Jun '11

29 Jun '11

The branch, master has been updated via cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea (commit) via 00946276e7d8f2929d0fb5f4cc33f2e9b34da195 (commit) from 63e30cd106e22d85b383430390f8b33cf144002f (commit) - Log ----------------------------------------------------------------- commit cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Jun 30 00:49:08 2011 +0200 Remove unused variables commit 00946276e7d8f2929d0fb5f4cc33f2e9b34da195 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jun 29 21:30:54 2011 +0200 Fix column ordering when query has LIMIT, PROCEDURE, FOR UPDATE or LOCK IN SHARE MODE and contains newline ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- libraries/replication_gui.lib.php | 2 +- server_privileges.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 8fd73de..3a39bc6 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -876,7 +876,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />'; } - if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) { + if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $regs3)) { $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2]; } else { $sorted_sql_query = $unsorted_sql_query . $sort_order; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 1c48982..ac80467 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -206,7 +206,7 @@ function PMA_replication_get_username_hostname_length() { $fields_info = PMA_DBI_get_columns('mysql', 'user'); $username_length = 16; $hostname_length = 41; - foreach ($fields_info as $key => $val) { + foreach ($fields_info as $val) { if ($val['Field'] == 'User') { strtok($val['Type'], '()'); $v = strtok('()'); diff --git a/server_privileges.php b/server_privileges.php index 7cd802f..0e75d39 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -666,7 +666,7 @@ function PMA_displayLoginInformationFields($mode = 'new') $fields_info = PMA_DBI_get_columns('mysql', 'user', true); $username_length = 16; $hostname_length = 41; - foreach ($fields_info as $key => $val) { + foreach ($fields_info as $val) { if ($val['Field'] == 'User') { strtok($val['Type'], '()'); $v = strtok('()'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6461-g63e30cd
by Michal Čihař 29 Jun '11

29 Jun '11

The branch, master has been updated via 63e30cd106e22d85b383430390f8b33cf144002f (commit) via 878029de6b79042894c4cdb72f996560deb6e444 (commit) via 30376a4124d025489958e1905225f745e6eb3f1f (commit) via 693fc0436369fff7e2ad5c4e3c95fa212b60e364 (commit) via 478665dcde76e5e17f8d45850920c086bfd7b3c1 (commit) via 2ce3b7ec2ac95b1554b1d2cf243c6b45e8670400 (commit) via 550b1b57d8bd91934f7951a5f9864fdaf2f0a1cb (commit) via eabe293f6733c57892ad4e54f3eb7c3989f62ecb (commit) via aa7ac858dce3150001c1c3f82c6ac9e55d1b506a (commit) via 296b918ff602a47daceccc6391d8224b4eace2e9 (commit) via 1eec8af3ad344037af6988068797c746f443010b (commit) via 5709d0a57fa412ebc71e2b82b02558205023ea05 (commit) via 10c208dd6ecc577cfb67dd43390c22fb4063a8f1 (commit) via 95043887e28b9382e0d22d15f84977d9cb372d50 (commit) via 69f53096407d3c8135198ec24c92f843ed3ca5fd (commit) via 2782655e43df4b7e0d11657dfb9d3ad1745ac17d (commit) via 2ec9bff0b68f9e8b3a00aeb055098d3686df5444 (commit) via ad081385ae714390603e89d8561ed8f5db6f9530 (commit) via c8c5a509cf2e5d41ac2dac7d947646849493e498 (commit) via ea12c19819c80b40b49a092002a7e8dd7e68ee79 (commit) via b512f2b1cc4cac63e82b5a0638a25814495f5f93 (commit) via 509d945a4d6e6b4a7e6e94dc7ba5f4f9079501d7 (commit) via da1615b10766f644ec05f3d939b737a00fd4a5af (commit) via cf6739be590684e2c3aa3bc9cbe70d297157ef5e (commit) via 6573a13fd566a4fcaadcca91c35fc9d9f29395ac (commit) via 3b79006557ad8a00ba381ee862c0011fed8c7d7c (commit) via 2c7beeb25b67d591ab91f28a83a9774d52581216 (commit) via 2c129be83be4f9bdea0072489b67c6fd1104c4fa (commit) via 45b8dc669a351fd663b5360c1a1d0af5bab2376a (commit) via 7c78da51ba6a4bea75e4069b0c8e434628094578 (commit) via 7a13cb863fd008d27b7773225698b49bf86d8bcb (commit) via 5f79166c1eaf15ff68de029229788636d14163b9 (commit) via a80f3445c5a1df35e7dab938ea6cd5b130aa6e69 (commit) via 9d0dad79ebbc89f13d28d44f8ecb65cb89f59a01 (commit) via a1f64a741ceba4413003f3ab591d16d15852210c (commit) via 656f27ce77fbe0092db8d4ea548112a18dd25c67 (commit) via 390f6a60018e861d6be9f896dd67dcc9030c6ee9 (commit) via 882ffb792fa4f426087f0021fd8c0b8fd0ab88be (commit) via e2a96244eeb1f34510c1bf2bd8ee17623d674ff0 (commit) via bb88644bb34ff4b1f2871b1b5a304b891beb16ad (commit) via 4ae6b713832482b44c8b41f129a226b6ec3dfec2 (commit) via 01f71cd79030963b428439567027637ebcbafb3f (commit) via b422f0b80aad3bea45e4af053571bb49464efe32 (commit) via 0ae3f67b235bb89ecbbecf87a3bf05b6aeb94b69 (commit) via bf06a6b2db0756a82a668e8c6ce2a0b85ad42b7d (commit) via c85b658636f4860bea7fbff5507982f9f585704c (commit) via f016b6efcc6b4f12feb83c095120c3f15f780a2c (commit) via 886756fd701c4844e9b34cb754e633883eb9b7ba (commit) via 09cad73d0271ff7957020cdadb5e86b127ab5d7b (commit) via 08c0a52c9e92ea698c91d388b4f8ff4d3a854e3f (commit) via 1d9725203d07d6b389d9742d65e6ca0ca6712955 (commit) via 019ebb1f874fb4b98de716f158dc04d6ea0737ff (commit) via 7dfddddd715bf40642a5902886ad8b896b96dd8b (commit) from 46c40093d7f21906e8c92cf1c5de7f1f2936ff35 (commit) - Log ----------------------------------------------------------------- commit 63e30cd106e22d85b383430390f8b33cf144002f Author: Michal Čihař <michal(a)cihar.com> Date: Thu Jun 30 00:03:20 2011 +0200 Fix format string commit 878029de6b79042894c4cdb72f996560deb6e444 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:12:32 2011 +0200 Translation update done using Pootle. commit 30376a4124d025489958e1905225f745e6eb3f1f Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:49 2011 +0200 Translation update done using Pootle. commit 693fc0436369fff7e2ad5c4e3c95fa212b60e364 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:43 2011 +0200 Translation update done using Pootle. commit 478665dcde76e5e17f8d45850920c086bfd7b3c1 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:32 2011 +0200 Translation update done using Pootle. commit 2ce3b7ec2ac95b1554b1d2cf243c6b45e8670400 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:28 2011 +0200 Translation update done using Pootle. commit 550b1b57d8bd91934f7951a5f9864fdaf2f0a1cb Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:23 2011 +0200 Translation update done using Pootle. commit eabe293f6733c57892ad4e54f3eb7c3989f62ecb Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:20 2011 +0200 Translation update done using Pootle. commit aa7ac858dce3150001c1c3f82c6ac9e55d1b506a Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:15 2011 +0200 Translation update done using Pootle. commit 296b918ff602a47daceccc6391d8224b4eace2e9 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:11 2011 +0200 Translation update done using Pootle. commit 1eec8af3ad344037af6988068797c746f443010b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:11:08 2011 +0200 Translation update done using Pootle. commit 5709d0a57fa412ebc71e2b82b02558205023ea05 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:10:56 2011 +0200 Translation update done using Pootle. commit 10c208dd6ecc577cfb67dd43390c22fb4063a8f1 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:10:51 2011 +0200 Translation update done using Pootle. commit 95043887e28b9382e0d22d15f84977d9cb372d50 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:10:43 2011 +0200 Translation update done using Pootle. commit 69f53096407d3c8135198ec24c92f843ed3ca5fd Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:10:26 2011 +0200 Translation update done using Pootle. commit 2782655e43df4b7e0d11657dfb9d3ad1745ac17d Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:08:54 2011 +0200 Translation update done using Pootle. commit 2ec9bff0b68f9e8b3a00aeb055098d3686df5444 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:50 2011 +0200 Translation update done using Pootle. commit ad081385ae714390603e89d8561ed8f5db6f9530 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:35 2011 +0200 Translation update done using Pootle. commit c8c5a509cf2e5d41ac2dac7d947646849493e498 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:30 2011 +0200 Translation update done using Pootle. commit ea12c19819c80b40b49a092002a7e8dd7e68ee79 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:25 2011 +0200 Translation update done using Pootle. commit b512f2b1cc4cac63e82b5a0638a25814495f5f93 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:21 2011 +0200 Translation update done using Pootle. commit 509d945a4d6e6b4a7e6e94dc7ba5f4f9079501d7 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:07:17 2011 +0200 Translation update done using Pootle. commit da1615b10766f644ec05f3d939b737a00fd4a5af Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:06:34 2011 +0200 Translation update done using Pootle. commit cf6739be590684e2c3aa3bc9cbe70d297157ef5e Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:06:15 2011 +0200 Translation update done using Pootle. commit 6573a13fd566a4fcaadcca91c35fc9d9f29395ac Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:06:11 2011 +0200 Translation update done using Pootle. commit 3b79006557ad8a00ba381ee862c0011fed8c7d7c Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:06:07 2011 +0200 Translation update done using Pootle. commit 2c7beeb25b67d591ab91f28a83a9774d52581216 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:05:57 2011 +0200 Translation update done using Pootle. commit 2c129be83be4f9bdea0072489b67c6fd1104c4fa Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:05:18 2011 +0200 Translation update done using Pootle. commit 45b8dc669a351fd663b5360c1a1d0af5bab2376a Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:56 2011 +0200 Translation update done using Pootle. commit 7c78da51ba6a4bea75e4069b0c8e434628094578 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:50 2011 +0200 Translation update done using Pootle. commit 7a13cb863fd008d27b7773225698b49bf86d8bcb Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:44 2011 +0200 Translation update done using Pootle. commit 5f79166c1eaf15ff68de029229788636d14163b9 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:39 2011 +0200 Translation update done using Pootle. commit a80f3445c5a1df35e7dab938ea6cd5b130aa6e69 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:34 2011 +0200 Translation update done using Pootle. commit 9d0dad79ebbc89f13d28d44f8ecb65cb89f59a01 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:27 2011 +0200 Translation update done using Pootle. commit a1f64a741ceba4413003f3ab591d16d15852210c Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:22 2011 +0200 Translation update done using Pootle. commit 656f27ce77fbe0092db8d4ea548112a18dd25c67 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:13 2011 +0200 Translation update done using Pootle. commit 390f6a60018e861d6be9f896dd67dcc9030c6ee9 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:08 2011 +0200 Translation update done using Pootle. commit 882ffb792fa4f426087f0021fd8c0b8fd0ab88be Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 20:00:02 2011 +0200 Translation update done using Pootle. commit e2a96244eeb1f34510c1bf2bd8ee17623d674ff0 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:59:41 2011 +0200 Translation update done using Pootle. commit bb88644bb34ff4b1f2871b1b5a304b891beb16ad Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:59:34 2011 +0200 Translation update done using Pootle. commit 4ae6b713832482b44c8b41f129a226b6ec3dfec2 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:59:17 2011 +0200 Translation update done using Pootle. commit 01f71cd79030963b428439567027637ebcbafb3f Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:59:12 2011 +0200 Translation update done using Pootle. commit b422f0b80aad3bea45e4af053571bb49464efe32 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:59:02 2011 +0200 Translation update done using Pootle. commit 0ae3f67b235bb89ecbbecf87a3bf05b6aeb94b69 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:58:54 2011 +0200 Translation update done using Pootle. commit bf06a6b2db0756a82a668e8c6ce2a0b85ad42b7d Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:58:36 2011 +0200 Translation update done using Pootle. commit c85b658636f4860bea7fbff5507982f9f585704c Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:58:26 2011 +0200 Translation update done using Pootle. commit f016b6efcc6b4f12feb83c095120c3f15f780a2c Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:57:52 2011 +0200 Translation update done using Pootle. commit 886756fd701c4844e9b34cb754e633883eb9b7ba Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:57:41 2011 +0200 Translation update done using Pootle. commit 09cad73d0271ff7957020cdadb5e86b127ab5d7b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:57:36 2011 +0200 Translation update done using Pootle. commit 08c0a52c9e92ea698c91d388b4f8ff4d3a854e3f Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:57:19 2011 +0200 Translation update done using Pootle. commit 1d9725203d07d6b389d9742d65e6ca0ca6712955 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:56:54 2011 +0200 Translation update done using Pootle. commit 019ebb1f874fb4b98de716f158dc04d6ea0737ff Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:55:36 2011 +0200 Translation update done using Pootle. commit 7dfddddd715bf40642a5902886ad8b896b96dd8b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Wed Jun 29 19:55:32 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/br.po | 104 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 52 insertions(+), 52 deletions(-) diff --git a/po/br.po b/po/br.po index c48d96a..c9cef09 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,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-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-29 13:00+0200\n" +"PO-Revision-Date: 2011-06-29 20:12+0200\n" "Last-Translator: <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -2127,26 +2127,26 @@ msgstr "Meneger servijer faziek : %s" #: libraries/common.inc.php:637 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "" +msgstr "Anv ostiz direizh evit ar servijer %1$s. Gwiriit ar c'hefluniadur." #: libraries/common.inc.php:646 libraries/config/messages.inc.php:495 #: libraries/header.inc.php:129 main.php:161 server_synchronize.php:1170 msgid "Server" -msgstr "" +msgstr "Servijer" #: libraries/common.inc.php:825 msgid "Invalid authentication method set in configuration:" -msgstr "" +msgstr "Termenet ez eus bet c'hefluniadur un hentenn dilesa direizh." #: libraries/common.inc.php:928 #, php-format msgid "You should upgrade to %s %s or later." -msgstr "" +msgstr "Ret e vefe deoc'h ober gant ar stumm %s %s pe unan nevesoc'h c'hoazh." #: libraries/common.lib.php:134 #, php-format msgid "Max: %s%s" -msgstr "" +msgstr "Ment vrasañ : %s%s" #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:386 @@ -2175,123 +2175,123 @@ msgstr "en" #: libraries/sql_query_form.lib.php:428 libraries/sql_query_form.lib.php:431 #: main.php:212 server_variables.php:114 msgid "Documentation" -msgstr "" +msgstr "Teuliadur" #: libraries/common.lib.php:573 libraries/header_printview.inc.php:60 #: server_status.php:260 server_status.php:803 msgid "SQL query" -msgstr "" +msgstr "Reked SQL" #: libraries/common.lib.php:1078 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "DIbosupl kevreañ d'ar c'hadarnataer SQL !" #: libraries/common.lib.php:1119 libraries/config/messages.inc.php:472 msgid "Explain SQL" -msgstr "" +msgstr "Displegañ SQL" #: libraries/common.lib.php:1123 msgid "Skip Explain SQL" -msgstr "" +msgstr "N'eo ket dav displegañ SQL" #: libraries/common.lib.php:1157 msgid "Without PHP Code" -msgstr "" +msgstr "Hep kod PHP" #: libraries/common.lib.php:1160 libraries/config/messages.inc.php:474 msgid "Create PHP Code" -msgstr "" +msgstr "Krouiñ kod PHP" #: libraries/common.lib.php:1178 libraries/config/messages.inc.php:473 #: server_status.php:410 server_status.php:436 server_status.php:457 msgid "Refresh" -msgstr "" +msgstr "Freskaat" #: libraries/common.lib.php:1187 msgid "Skip Validate SQL" -msgstr "" +msgstr "N'eo ket dav kadarnaat SQL" #: libraries/common.lib.php:1190 libraries/config/messages.inc.php:476 msgid "Validate SQL" -msgstr "" +msgstr "Kadarnaat SQL" #: libraries/common.lib.php:1245 msgid "Inline edit of this query" -msgstr "" +msgstr "Kemmañ ar reked-mañ enlinenn" #: libraries/common.lib.php:1247 msgid "Inline" -msgstr "" +msgstr "Enlinenn" #: libraries/common.lib.php:1314 sql.php:931 msgid "Profiling" -msgstr "" +msgstr "O profilañ" #. l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ #: libraries/common.lib.php:1334 msgid "B" -msgstr "" +msgstr "o" #: libraries/common.lib.php:1334 msgid "KiB" -msgstr "" +msgstr "Kio" #: libraries/common.lib.php:1334 msgid "MiB" -msgstr "" +msgstr "Mio" #: libraries/common.lib.php:1334 msgid "GiB" -msgstr "" +msgstr "Gio" #: libraries/common.lib.php:1334 msgid "TiB" -msgstr "" +msgstr "Tio" #: libraries/common.lib.php:1334 msgid "PiB" -msgstr "" +msgstr "Pio" #: libraries/common.lib.php:1334 msgid "EiB" -msgstr "" +msgstr "Eio" #. l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string #: libraries/common.lib.php:1552 #: libraries/transformations/text_plain__dateformat.inc.php:33 msgid "%B %d, %Y at %I:%M %p" -msgstr "" +msgstr "%A %d %B %Y da %H:%M" #: libraries/common.lib.php:1867 #, php-format msgid "%s days, %s hours, %s minutes and %s seconds" -msgstr "" +msgstr "%s deiz, %s eur, %s munut ha %s eilenn" #: libraries/common.lib.php:2278 libraries/common.lib.php:2281 #: libraries/display_tbl.lib.php:307 msgid "Begin" -msgstr "" +msgstr "Kregiñ" #: libraries/common.lib.php:2279 libraries/common.lib.php:2282 #: libraries/display_tbl.lib.php:308 server_binlog.php:154 #: server_binlog.php:156 msgid "Previous" -msgstr "" +msgstr "Kent" #: libraries/common.lib.php:2309 libraries/common.lib.php:2312 #: libraries/display_tbl.lib.php:387 msgid "End" -msgstr "" +msgstr "Fin" #: libraries/common.lib.php:2384 #, php-format msgid "Jump to database "%s"." -msgstr "" +msgstr "Mont d'an diaz roadennoù "%s"." #: libraries/common.lib.php:2403 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "Direizhet eo an arc'hwel %s gant un draen anavezet, sellit ouzh %s" #: libraries/common.lib.php:2760 libraries/common.lib.php:2767 #: libraries/common.lib.php:2955 libraries/config/setup.forms.php:295 @@ -2304,7 +2304,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:623 pmd_general.php:151 #: server_privileges.php:513 server_replication.php:313 tbl_tracking.php:262 msgid "Structure" -msgstr "" +msgstr "Framm" #: libraries/common.lib.php:2761 libraries/common.lib.php:2768 #: libraries/config/messages.inc.php:214 libraries/db_links.inc.php:53 @@ -2312,89 +2312,89 @@ msgstr "" #: libraries/server_links.inc.php:47 libraries/tbl_links.inc.php:65 #: querywindow.php:88 msgid "SQL" -msgstr "" +msgstr "SQL" #: libraries/common.lib.php:2763 libraries/common.lib.php:2953 #: libraries/common.lib.php:2954 libraries/sql_query_form.lib.php:318 #: libraries/sql_query_form.lib.php:321 libraries/tbl_links.inc.php:74 msgid "Insert" -msgstr "" +msgstr "Ensoc'hañ" #: libraries/common.lib.php:2770 libraries/db_links.inc.php:86 #: libraries/tbl_links.inc.php:93 libraries/tbl_links.inc.php:113 #: view_operations.php:87 msgid "Operations" -msgstr "" +msgstr "Oberiadennoù" #: libraries/common.lib.php:2900 msgid "Browse your computer:" -msgstr "" +msgstr "Furchal en hoc'h urzhiataer" #: libraries/common.lib.php:2916 #, php-format msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "" +msgstr "Diuzit e-mesk kavlec'h pellgargañ ar servijer web <b>%s</b> :" #: libraries/common.lib.php:2928 libraries/sql_query_form.lib.php:499 #: tbl_change.php:884 msgid "The directory you set for upload work cannot be reached" -msgstr "" +msgstr "Ar c'havlec'h treuzkas n'hall ket bezañ diraezet." #: libraries/common.lib.php:2936 msgid "There are no files to upload" -msgstr "" +msgstr "N'eus restr ebet da enporzhiañ" #: libraries/common.lib.php:2964 libraries/common.lib.php:2965 msgid "Execute" -msgstr "" +msgstr "Seveniñ" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 msgid "Both" -msgstr "" +msgstr "An daou" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "Neblec'h" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "Kleiz" #: libraries/config.values.php:47 msgid "Right" -msgstr "" +msgstr "Dehou" #: libraries/config.values.php:75 msgid "Open" -msgstr "" +msgstr "Digor" #: libraries/config.values.php:75 msgid "Closed" -msgstr "" +msgstr "Serr" #: libraries/config.values.php:96 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:122 libraries/export/texytext.php:24 #: libraries/import.lib.php:1172 msgid "structure" -msgstr "" +msgstr "Framm" #: libraries/config.values.php:97 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:123 libraries/export/texytext.php:24 msgid "data" -msgstr "" +msgstr "roadennoù" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:124 libraries/export/texytext.php:24 msgid "structure and data" -msgstr "" +msgstr "Framm ha roadennoù" #: libraries/config.values.php:100 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Prim - na ziskouez nemet nebeudik-tre a zibarzhioù da gefluniañ" #: libraries/config.values.php:101 msgid "Custom - display all possible options to configure" hooks/post-receive -- phpMyAdmin

1 0