August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15839-gc4c445b
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via c4c445b0e9ba76f53de048d1b322595c06ebce26 (commit) via 5209562dd3504c160f26f3d6466683fda7cdabfc (commit) from cea5d8791ef776dc87961ae4f69c393acdffe381 (commit) - Log ----------------------------------------------------------------- commit c4c445b0e9ba76f53de048d1b322595c06ebce26 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:20:23 2011 +0200 Use PMA_DBI_get_columns instead of custom query commit 5209562dd3504c160f26f3d6466683fda7cdabfc Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:18:27 2011 +0200 Use PMA_DBI_get_columns instead of custom query ----------------------------------------------------------------------- Summary of changes: libraries/sql_query_form.lib.php | 4 +--- libraries/tbl_select.lib.php | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 542cfc3..beab95d 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -213,9 +213,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter // Get the list and number of fields // we do a try_query here, because we could be in the query window, // trying to synchonize and the table has not yet been created - $fields_list = PMA_DBI_fetch_result( - 'SHOW FULL COLUMNS FROM ' . PMA_backquote($db) - . '.' . PMA_backquote($GLOBALS['table'])); + $fields_list = PMA_DBI_get_columns($db, $GLOBALS['table'], true); $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db) . '"'; diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index af97aa4..57c520d 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -59,12 +59,11 @@ function PMA_tbl_getFields($table,$db) { // Gets the list and number of fields - $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); - $fields_cnt = PMA_DBI_num_rows($result); + $fields = PMA_DBI_get_columns($db, $table, true); $fields_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); - while ($row = PMA_DBI_fetch_assoc($result)) { + foreach ($fields as $row) { $fields_list[] = $row['Field']; $type = $row['Type']; // check whether table contains geometric columns @@ -96,8 +95,6 @@ function PMA_tbl_getFields($table,$db) { ? $row['Collation'] : ''; } // end while - PMA_DBI_free_result($result); - unset($result, $type); return array($fields_list,$fields_type,$fields_collation,$fields_null, $geom_column_present); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15837-gcea5d87
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via cea5d8791ef776dc87961ae4f69c393acdffe381 (commit) via 624fdc8b2a62971abe3dc14a46132bc61356a888 (commit) via f66f8b7074679180790312f87c874fecda86b86e (commit) via e350eaeae71dcacc946e5686a526576103f5f32c (commit) from f0babc56a34afaf2664328a332e871c0116468d5 (commit) - Log ----------------------------------------------------------------- commit cea5d8791ef776dc87961ae4f69c393acdffe381 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:17:21 2011 +0200 Use PMA_DBI_get_columns instead of custom query commit 624fdc8b2a62971abe3dc14a46132bc61356a888 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:16:17 2011 +0200 Remove not used variable commit f66f8b7074679180790312f87c874fecda86b86e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:14:54 2011 +0200 Use PMA_DBI_get_columns instead of custom query commit e350eaeae71dcacc946e5686a526576103f5f32c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:13:21 2011 +0200 Use PMA_DBI_get_columns instead of custom query ----------------------------------------------------------------------- Summary of changes: db_search.php | 7 +++---- libraries/schema/Pdf_Relation_Schema.class.php | 4 ++-- tbl_change.php | 3 +-- transformation_wrapper.php | 1 - 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/db_search.php b/db_search.php index c0f2c08..6242a53 100644 --- a/db_search.php +++ b/db_search.php @@ -128,8 +128,7 @@ if (isset($_REQUEST['submit_search'])) { $sqlstr_delete = 'DELETE'; // Fields to select - $tblfields = PMA_DBI_fetch_result('SHOW FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($GLOBALS['db']), - null, 'Field'); + $tblfields = PMA_DBI_get_columns($GLOBALS['db'], $table); // Table to use $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table); @@ -148,8 +147,8 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { - if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' + if (! isset($field) || strlen($field) == 0 || $tblfield['Field'] == $field) { + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield['Field']) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index e74c14d..ed96efd 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -923,8 +923,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); - $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';'); - while ($row = PMA_DBI_fetch_assoc($result)) { + $fields = PMA_DBI_get_columns($GLOBALS['db'], $table); + foreach($fields as $row) { $pdf->SetX(20); $field_name = $row['Field']; $pdf->PMA_links['doc'][$table][$field_name] = $pdf->AddLink(); diff --git a/tbl_change.php b/tbl_change.php index 5329f15..bf0704a 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -165,8 +165,7 @@ unset($show_create_table); * Get the list of the fields of the current table */ PMA_DBI_select_db($db); -$table_fields = PMA_DBI_fetch_result('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', - null, null, null, PMA_DBI_QUERY_STORE); +$table_fields = PMA_DBI_get_columns($db, $table); $rows = array(); if (isset($where_clause)) { // when in edit mode load all selected rows from table diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 577a435..1c5e16a 100644 --- a/transformation_wrapper.php +++ b/transformation_wrapper.php @@ -27,7 +27,6 @@ require_once './libraries/db_table_exists.lib.php'; * Get the list of the fields of the current table */ PMA_DBI_select_db($db); -$table_def = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table), null, PMA_DBI_QUERY_STORE); if (isset($where_clause)) { $result = PMA_DBI_query('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';', null, PMA_DBI_QUERY_STORE); $row = PMA_DBI_fetch_assoc($result); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15833-gf0babc5
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via f0babc56a34afaf2664328a332e871c0116468d5 (commit) via dd046f10b338bbdd491526a12f3e6dd0a7c45dc9 (commit) from 88ef580bd5c575b8cdaa8dea2a3968cfd2504efe (commit) - Log ----------------------------------------------------------------- commit f0babc56a34afaf2664328a332e871c0116468d5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:11:06 2011 +0200 Fix indentation commit dd046f10b338bbdd491526a12f3e6dd0a7c45dc9 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:11:01 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 4ed00f2..41a2b9e 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -507,9 +507,9 @@ class PMA_User_Schema echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { - $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']) + $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); foreach ($fields as $row) { - echo '<br />' . htmlspecialchars($row['Field']) . "\n"; + echo '<br />' . htmlspecialchars($row['Field']) . "\n"; } } echo '</div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15831-g88ef580
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 88ef580bd5c575b8cdaa8dea2a3968cfd2504efe (commit) via ab166dd8490cba11d172e8573f8b407fe4d776d1 (commit) via ecb999e010986143bb1c715c932f3c94d676f72f (commit) from 65aed176dd3e2dcb379af23a574b7bce3f412585 (commit) - Log ----------------------------------------------------------------- commit 88ef580bd5c575b8cdaa8dea2a3968cfd2504efe Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:09:12 2011 +0200 Use PMA_DBI_get_columns instead of custom query commit ab166dd8490cba11d172e8573f8b407fe4d776d1 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:06:46 2011 +0200 Remove some unused vars commit ecb999e010986143bb1c715c932f3c94d676f72f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 09:02:11 2011 +0200 Remove some unused variables ----------------------------------------------------------------------- Summary of changes: libraries/replication.inc.php | 16 ++-------------- libraries/schema/User_Schema.class.php | 18 +++++------------- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 58ed7c5..857f4dc 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -298,21 +298,14 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) { $src_db = $trg_db = $db; - $src_connection = PMA_DBI_select_db($src_db, $src_link); - $trg_connection = PMA_DBI_select_db($trg_db, $trg_link); - $src_tables = PMA_DBI_get_tables($src_db, $src_link); - $source_tables_num = sizeof($src_tables); $trg_tables = PMA_DBI_get_tables($trg_db, $trg_link); - $target_tables_num = sizeof($trg_tables); /** * initializing arrays to save table names */ - $unmatched_num_src = 0; $source_tables_uncommon = array(); - $unmatched_num_trg = 0; $target_tables_uncommon = array(); $matching_tables = array(); $matching_tables_num = 0; @@ -367,6 +360,7 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $source_indexes = array(); $target_indexes = array(); $add_indexes_array = array(); + $alter_indexes_array = array(); $remove_indexes_array = array(); $criteria = array('Field', 'Type', 'Null', 'Collation', 'Key', 'Default', 'Comment'); @@ -378,17 +372,11 @@ function PMA_replication_synchronize_db($db, $src_link, $trg_link, $data = true) $add_indexes_array, $alter_indexes_array,$remove_indexes_array, $counter); } - $matching_table_data_diff = array(); - $matching_table_structure_diff = array(); - $uncommon_table_structure_diff = array(); - $uncommon_table_data_diff = array(); - $uncommon_tables = $source_tables_uncommon; - /** * Generating Create Table query for all the non-matching tables present in Source but not in Target and populating tables. */ for ($q = 0; $q < sizeof($source_tables_uncommon); $q++) { - if (isset($uncommon_tables[$q])) { + if (isset($source_tables_uncommon[$q])) { PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, $source_tables_uncommon, $q, $uncommon_tables_fields, false); } if (isset($row_count[$q]) && $data) { diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 95d60e1..4ed00f2 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -38,7 +38,7 @@ class PMA_User_Schema public function processUserChoice() { - global $action_choose,$db,$cfgRelation,$cfg; + global $action_choose, $db, $cfgRelation; if (isset($this->action)) { switch ($this->action) { @@ -207,7 +207,7 @@ class PMA_User_Schema */ public function showTableDashBoard() { - global $db,$cfgRelation,$table,$cfg,$with_field_names; + global $db, $cfgRelation, $table, $with_field_names; /* * We will need an array of all tables in this db */ @@ -479,7 +479,7 @@ class PMA_User_Schema */ private function _displayScratchboardTables($array_sh_page) { - global $with_field_names,$cfg,$db; + global $with_field_names, $db; ?> <script type="text/javascript" src="./js/dom-drag.js"></script> <form method="post" action="schema_edit.php" name="dragdrop"> @@ -505,22 +505,14 @@ class PMA_User_Schema $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n"; $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n"; - $local_query = 'SHOW FIELDS FROM ' - . PMA_backquote($temp_sh_page['table_name']) - . ' FROM ' . PMA_backquote($db); - $fields_rs = PMA_DBI_query($local_query); - unset($local_query); - $fields_cnt = PMA_DBI_num_rows($fields_rs); - echo '<div id="table_' . $i . '" class="pdflayout_table"><u>' . $temp_sh_page['table_name'] . '</u>'; if (isset($with_field_names)) { - while ($row = PMA_DBI_fetch_assoc($fields_rs)) { + $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']) + foreach ($fields as $row) { echo '<br />' . htmlspecialchars($row['Field']) . "\n"; } } echo '</div>' . "\n"; - PMA_DBI_free_result($fields_rs); - unset($fields_rs); $i++; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15828-g65aed17
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 65aed176dd3e2dcb379af23a574b7bce3f412585 (commit) via cfa5ec283fe4993fa8dbcb031a218f43d6cadff8 (commit) via 1ca6ea0af2155b1188b0742ac67e49a061ee86ee (commit) via ba21b5f3a24c893506debeb2acffe472c92547ea (commit) via 67f396a7b69f06a0c756ed5212470890082a317a (commit) via dd36db9ca9b60da5196303e8a4aaaa0a50e2f177 (commit) via a6638a3c088632e85939afa5681dc79c23cf3725 (commit) via ea96d945265e482bf4cb34fdd3f25117634eada0 (commit) via 917aa3e1825e4f86466a3c48c8c27f6cf4eb90ad (commit) via de98961029477e1680805bb82d5d375d87420ebc (commit) from fd60f78d3bfc0822c7a0c13330e9375ab2abfbb9 (commit) - Log ----------------------------------------------------------------- commit 65aed176dd3e2dcb379af23a574b7bce3f412585 Merge: fd60f78 cfa5ec2 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 06:45:07 2011 +0200 Merge remote-tracking branch 'tyron/master' commit cfa5ec283fe4993fa8dbcb031a218f43d6cadff8 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 22:05:22 2011 +0300 - Easy editing of byte values using kb,mb,gb - Keyboard shortcuts: Enter to save, Escape to cancel commit 1ca6ea0af2155b1188b0742ac67e49a061ee86ee Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 19:21:04 2011 +0300 Better wording commit ba21b5f3a24c893506debeb2acffe472c92547ea Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 19:11:00 2011 +0300 Commit 84cc7837f5da69c588f7503da0acc9512ff29619 broke the datetime picker for the monitor loading log dialog commit 67f396a7b69f06a0c756ed5212470890082a317a Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 17:46:40 2011 +0300 Fix: Correct sorting for status variable values commit dd36db9ca9b60da5196303e8a4aaaa0a50e2f177 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 17:31:27 2011 +0300 Fix: Incorrect word filter regex for status variables commit a6638a3c088632e85939afa5681dc79c23cf3725 Merge: ea96d94 676b0cc Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 17:22:17 2011 +0300 Merge remote-tracking branch 'origin/master' commit ea96d945265e482bf4cb34fdd3f25117634eada0 Merge: 917aa3e 9f476c8 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 16:50:45 2011 +0300 Merge remote-tracking branch 'origin/master' commit 917aa3e1825e4f86466a3c48c8c27f6cf4eb90ad Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 13:37:01 2011 +0300 SQL Pretty printer: Uppercase for keywords commit de98961029477e1680805bb82d5d375d87420ebc Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Aug 18 13:16:03 2011 +0300 SQL pretty printer feature using the codemirror tokenizer. Replaced this with old pretty-printer regexp collection in query analyzer dialog. ----------------------------------------------------------------------- Summary of changes: js/codemirror/mode/mysql/mysql.js | 49 ++++++++-- js/functions.js | 152 ++++++++++++++++++++++++++++++- js/messages.php | 2 +- js/server_status.js | 17 +++- js/server_status_monitor.js | 35 ++----- js/server_variables.js | 13 +++- server_variables.php | 19 ++++- themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- 9 files changed, 249 insertions(+), 42 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 657942d..755e3ec 100644 --- a/js/codemirror/mode/mysql/mysql.js +++ b/js/codemirror/mode/mysql/mysql.js @@ -1,11 +1,14 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { var indentUnit = config.indentUnit, keywords = parserConfig.keywords, + verbs = parserConfig.verbs, functions = parserConfig.functions, types = parserConfig.types, - attributes = parserConfig.attributes, - multiLineStrings = parserConfig.multiLineStrings; + attributes = parserConfig.attributes, + multiLineStrings = parserConfig.multiLineStrings, + multiPartKeywords= parserConfig.multiPartKeywords; var isOperatorChar = /[+\-*&%=<>!?:\/|]/; + function chain(stream, state, f) { state.tokenize = f; return f(stream, state); @@ -64,14 +67,35 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { else { // get the whole word stream.eatWhile(/[\w\$_]/); + var word = stream.current().toLowerCase(); + var oldPos = stream.pos; + // is it one of the listed verbs? + if (verbs && verbs.propertyIsEnumerable(word)) return ret("keyword", "statement-verb"); // is it one of the listed keywords? - if (keywords && keywords.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "keyword"); + if (keywords && keywords.propertyIsEnumerable(word)) return ret("keyword", "keyword"); // is it one of the listed functions? - if (functions && functions.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "builtin"); + if (functions && functions.propertyIsEnumerable(word)) { + // All functions begin with '(' + stream.eatSpace(); + if(stream.peek() == '(') + return ret("keyword", "builtin"); + // Not func => restore old pos + stream.pos = oldPos; + } // is it one of the listed types? - if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-2"); + if (types && types.propertyIsEnumerable(word)) return ret("keyword", "variable-2"); // is it one of the listed attributes? - if (attributes && attributes.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-3"); + if (attributes && attributes.propertyIsEnumerable(word)) return ret("keyword", "variable-3"); + // is it a multipart keyword? (currently only checks 2 word parts) + + stream.eatSpace(); + stream.eatWhile(/[\w\$_]/); + var doubleWord = stream.current().toLowerCase(); + if (multiPartKeywords && multiPartKeywords.propertyIsEnumerable(doubleWord)) return ret("keyword", "keyword"); + + // restore old pos + stream.pos = oldPos; + // default: just a "word" return ret("word", "mysql-word"); } @@ -122,11 +146,14 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { (function() { function keywords(str) { - var obj = {}, words = str.split(" "); + var obj = {}, words = str; + if(typeof str == 'string') words = str.split(" "); for (var i = 0; i < words.length; ++i) obj[words[i]] = true; return obj; } - var cKeywords = "accessible add all alter analyze and as asc asensitive before between bigint binary blob both by call cascade case change char character check collate column condition constraint continue convert create cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed delete desc describe deterministic distinct distinctrow div double drop dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign from fulltext grant group having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive insert int int1 int2 int3 int4 int8 integer interval into is iterate join key keys kill leading leave left like limit linear lines load localtime localtimestamp lock long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on optimize option optionally or order out outer outfile precision primary procedure purge range read reads read_write real references regexp release rename repeat replace require resignal restrict return revoke right rlike schema schemas second_microsecond select sensitive separator set show signal smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unlock unsigned update usage use using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; + var cKeywords = "accessible add all and as asc asensitive before between bigint binary blob both cascade case char character collate column condition constraint continue convert cross current_date current_time current_timestamp current_user cursor database databases day_hour day_microsecond day_minute day_second dec decimal declare default delayed desc deterministic distinct distinctrow div double dual each else elseif enclosed escaped exists exit explain false fetch float float4 float8 for force foreign fulltext from having high_priority hour_microsecond hour_minute hour_second if ignore in index infile inner inout insensitive int int1 int2 int3 int4 int8 integer interval is iterate join key keys leading leave left like limit linear lines localtime localtimestamp long longblob longtext loop low_priority master_ssl_verify_server_cert match maxvalue mediumblob mediumint mediumtext middleint minute_microsecond minute_second mod modifies natural not no_write_to_binlog null numeric on option optionally or out outer outfile precision primary procedure range read reads read_write real references regexp repeat require restrict return right rlike schema schemas second_microsecond sensitive separator smallint spatial specific sql sqlexception sqlstate sqlwarning sql_big_result sql_calc_found_rows sql_small_result ssl starting straight_join table terminated then tinyblob tinyint tinytext to trailing trigger true undo union unique unsigned usage using utc_date utc_time utc_timestamp values varbinary varchar varcharacter varying when where while with write xor year_month zerofill"; + + var cVerbs = "alter analyze begin binlog call change check checksum commit create deallocate describe do drop execute flush grant handler install kill load lock optimize cache partition prepare purge release rename repair replace reset resignal revoke rollback savepoint select set signal show start truncate uninstall unlock update use xa"; var cFunctions = "abs acos adddate addtime aes_decrypt aes_encrypt area asbinary ascii asin astext atan atan2 avg bdmpolyfromtext bdmpolyfromwkb bdpolyfromtext bdpolyfromwkb benchmark bin bit_and bit_count bit_length bit_or bit_xor boundary buffer cast ceil ceiling centroid char character_length charset char_length coalesce coercibility collation compress concat concat_ws connection_id contains conv convert convert_tz convexhull cos cot count crc32 crosses curdate current_date current_time current_timestamp current_user curtime database date datediff date_add date_diff date_format date_sub day dayname dayofmonth dayofweek dayofyear decode default degrees des_decrypt des_encrypt difference dimension disjoint distance elt encode encrypt endpoint envelope equals exp export_set exteriorring extract extractvalue field find_in_set floor format found_rows from_days from_unixtime geomcollfromtext geomcollfromwkb geometrycollection geometrycollectionfromtext geometrycollectionfromwkb geometryfromtext geometryfromwkb geometryn geometrytype geomfromtext geomfromwkb get_format get_lock glength greatest group_concat group_unique_users hex hour if ifnull inet_aton inet_ntoa insert instr interiorringn intersection intersects interval isclosed isempty isnull isring issimple is_free_lock is_used_lock last_day last_insert_id lcase least left length linefromtext linefromwkb linestring linestringfromtext linestringfromwkb ln load_file localtime localtimestamp locate log log10 log2 lower lpad ltrim makedate maketime make_set master_pos_wait max mbrcontains mbrdisjoint mbrequal mbrintersects mbroverlaps mbrtouches mbrwithin md5 microsecond mid min minute mlinefromtext mlinefromwkb mod month monthname mpointfromtext mpointfromwkb mpolyfromtext mpolyfromwkb multilinestring multilinestringfromtext multilinestringfromwkb multipoint multipointfromtext multipointfromwkb multipolygon multipolygonfromtext multipolygonfromwkb name_const now nullif numgeometries numinteriorrings numpoints oct octet_length old_password ord overlaps password period_add period_diff pi point pointfromtext pointfromwkb pointn pointonsurface polyfromtext polyfromwkb polygon polygonfromtext polygonfromwkb position pow power quarter quote radians rand related release_lock repeat replace reverse right round row_count rpad rtrim schema second sec_to_time session_user sha sha1 sign sin sleep soundex space sqrt srid startpoint std stddev stddev_pop stddev_samp strcmp str_to_date subdate substr substring substring_index subtime sum symdifference sysdate system_user tan time timediff timestamp timestampadd timestampdiff time_format time_to_sec touches to_days trim truncate ucase uncompress uncompressed_length unhex unique_users unix_timestamp updatexml upper user utc_date utc_time utc_timestamp uuid variance var_pop var_samp version week weekday weekofyear within x y year yearweek"; @@ -134,11 +161,15 @@ CodeMirror.defineMode("mysql", function(config, parserConfig) { var cAttributes = "archive ascii auto_increment bdb berkeleydb binary blackhole csv default example federated heap innobase innodb isam maria memory merge mrg_isam mrg_myisam myisam national ndb ndbcluster precision undefined unicode unsigned varying zerofill"; + var cmultiPartKeywords = ['insert into', 'group by', 'order by', 'delete from']; + CodeMirror.defineMIME("text/x-mysql", { name: "mysql", keywords: keywords(cKeywords), + multiPartKeywords: keywords(cmultiPartKeywords), + verbs: keywords(cVerbs), functions: keywords(cFunctions), types: keywords(cTypes), attributes: keywords(cAttributes) }); -}()); +}()); \ No newline at end of file diff --git a/js/functions.js b/js/functions.js index 54a08d5..92c4caf 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1617,7 +1617,13 @@ function PMA_createProfilingChart(data, options) },options)); } -// Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js +/** + * Formats a profiling duration nicely (in us and ms time). Used in PMA_createProfilingChart() and server_status.js + * + * @param integer Number to be formatted, should be in the range of microsecond to second + * @param integer Acuracy, how many numbers right to the comma should be + * @return string The formatted number + */ function PMA_prettyProfilingNum(num, acc) { if (!acc) { @@ -1635,6 +1641,150 @@ function PMA_prettyProfilingNum(num, acc) return num + 's'; } + +/** + * Formats a SQL Query nicely with newlines and indentation. Depends on Codemirror and MySQL Mode! + * + * @param string Query to be formatted + * @return string The formatted query + */ +function PMA_SQLPrettyPrint(string) +{ + var mode = CodeMirror.getMode({},"text/x-mysql"); + var stream = new CodeMirror.StringStream(string); + var state = mode.startState(); + var token, tokens = []; + var output = ''; + var tabs = function(cnt) { + var ret = ''; + for (var i=0; i<4*cnt; i++) + ret += " "; + return ret; + }; + + // "root-level" statements + var statements = { + 'select': ['select', 'from','on','where','having','limit','order by','group by'], + 'update': ['update', 'set','where'], + 'insert into': ['insert into', 'values'] + }; + // don't put spaces before these tokens + var spaceExceptionsBefore = { ';':true, ',': true, '.': true, '(': true }; + // don't put spaces after these tokens + var spaceExceptionsAfter = { '.': true }; + + // Populate tokens array + var str=''; + while (! stream.eol()) { + stream.start = stream.pos; + token = mode.token(stream, state); + if(token != null) { + tokens.push([token, stream.current().toLowerCase()]); + } + } + + var currentStatement = tokens[0][1]; + + if(! statements[currentStatement]) { + return string; + } + // Holds all currently opened code blocks (statement, function or generic) + var blockStack = []; + // Holds the type of block from last iteration (the current is in blockStack[0]) + var previousBlock; + // If a new code block is found, newBlock contains its type for one iteration and vice versa for endBlock + var newBlock, endBlock; + // How much to indent in the current line + var indentLevel = 0; + // Holds the "root-level" statements + var statementPart, lastStatementPart = statements[currentStatement][0]; + + blockStack.unshift('statement'); + + // Iterate through every token and format accordingly + for (var i = 0; i < tokens.length; i++) { + previousBlock = blockStack[0]; + + // New block => push to stack + if (tokens[i][1] == '(') { + if (i < tokens.length - 1 && tokens[i+1][0] == 'statement-verb') { + blockStack.unshift(newBlock = 'statement'); + } else if (i > 0 && tokens[i-1][0] == 'builtin') { + blockStack.unshift(newBlock = 'function'); + } else { + blockStack.unshift(newBlock = 'generic'); + } + } else { + newBlock = null; + } + + // Block end => pop from stack + if (tokens[i][1] == ')') { + endBlock = blockStack[0]; + blockStack.shift(); + } else { + endBlock = null; + } + + // A subquery is starting + if (i > 0 && newBlock == 'statement') { + indentLevel++; + output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1].toUpperCase() + "\n" + tabs(indentLevel + 1); + currentStatement = tokens[i+1][1]; + i++; + continue; + } + + // A subquery is ending + if (endBlock == 'statement' && indentLevel > 0) { + output += "\n" + tabs(indentLevel); + indentLevel--; + } + + // One less indentation for statement parts (from, where, order by, etc.) and a newline + statementPart = statements[currentStatement].indexOf(tokens[i][1]); + if (statementPart != -1) { + if (i > 0) output += "\n"; + output += tabs(indentLevel) + tokens[i][1].toUpperCase(); + output += "\n" + tabs(indentLevel + 1); + lastStatementPart = tokens[i][1]; + } + // Normal indentatin and spaces for everything else + else { + if (! spaceExceptionsBefore[tokens[i][1]] + && ! (i > 0 && spaceExceptionsAfter[tokens[i-1][1]]) + && output.charAt(output.length -1) != ' ' ) { + output += " "; + } + if (tokens[i][0] == 'keyword') { + output += tokens[i][1].toUpperCase(); + } else { + output += tokens[i][1]; + } + } + + // split columns in select and 'update set' clauses, but only inside statements blocks + if (( lastStatementPart == 'select' || lastStatementPart == 'where' || lastStatementPart == 'set') + && tokens[i][1]==',' && blockStack[0] == 'statement') { + + output += "\n" + tabs(indentLevel + 1); + } + + // split conditions in where clauses, but only inside statements blocks + if (lastStatementPart == 'where' + && (tokens[i][1]=='and' || tokens[i][1]=='or' || tokens[i][1]=='xor')) { + + if (blockStack[0] == 'statement') { + output += "\n" + tabs(indentLevel + 1); + } + // Todo: Also split and or blocks in newlines & identation++ + //if(blockStack[0] == 'generic') + // output += ... + } + } + return output; +} + /** * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not * return a jQuery object yet and hence cannot be chained diff --git a/js/messages.php b/js/messages.php index 10beb0a..7bb7bd3 100644 --- a/js/messages.php +++ b/js/messages.php @@ -170,7 +170,7 @@ $js_messages['strJumpToTable'] = __('Jump to Log table'); $js_messages['strNoDataFound'] = __('Log analysed, but no data found in this time span.'); /* l10n: A collection of available filters */ -$js_messages['strFilters'] = __('Filters'); +$js_messages['strFiltersForLogTable'] = __('Log table filter options'); /* l10n: Filter as in "Start Filtering" */ $js_messages['strFilter'] = __('Filter'); $js_messages['strFilterByWordRegexp'] = __('Filter queries by word/regexp:'); diff --git a/js/server_status.js b/js/server_status.js index 08d7679..594e8d9 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -43,6 +43,19 @@ $(function() { }, type: "numeric" }); + + jQuery.tablesorter.addParser({ + id: "withinSpanNumber", + is: function(s) { + return /<span class="original"/.test(s); + }, + format: function(s, table, html) { + var res = html.innerHTML.match(/<span(\s*style="display:none;"\s*)?\s*class="original">(.*)?<\/span>/); + return (res && res.length >= 3) ? res[2] : 0; + }, + type: "numeric" + }); + // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check jQuery.tablesorter.addWidget({ id: "fast-zebra", @@ -394,7 +407,7 @@ $(function() { if (word.length == 0) { textFilter = null; } - else textFilter = new RegExp("(^|_)" + word, 'i'); + else textFilter = new RegExp("(^| )" + word, 'i'); text = word; @@ -507,7 +520,7 @@ $(function() { sortList: [[0, 0]], widgets: ['fast-zebra'], headers: { - 1: { sorter: 'fancyNumber' } + 1: { sorter: 'withinSpanNumber' } } }; break; diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index fa0f28e..e89f048 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -9,6 +9,10 @@ $(function() { codemirror_editor = CodeMirror.fromTextArea(elm[0], { lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql" }); } } + // Timepicker is loaded on demand so we need to initialize datetime fields from the 'load log' dialog + $('div#logAnalyseDialog .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); /**** Monitor charting implementation ****/ /* Saves the previous ajax response for differential values */ @@ -1022,8 +1026,6 @@ $(function() { removeVariables: $('input#removeVariables').prop('checked'), limitTypes: $('input#limitTypes').prop('checked') }); - - $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy'); } $('#logAnalyseDialog').dialog({ @@ -1388,7 +1390,7 @@ $(function() { if (logData.numRows > 12) { $('div#logTable').prepend( '<fieldset id="logDataFilter">' + - ' <legend>' + PMA_messages['strFilters'] + '</legend>' + + ' <legend>' + PMA_messages['strFiltersForLogTable'] + '</legend>' + ' <div class="formelement">' + ' <label for="filterQueryText">' + PMA_messages['strFilterByWordRegexp'] + '</label>' + ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' + @@ -1688,33 +1690,18 @@ $(function() { return cols; } - + /* Opens the query analyzer dialog */ function openQueryAnalyzer() { var rowData = $(this).parent().data('query'); var query = rowData.argument || rowData.sql_text; - /* A very basic SQL Formatter. Totally fails in the cases of - - Any string appearance containing a MySQL Keyword, surrounded by whitespaces, e.g. WHERE bar = "This where the formatter fails" - - Subqueries too probably - */ - - // Matches the columns to be selected - // .* selector doesn't include whitespace and we have no PCRE_DOTALL modifier, (.|\s)+ crashes Chrome (reported and confirmed), - // [^]+ results in JS error in IE8, thus we use [^\0]+ for matching each column since the zero-byte char (hopefully) doesn't appear in column names ;) - var sLists = query.match(/SELECT\s+[^\0]+\s+FROM\s+/gi); - if (sLists) { - for (var i = 0; i < sLists.length; i++) { - query = query.replace(sLists[i], sLists[i].replace(/\s*((`|'|"|).*?\1,)\s*/gi, '$1\n\t')); - } - query = query - .replace(/(\s+|^)(SELECT|FROM|WHERE|GROUP BY|HAVING|ORDER BY|LIMIT)(\s+|$)/gi, '\n$2\n\t') - .replace(/\s+UNION\s+/gi, '\n\nUNION\n\n') - .replace(/\s+(AND)\s+/gi, ' $1\n\t') - .trim(); - } - + query = PMA_SQLPrettyPrint(query); codemirror_editor.setValue(query); + // Codemirror is bugged, it doesn't refresh properly sometimes. Following lines seem to fix that + setTimeout(function() { + codemirror_editor.refresh() + },50); var profilingChart = null; var dlgBtns = {}; diff --git a/js/server_variables.js b/js/server_variables.js index 0ca5304..cb4f8c3 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -173,9 +173,20 @@ function editVariable(link) // hide original content $cell.html('<span class="oldContent" style="display:none;">' + $cell.html() + '</span>'); // put edit field and save/cancel link - $cell.prepend('<table class="serverVariableEditTable" border="0"><tr><td></td><td style="width:100%;"><input type="text" value="' + data + '"/></td></tr</table>'); + $cell.prepend('<table class="serverVariableEditTable" border="0"><tr><td></td><td style="width:100%;">' + + '<input type="text" id="variableEditArea" value="' + data + '" /></td></tr</table>'); $cell.find('table td:first').append(mySaveLink); + $cell.find('table td:first').append(' '); $cell.find('table td:first').append(myCancelLink); + + // Keyboard shortcuts to the rescue + $('input#variableEditArea').focus(); + $('input#variableEditArea').keydown(function(event) { + // Enter key + if(event.keyCode == 13) mySaveLink.trigger('click'); + // Escape key + if(event.keyCode == 27) myCancelLink.trigger('click'); + }); }); return false; diff --git a/server_variables.php b/server_variables.php index ca39a5e..4c2086a 100644 --- a/server_variables.php +++ b/server_variables.php @@ -43,11 +43,26 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { switch($_REQUEST['type']) { case 'getval': $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="' . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM'); + if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3]) + && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte') { + exit(implode(' ', PMA_formatByteDown($varValue[1],3,3))); + } exit($varValue[1]); break; + case 'setval': - $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if (!is_numeric($value)) $value="'" . $value . "'"; + $value = $_REQUEST['varValue']; + + if (isset($VARIABLE_DOC_LINKS[$_REQUEST['varName']][3]) + && $VARIABLE_DOC_LINKS[$_REQUEST['varName']][3] == 'byte' + && preg_match('/^\s*(\d+(\.\d+)?)\s*(mb|kb|mib|kib|gb|gib)\s*$/i',$value,$matches)) { + $exp = array('kb' => 1, 'kib' => 1, 'mb' => 2, 'mib' => 2, 'gb' => 3, 'gib' => 3); + $value = floatval($matches[1]) * pow(1024, $exp[strtolower($matches[3])]); + } else { + $value = PMA_sqlAddslashes($value); + } + + if (! is_numeric($value)) $value="'" . $value . "'"; if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value)) { // Some values are rounded down etc. diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index e97b1e9..8f64772 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2311,7 +2311,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword { +span.cm-keyword, span.cm-statement-verb { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; } span.cm-variable { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 914ef0b..25aeadc 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2727,7 +2727,7 @@ span.CodeMirror-selected { .CodeMirror-matchingbracket {color: #0f0 !important;} .CodeMirror-nonmatchingbracket {color: #f22 !important;} -span.cm-keyword { +span.cm-keyword, span.cm-statement-verb { color: <?php echo $GLOBALS['cfg']['SQP']['fmtColor']['alpha_reservedWord']; ?>; } span.cm-variable { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15818-gfd60f78
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via fd60f78d3bfc0822c7a0c13330e9375ab2abfbb9 (commit) via 850c187504f285b95757b10ba2ffcfb30dba4d54 (commit) via 05917283064b13e7b27728e8212578cd61a2baab (commit) via 6d279568bca8e72dbbd007a385f379b7d34bc372 (commit) via dfd707f445ed01404fad6b4a7511d755b3fb4692 (commit) via ace483fe9de1c23c6179fa52b0933045a73477e4 (commit) via 7e210372b2a89fbf3622799df62fe26c586778c5 (commit) via 4125abd459db8a8e8b460e554c554105085ec6f7 (commit) via f69a04bb90aa12d9921ff1bddf637df4193bdfd0 (commit) via 1073f6dd0ad4d32d6850df337d7db0a5d94b2d5d (commit) via ab5155fed30bbd4f585910c6cad7249fbe9cb50d (commit) via 1487e8dff13f68a5a4753bc27a2dff17f38ebad4 (commit) via b5c62a8818314302e642e7b83f21ac96b0796218 (commit) via 5bba25d1be446d6c74206425c86745a2dd01a704 (commit) via fb8b1f01fe135a1295cba450ca53eac13b937748 (commit) via 4941ab5b59cc4edfb030ef36fa9b46f31858969b (commit) via 1387307cfed4d227b3ac8b34c838b57239b3d972 (commit) via 4acf467b69e0bdbc09d68e0c54a5fd04b5132d9c (commit) via 6d8b54790f56e29decacab59a5bd80f2b1e9fd31 (commit) via 88140560e198d1b7210241405caa4c57a1ebbd70 (commit) via 60f054c3ee395f767958ef6e7c24eaeb192ac2e5 (commit) via 529fd302e8779c1e60b870d593abd8bf6fe3ce93 (commit) via be8cd5978a733476db63e48f6aacdd7ce5c80533 (commit) via 9a1972565594d19d01b881dd852c24be9b915fdb (commit) via d456c4fb361b1e82cd3641ee201588327cc14c5a (commit) via 2347a5458f50729c58b7a7e75030b1856be8eadf (commit) via fb400c4034c83e1a278816c2b169299df8d91ca3 (commit) via c5919522761463e4abde1fd81928e199e3871696 (commit) via bb383ccb1fb1036e763318d687d0e770e90d10dc (commit) via a5bd138d5d7947fe053ebcbb18668babb82fb757 (commit) via 6d41dc4b4a7f68b11eeb79788521b58bc15a34ba (commit) via 1e23bb4366df7b9748586bc3e59db9e176a38403 (commit) via fda3f52d1ec0dbb84300d09f69fccc602837a6fe (commit) via 8e586dac89f4a81f717145f9b3962ac533498dce (commit) via 1539119bc85ca7312fecc46cc97b3f33354d0a1d (commit) via 1e84e4c4c14fe2bb0a2f265994cf51daed9da538 (commit) via 59ad6b06c8dabf62a22d89b3c26fcdb2674176cf (commit) via f8b1c96eb5a773e774e74e8e66d2137798f8550e (commit) via e779b6d8d770d336340f69755941e2323d76453c (commit) via 1b9d104a90cf601ad7b0f3d73877b01b2c84457a (commit) via 4281a1a4afa03e93ece3ed9a8efd951edb35252f (commit) via b0db44d4516bdbb5137fe24fed3ba8cfc5ca1bfc (commit) via b83f5ce6a45778479c8387e3ffca73bd5b561716 (commit) via a6ef77d298010c7a36a7333bc9fdc3b038ad3780 (commit) via 6c10ef3ddc150257ed3ff28fba9c7dd88da6b055 (commit) via e17bc6cb6ca851747f14600252def380f060b3c9 (commit) via ad156d47043f5a515977374cad48ddf6129bc152 (commit) via d1b812f0bb5c8bc57bf059a559739bfabfe43bcf (commit) via e14022efcc161d2bff26287e8bfa6e9eb25cad53 (commit) via 7a817143aedc2f6c9925330508da5ad718426ab3 (commit) via 9b8641bbcfa8aae49ea6bcb409b99030c81ec39f (commit) via f65350aa55d40fcc6201e052dd0d591fdf354684 (commit) via 1b5a61a89d011c730dcfe63228d9869047388ab7 (commit) via fa3f55e086c864d6b5abc63103d79cddb4f124d9 (commit) via 8c7a2a418dce68c1fb5869a74b099d31e7495877 (commit) via ab5fb53098d07a48fcb73fedf7ec40428e858d0d (commit) via d967cd95b9c8b08a0acb3ec740f977abe4316374 (commit) via 7b0ee1f98e05aa0a4028e58157cba07572ce7e36 (commit) via b062112d3fede536e6c7ce3653176e0097340a2a (commit) via dd8b6b1f619e756d69d88559ec77fee249a16b9e (commit) via e2a10ea57e87c839ad24c19caa69c8706feaf58c (commit) via 019a64c03485439bd5259207e405874acbe0fa94 (commit) via 2ae1dd4d18ff276b04fc3943b082abe73188d5aa (commit) via f5d643fb23ba600f5f528f05212a40b53fb50ad3 (commit) via a472784e80fca05b1e0d220243fef9134a82f278 (commit) via 2f3d4439b6b64d646c944baccdb9a1477ac4e7ce (commit) via 5f927b658440297ecb9e6a8a0ae77f1f6225533a (commit) via d96530b4b6e44094aa8e7504a8ad273005a2ad2a (commit) via 660eda0aa6a8d92aee802aaef2331c7bcb2a3bd0 (commit) via 12495bf010f0ece83f93e47c9c0f44fb00e37523 (commit) via ff62e7687a9f122f633e9c7775304e92edda6d5a (commit) via a317eafbc3c17bdd386572a219178f8f2e67ff9a (commit) via 830d5bf7cc4851542296d9308142a840818ab1e3 (commit) via 98de725b80b384a0f644f87a344b46d37ce9bb7f (commit) via 9e72f2ff196d068a051a96497b9a9b1a8db36082 (commit) via 43ff3852dd132c08943ddeff1c46613c691b0fdd (commit) via 3d8939dbcdd13bb24a6bbdf260566b54f1176b0e (commit) via e25547ee6fb61d23cc9b61fbc0de3d919c0d1be4 (commit) via 5e0eba45f314accab620d98cbe305cd91f655950 (commit) via 3b81da6e3684888fa10e8545c76e789d04234941 (commit) via 41386b87f562563ea9683cd96faca48c9859a6bd (commit) via 788241c3f8f80eaba7c1cf45200596e8109c1771 (commit) via 6aff680e4c59e5da6f3bce833b8adaee7f2f8ba2 (commit) via 642159db368e9ccf63d68426e1f435b62bf0323e (commit) via 08d8416c85ae86a2989617618d98bfb9f15c09cf (commit) via f7f312eb399f1aface7a3bbf13bd39810906dba4 (commit) via c29f50d562ddd5820f8c5033fe62d1153d05b640 (commit) via d64439ba1991101581fad726a7851ff1fac0c490 (commit) via e9338dbb9c5cfe71177ae81b9bddbe0d03d47c40 (commit) via b6b21af405496e3b12734ac9653af03c4c3f575e (commit) via 73df898bdf7dfbb5be4c078ff4ae6623531c2950 (commit) via ca6a5315deaa68007d64e5d158c6b97411254d29 (commit) via 0fda6a558178f554fd0c7f7b304fe58e6dbb53c8 (commit) via 1126128143fa51af10a0b01ea1c8b413b998181b (commit) via 0b225ab17ab14b23251ec190dfd71422454381cc (commit) via 41c8e7b9a20afa71b67467e883e1f7c84920b0e5 (commit) via 64396743a16f1e8040a0f33b867444703a60a914 (commit) via 172c48f410d93db707b8643c8410251b592caba9 (commit) via ba51fe1500e07c514891a63fae59769dd356fdb6 (commit) via e4c580aa613c4472754d3d457cb3a678a86257ce (commit) via db7f4797a9ed238e9cd2e7b8dd91124f3ac7bb17 (commit) via 2329265d52c5d792f9d084d759a07e42b56a8806 (commit) via 75331372a547045ed5d75d4e14900ba22c97edab (commit) via 98901983d582766c1c91c2da3d53415613a8404e (commit) via f570fce5ce0069f6ef8423b60578324d250c7a62 (commit) via 9e9c62de622d0af4a44ca577d5d56447bf54fa54 (commit) via 2cb5ff8a8a47e03ad19d625b75fbf8c7da7b970e (commit) via b3f048c2f2a9d938869d311164ef86e76f60fbd5 (commit) via 342b765409386f6aa8729996487d04a0d7da21ff (commit) via f6a5e7ff0a87e36f026c78523d4d2dbdebc274f0 (commit) via fd7f71b4ed290a3e530d73aaef4a890aec6fadd2 (commit) via ccf3f5999db459d851a80ae14ac11f96c3f312f5 (commit) via 8be0226caf5915d81c4e52c031fb462d25eb310a (commit) via 25e0482a4a4db8533adbce331bdd76037dc982a3 (commit) from 676b0cc925482a0662562fca485fb4064b228a7f (commit) - Log ----------------------------------------------------------------- commit fd60f78d3bfc0822c7a0c13330e9375ab2abfbb9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:20:47 2011 +0200 Translation update done using Pootle. commit 850c187504f285b95757b10ba2ffcfb30dba4d54 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:19:48 2011 +0200 Translation update done using Pootle. commit 05917283064b13e7b27728e8212578cd61a2baab Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:19:07 2011 +0200 Translation update done using Pootle. commit 6d279568bca8e72dbbd007a385f379b7d34bc372 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:18:50 2011 +0200 Translation update done using Pootle. commit dfd707f445ed01404fad6b4a7511d755b3fb4692 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:17:27 2011 +0200 Translation update done using Pootle. commit ace483fe9de1c23c6179fa52b0933045a73477e4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:16:36 2011 +0200 Translation update done using Pootle. commit 7e210372b2a89fbf3622799df62fe26c586778c5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:16:29 2011 +0200 Translation update done using Pootle. commit 4125abd459db8a8e8b460e554c554105085ec6f7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:16:17 2011 +0200 Translation update done using Pootle. commit f69a04bb90aa12d9921ff1bddf637df4193bdfd0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:14:18 2011 +0200 Translation update done using Pootle. commit 1073f6dd0ad4d32d6850df337d7db0a5d94b2d5d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:12:55 2011 +0200 Translation update done using Pootle. commit ab5155fed30bbd4f585910c6cad7249fbe9cb50d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:12:14 2011 +0200 Translation update done using Pootle. commit 1487e8dff13f68a5a4753bc27a2dff17f38ebad4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:12:05 2011 +0200 Translation update done using Pootle. commit b5c62a8818314302e642e7b83f21ac96b0796218 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:11:34 2011 +0200 Translation update done using Pootle. commit 5bba25d1be446d6c74206425c86745a2dd01a704 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:09:34 2011 +0200 Translation update done using Pootle. commit fb8b1f01fe135a1295cba450ca53eac13b937748 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:08:10 2011 +0200 Translation update done using Pootle. commit 4941ab5b59cc4edfb030ef36fa9b46f31858969b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:07:17 2011 +0200 Translation update done using Pootle. commit 1387307cfed4d227b3ac8b34c838b57239b3d972 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 01:06:28 2011 +0200 Translation update done using Pootle. commit 4acf467b69e0bdbc09d68e0c54a5fd04b5132d9c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:58:54 2011 +0200 Translation update done using Pootle. commit 6d8b54790f56e29decacab59a5bd80f2b1e9fd31 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:58:48 2011 +0200 Translation update done using Pootle. commit 88140560e198d1b7210241405caa4c57a1ebbd70 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:58:31 2011 +0200 Translation update done using Pootle. commit 60f054c3ee395f767958ef6e7c24eaeb192ac2e5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:35 2011 +0200 Translation update done using Pootle. commit 529fd302e8779c1e60b870d593abd8bf6fe3ce93 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:26 2011 +0200 Translation update done using Pootle. commit be8cd5978a733476db63e48f6aacdd7ce5c80533 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:20 2011 +0200 Translation update done using Pootle. commit 9a1972565594d19d01b881dd852c24be9b915fdb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:16 2011 +0200 Translation update done using Pootle. commit d456c4fb361b1e82cd3641ee201588327cc14c5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:08 2011 +0200 Translation update done using Pootle. commit 2347a5458f50729c58b7a7e75030b1856be8eadf Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:57:03 2011 +0200 Translation update done using Pootle. commit fb400c4034c83e1a278816c2b169299df8d91ca3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:56:29 2011 +0200 Translation update done using Pootle. commit c5919522761463e4abde1fd81928e199e3871696 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:56:25 2011 +0200 Translation update done using Pootle. commit bb383ccb1fb1036e763318d687d0e770e90d10dc Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:56:17 2011 +0200 Translation update done using Pootle. commit a5bd138d5d7947fe053ebcbb18668babb82fb757 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:56:02 2011 +0200 Translation update done using Pootle. commit 6d41dc4b4a7f68b11eeb79788521b58bc15a34ba Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:33 2011 +0200 Translation update done using Pootle. commit 1e23bb4366df7b9748586bc3e59db9e176a38403 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:27 2011 +0200 Translation update done using Pootle. commit fda3f52d1ec0dbb84300d09f69fccc602837a6fe Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:25 2011 +0200 Translation update done using Pootle. commit 8e586dac89f4a81f717145f9b3962ac533498dce Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:21 2011 +0200 Translation update done using Pootle. commit 1539119bc85ca7312fecc46cc97b3f33354d0a1d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:15 2011 +0200 Translation update done using Pootle. commit 1e84e4c4c14fe2bb0a2f265994cf51daed9da538 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Fri Aug 19 00:55:00 2011 +0200 Translation update done using Pootle. commit 59ad6b06c8dabf62a22d89b3c26fcdb2674176cf Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:40:16 2011 +0200 Translation update done using Pootle. commit f8b1c96eb5a773e774e74e8e66d2137798f8550e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:40:06 2011 +0200 Translation update done using Pootle. commit e779b6d8d770d336340f69755941e2323d76453c Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:38:05 2011 +0200 Translation update done using Pootle. commit 1b9d104a90cf601ad7b0f3d73877b01b2c84457a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:55 2011 +0200 Translation update done using Pootle. commit 4281a1a4afa03e93ece3ed9a8efd951edb35252f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:52 2011 +0200 Translation update done using Pootle. commit b0db44d4516bdbb5137fe24fed3ba8cfc5ca1bfc Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:48 2011 +0200 Translation update done using Pootle. commit b83f5ce6a45778479c8387e3ffca73bd5b561716 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:44 2011 +0200 Translation update done using Pootle. commit a6ef77d298010c7a36a7333bc9fdc3b038ad3780 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:41 2011 +0200 Translation update done using Pootle. commit 6c10ef3ddc150257ed3ff28fba9c7dd88da6b055 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:37 2011 +0200 Translation update done using Pootle. commit e17bc6cb6ca851747f14600252def380f060b3c9 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:34 2011 +0200 Translation update done using Pootle. commit ad156d47043f5a515977374cad48ddf6129bc152 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:26 2011 +0200 Translation update done using Pootle. commit d1b812f0bb5c8bc57bf059a559739bfabfe43bcf Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:21 2011 +0200 Translation update done using Pootle. commit e14022efcc161d2bff26287e8bfa6e9eb25cad53 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:18 2011 +0200 Translation update done using Pootle. commit 7a817143aedc2f6c9925330508da5ad718426ab3 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:15 2011 +0200 Translation update done using Pootle. commit 9b8641bbcfa8aae49ea6bcb409b99030c81ec39f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:11 2011 +0200 Translation update done using Pootle. commit f65350aa55d40fcc6201e052dd0d591fdf354684 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:08 2011 +0200 Translation update done using Pootle. commit 1b5a61a89d011c730dcfe63228d9869047388ab7 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Thu Aug 18 22:37:02 2011 +0200 Translation update done using Pootle. commit fa3f55e086c864d6b5abc63103d79cddb4f124d9 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:10:53 2011 +0200 Translation update done using Pootle. commit 8c7a2a418dce68c1fb5869a74b099d31e7495877 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:09:54 2011 +0200 Translation update done using Pootle. commit ab5fb53098d07a48fcb73fedf7ec40428e858d0d Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:09:38 2011 +0200 Translation update done using Pootle. commit d967cd95b9c8b08a0acb3ec740f977abe4316374 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:09:20 2011 +0200 Translation update done using Pootle. commit 7b0ee1f98e05aa0a4028e58157cba07572ce7e36 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:09:10 2011 +0200 Translation update done using Pootle. commit b062112d3fede536e6c7ce3653176e0097340a2a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:08:44 2011 +0200 Translation update done using Pootle. commit dd8b6b1f619e756d69d88559ec77fee249a16b9e Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:06:29 2011 +0200 Translation update done using Pootle. commit e2a10ea57e87c839ad24c19caa69c8706feaf58c Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:05:55 2011 +0200 Translation update done using Pootle. commit 019a64c03485439bd5259207e405874acbe0fa94 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:05:41 2011 +0200 Translation update done using Pootle. commit 2ae1dd4d18ff276b04fc3943b082abe73188d5aa Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:05:25 2011 +0200 Translation update done using Pootle. commit f5d643fb23ba600f5f528f05212a40b53fb50ad3 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:04:33 2011 +0200 Translation update done using Pootle. commit a472784e80fca05b1e0d220243fef9134a82f278 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:03:16 2011 +0200 Translation update done using Pootle. commit 2f3d4439b6b64d646c944baccdb9a1477ac4e7ce Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:03:09 2011 +0200 Translation update done using Pootle. commit 5f927b658440297ecb9e6a8a0ae77f1f6225533a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:58 2011 +0200 Translation update done using Pootle. commit d96530b4b6e44094aa8e7504a8ad273005a2ad2a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:31 2011 +0200 Translation update done using Pootle. commit 660eda0aa6a8d92aee802aaef2331c7bcb2a3bd0 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:15 2011 +0200 Translation update done using Pootle. commit 12495bf010f0ece83f93e47c9c0f44fb00e37523 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:12 2011 +0200 Translation update done using Pootle. commit ff62e7687a9f122f633e9c7775304e92edda6d5a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:07 2011 +0200 Translation update done using Pootle. commit a317eafbc3c17bdd386572a219178f8f2e67ff9a Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:02:02 2011 +0200 Translation update done using Pootle. commit 830d5bf7cc4851542296d9308142a840818ab1e3 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:01:49 2011 +0200 Translation update done using Pootle. commit 98de725b80b384a0f644f87a344b46d37ce9bb7f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Aug 18 20:00:22 2011 +0200 Translation update done using Pootle. commit 9e72f2ff196d068a051a96497b9a9b1a8db36082 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:36:59 2011 +0200 Translation update done using Pootle. commit 43ff3852dd132c08943ddeff1c46613c691b0fdd Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:36:22 2011 +0200 Translation update done using Pootle. commit 3d8939dbcdd13bb24a6bbdf260566b54f1176b0e Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:36:02 2011 +0200 Translation update done using Pootle. commit e25547ee6fb61d23cc9b61fbc0de3d919c0d1be4 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:35:33 2011 +0200 Translation update done using Pootle. commit 5e0eba45f314accab620d98cbe305cd91f655950 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:35:17 2011 +0200 Translation update done using Pootle. commit 3b81da6e3684888fa10e8545c76e789d04234941 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:34:00 2011 +0200 Translation update done using Pootle. commit 41386b87f562563ea9683cd96faca48c9859a6bd Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:33:53 2011 +0200 Translation update done using Pootle. commit 788241c3f8f80eaba7c1cf45200596e8109c1771 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:33:34 2011 +0200 Translation update done using Pootle. commit 6aff680e4c59e5da6f3bce833b8adaee7f2f8ba2 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:33:25 2011 +0200 Translation update done using Pootle. commit 642159db368e9ccf63d68426e1f435b62bf0323e Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:33:08 2011 +0200 Translation update done using Pootle. commit 08d8416c85ae86a2989617618d98bfb9f15c09cf Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:32:50 2011 +0200 Translation update done using Pootle. commit f7f312eb399f1aface7a3bbf13bd39810906dba4 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:32:22 2011 +0200 Translation update done using Pootle. commit c29f50d562ddd5820f8c5033fe62d1153d05b640 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:32:14 2011 +0200 Translation update done using Pootle. commit d64439ba1991101581fad726a7851ff1fac0c490 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:31:24 2011 +0200 Translation update done using Pootle. commit e9338dbb9c5cfe71177ae81b9bddbe0d03d47c40 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:31:12 2011 +0200 Translation update done using Pootle. commit b6b21af405496e3b12734ac9653af03c4c3f575e Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:30:05 2011 +0200 Translation update done using Pootle. commit 73df898bdf7dfbb5be4c078ff4ae6623531c2950 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:29:56 2011 +0200 Translation update done using Pootle. commit ca6a5315deaa68007d64e5d158c6b97411254d29 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:29:50 2011 +0200 Translation update done using Pootle. commit 0fda6a558178f554fd0c7f7b304fe58e6dbb53c8 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:29:38 2011 +0200 Translation update done using Pootle. commit 1126128143fa51af10a0b01ea1c8b413b998181b Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:29:13 2011 +0200 Translation update done using Pootle. commit 0b225ab17ab14b23251ec190dfd71422454381cc Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:29:01 2011 +0200 Translation update done using Pootle. commit 41c8e7b9a20afa71b67467e883e1f7c84920b0e5 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:28:53 2011 +0200 Translation update done using Pootle. commit 64396743a16f1e8040a0f33b867444703a60a914 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:28:41 2011 +0200 Translation update done using Pootle. commit 172c48f410d93db707b8643c8410251b592caba9 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:26:42 2011 +0200 Translation update done using Pootle. commit ba51fe1500e07c514891a63fae59769dd356fdb6 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:26:17 2011 +0200 Translation update done using Pootle. commit e4c580aa613c4472754d3d457cb3a678a86257ce Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:26:07 2011 +0200 Translation update done using Pootle. commit db7f4797a9ed238e9cd2e7b8dd91124f3ac7bb17 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:25:48 2011 +0200 Translation update done using Pootle. commit 2329265d52c5d792f9d084d759a07e42b56a8806 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:25:37 2011 +0200 Translation update done using Pootle. commit 75331372a547045ed5d75d4e14900ba22c97edab Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:24:53 2011 +0200 Translation update done using Pootle. commit 98901983d582766c1c91c2da3d53415613a8404e Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:23:33 2011 +0200 Translation update done using Pootle. commit f570fce5ce0069f6ef8423b60578324d250c7a62 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:22:12 2011 +0200 Translation update done using Pootle. commit 9e9c62de622d0af4a44ca577d5d56447bf54fa54 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:21:29 2011 +0200 Translation update done using Pootle. commit 2cb5ff8a8a47e03ad19d625b75fbf8c7da7b970e Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:21:14 2011 +0200 Translation update done using Pootle. commit b3f048c2f2a9d938869d311164ef86e76f60fbd5 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:21:09 2011 +0200 Translation update done using Pootle. commit 342b765409386f6aa8729996487d04a0d7da21ff Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:20:57 2011 +0200 Translation update done using Pootle. commit f6a5e7ff0a87e36f026c78523d4d2dbdebc274f0 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:20:48 2011 +0200 Translation update done using Pootle. commit fd7f71b4ed290a3e530d73aaef4a890aec6fadd2 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:20:38 2011 +0200 Translation update done using Pootle. commit ccf3f5999db459d851a80ae14ac11f96c3f312f5 Author: Sven Strickroth <email(a)cs-ware.de> Date: Thu Aug 18 18:20:11 2011 +0200 Translation update done using Pootle. commit 8be0226caf5915d81c4e52c031fb462d25eb310a Merge: 25e0482 676b0cc Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 18 16:40:14 2011 +0200 Merge remote-tracking branch 'origin/master' commit 25e0482a4a4db8533adbce331bdd76037dc982a3 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Aug 18 14:54:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 4 +- po/br.po | 53 ++++++++++++++------------- po/de.po | 114 ++++++++++++++++++++++++++++------------------------------- po/en_GB.po | 49 +++++++++++-------------- po/es.po | 86 ++++++++++++++++++++++++-------------------- 5 files changed, 152 insertions(+), 154 deletions(-) diff --git a/po/bg.po b/po/bg.po index 0d170e6..da6966a 100644 --- a/po/bg.po +++ b/po/bg.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-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-07-19 14:58+0200\n" +"PO-Revision-Date: 2011-08-18 14:54+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" @@ -6206,7 +6206,7 @@ msgstr "" #: libraries/export/sql.php:174 #, php-format msgid "Add %s statement" -msgstr "Ново заявление %s" +msgstr "Добавяне на заявление %s" #: libraries/export/sql.php:152 msgid "Add statements:" diff --git a/po/br.po b/po/br.po index 7701946..8e3b8cd 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-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-10 22:33+0200\n" +"PO-Revision-Date: 2011-08-18 20:10+0200\n" "Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -856,14 +856,14 @@ msgid "Dump has been saved to file %s." msgstr "Enrollet eo bet ar restr ezporzhiañ e%s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Talvoudoù evit ar bann \"%s\"" +msgstr "Talvoud evit ar bann \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Ober gant OpenStreetMaps evit ar gwiskad diazez" #: gis_data_editor.php:134 msgid "SRID" @@ -872,29 +872,28 @@ msgstr "" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 msgid "Geometry" -msgstr "" +msgstr "Mentoniezh" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Poent" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add constraints" msgid "Add a point" -msgstr "Ouzhpennañ ar strishadurioù" +msgstr "Ouzhpennañ ur poent" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy @@ -922,17 +921,16 @@ msgstr "" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Lieskorneg" #: gis_data_editor.php:300 js/messages.php:294 msgid "Add a polygon" -msgstr "" +msgstr "Ouzhpennañ ul lieskorneg" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Add user" msgid "Add geometry" -msgstr "Ouzhpennañ un implijer" +msgstr "Ouzhpennañ mentoniezh" #: gis_data_editor.php:312 msgid "" @@ -1172,7 +1170,7 @@ msgstr "Udb all" #. l10n: Thousands separator #: js/messages.php:75 libraries/common.lib.php:1359 msgid "," -msgstr "" +msgstr " " #. l10n: Decimal separator #: js/messages.php:77 libraries/common.lib.php:1361 @@ -1232,18 +1230,17 @@ msgid "" msgstr "" #: js/messages.php:96 -#, fuzzy #| msgid "Tracking is not active." msgid "Query cache efficiency" -msgstr "N'eo ket oberiant an heuliañ." +msgstr "Efeduster ar grubuilh rekedoù" #: js/messages.php:97 po/advisory_rules.php:70 msgid "Query cache usage" -msgstr "" +msgstr "Implij ar grubuilh rekedoù" #: js/messages.php:98 msgid "Query cache used" -msgstr "" +msgstr "Krubuilh rekedoù implijet" #: js/messages.php:100 msgid "System CPU Usage" @@ -1403,45 +1400,49 @@ msgstr "" #: js/messages.php:143 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "Reizhet eo bet long_query_time da %d eilenn." #: js/messages.php:144 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Lakaet e vo e pleustr dre-vras ar reizhadurioù da-heul hag adlakaet e vint " +"d'an talvoud dre ziouer pa adloc'ho ar servijer :" #. l10n: %s is FILE or TABLE #: js/messages.php:146 #, php-format msgid "Set log_output to %s" -msgstr "" +msgstr "Reizhañ log_output da %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:148 -#, fuzzy, php-format +#, php-format #| msgid "Enable Ajax" msgid "Enable %s" -msgstr "Gweredekaat Ajax" +msgstr "Gweredekaat %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:150 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Diweredekaet" +msgstr "Diweredekaat %s" #. l10n: %d seconds #: js/messages.php:152 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Reizhañ long_query_time da %ds" #: js/messages.php:153 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"N'hallit ket cheñch an arventennoù-mañ. Kevreit dindan root pe kit e " +"darempred gant merour ar servijer." #: js/messages.php:154 #, fuzzy diff --git a/po/de.po b/po/de.po index 3286d5c..1727775 100644 --- a/po/de.po +++ b/po/de.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-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-17 13:24+0200\n" -"Last-Translator: <franz.georg(a)neurieser.eu>\n" +"PO-Revision-Date: 2011-08-18 18:36+0200\n" +"Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -854,65 +854,69 @@ msgid "Dump has been saved to file %s." msgstr "Dump wurde in Datei %s gespeichert." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Werte für die Spalte \"%s\"" +msgstr "Wert für die Spalte \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" msgstr "Verwende OpenStreetMaps als Basis-Layer" #: gis_data_editor.php:134 +#, fuzzy msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 msgid "Geometry" -msgstr "Gestaltung" +msgstr "Geometrie" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Punkt" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Prozedur hinzufügen" +msgstr "Punkt hinzufügen" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Zeilen getrennt mit" +msgstr "Linestring" +# ist hiermit der Umkreis gemeint? http://de.wikipedia.org/wiki/Umkreis #: gis_data_editor.php:221 gis_data_editor.php:275 +#, fuzzy msgid "Outer Ring:" -msgstr "" +msgstr "Außenring:" +# Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 +#, fuzzy msgid "Inner Ring" -msgstr "" +msgstr "Innenring:" #: gis_data_editor.php:248 #, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Neuen Benutzer hinzufügen" +msgstr "Linestring hinzufügen" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy @@ -922,19 +926,18 @@ msgstr "Neuen Benutzer hinzufügen" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Spalte hinzufügen" +msgstr "Polygon hinzufügen" #: gis_data_editor.php:304 #, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Gestaltung" +msgstr "Geometrie hinzufügen" #: gis_data_editor.php:312 msgid "" @@ -1785,15 +1788,15 @@ msgstr "Jeder Punkt stellt eine Datenreihe dar" #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Das Überfliegen eines Punktes zeigt seine Bezeichnung." #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Mit gedrückter Maustaste eine Fläche aufziehen um hineinzuzoomen." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." -msgstr "" +msgstr "Auf \"Zoom zurücksetzen\" klicken um zum Original zurückzukehren." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." @@ -1809,13 +1812,12 @@ msgstr "" #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt." #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Spalten hinzufügen/entfernen" +msgstr "Zwei Spalten auswählen" #: js/messages.php:279 msgid "Select two different columns" @@ -1832,7 +1834,7 @@ msgstr "Kopieren" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Aussenring" #: js/messages.php:297 msgid "Add columns" @@ -1906,12 +1908,13 @@ msgstr "" msgid "" "You can also edit most columns<br />by clicking directly on their content." msgstr "" +"Sie können die meisten Spalten bearbeiten<br/>indem Sie auf den Inhalt " +"klicken." #: js/messages.php:319 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Gehe zum View" +msgstr "Gehe zur Verknüpfung" #: js/messages.php:322 msgid "Generate password" @@ -4957,16 +4960,14 @@ msgid "Show function fields" msgstr "Funktionsfelder anzeigen" #: libraries/config/messages.inc.php:462 -#, fuzzy #| msgid "Where to show the table row links" msgid "Whether to show hint or not" -msgstr "Wo die Datensatz-Links angezeigt werden sollen" +msgstr "Hinweise anzeigen" #: libraries/config/messages.inc.php:463 -#, fuzzy #| msgid "Show indexes" msgid "Show hint" -msgstr "Indexes anzeigen" +msgstr "Hinweis anzeigen" #: libraries/config/messages.inc.php:464 msgid "" @@ -6788,10 +6789,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "" #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Diese Seite enthält keine Tabellen!" +msgstr "Die importierte Datei enthält keine Daten" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" @@ -7322,7 +7322,7 @@ msgstr "Abfrage ausführen" #| msgid "Start" msgctxt "Start of recurring event" msgid "Start" -msgstr "Anfang" +msgstr "Start" #: libraries/rte/rte_events.lib.php:457 #, fuzzy @@ -8133,16 +8133,14 @@ msgid "Operator" msgstr "Operator" #: libraries/tbl_select.lib.php:143 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Suche" +msgstr "Tabellensuche" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Einfügen" +msgstr "Bearbeiten/Einfügen" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -9589,13 +9587,11 @@ msgid "Related links:" msgstr "Verwandte Links:" #: server_status.php:800 -#, fuzzy #| msgid "Query analyzer" msgid "Run analyzer" -msgstr "Query Analyzer" +msgstr "Analyse durchführen" #: server_status.php:801 -#, fuzzy #| msgid "Introduction" msgid "Instructions" msgstr "Einführung" @@ -10497,10 +10493,9 @@ msgid "" msgstr "" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Überwachung pausieren" +msgstr "Verwendung der Überwachung:" #: server_status.php:1510 #, fuzzy @@ -10519,16 +10514,15 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"<b>Verwendung der Überwachung:</b><br />OK, Sie sind bereit zum Starten! " -"Sobald Sie 'Überwachung starten' angeklickt haben, wird Ihr Browser in " -"regelmäßigen Intervallen alle angezeigten Diagramme aktualisieren. Unter " -"'Einstellungen' können Sie Diagramme hinzufügen und das " -"Aktualisierungsintervall ändern oder beliebige Diagramme entfernen, wenn Sie " -"das Zahnrad-Icon des entsprechenden Schaubilds verwenden.<p>Wenn Sie eine " -"plötzliche Spitze in der Aktivität feststellen, wählen Sie den " -"entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die linke " -"Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird " -"Statistiken aus den Protokollen laden um Sie bei der Auffindung der " +"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt " +"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten " +"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme " +"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme " +"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds " +"verwenden.<p>Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, " +"wählen Sie den entsprechenden Zeitraum in einem beliebigen Diagramm, indem " +"Sie die linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies " +"wird Statistiken aus den Protokollen laden um Sie bei der Auffindung der " "Aktivitätsspitze zu unterstützen.</p>" #: server_status.php:1512 @@ -10562,10 +10556,9 @@ msgstr "" #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "Bitte beachten Sie:" #: server_status.php:1521 -#, fuzzy #| msgid "" #| "<b>Please note:</b> Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10578,10 +10571,11 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"<b>Bitte beachten Sie:</b> Das Aktivieren des general_log kann die " -"Serverlast um 5-15% steigern. Seien Sie sich bewusst, dass das Erzeugen von " -"Statistiken aus den Logs ein sehr aufwändiger Prozess ist. Deshalb ist es " -"ratsam, nur einen kleinen Zeitraum auszuwählen." +"Das Aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien " +"Sie sich bewusst, dass das Erzeugen von Statistiken aus den Logs ein sehr " +"aufwändiger Prozess ist. Deshalb ist es ratsam, nur einen kleinen Zeitraum " +"auszuwählen und die gerneral_log nach der Überwachung wieder zu " +"deaktivieren." #: server_status.php:1533 #, fuzzy diff --git a/po/en_GB.po b/po/en_GB.po index c85eaa0..0d385b7 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-04 21:47+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2011-08-18 22:40+0200\n" +"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -416,10 +416,10 @@ msgid "You have to choose at least one column to display" msgstr "You have to choose at least one column to display" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "visual builder" +msgstr "Switch to %svisual builder%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:955 @@ -851,10 +851,10 @@ msgid "Dump has been saved to file %s." msgstr "Dump has been saved to file %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Values for the column \"%s\"" +msgstr "Value for the column \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" @@ -862,7 +862,7 @@ msgstr "Use OpenStreetMaps as Base Layer" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 @@ -872,72 +872,68 @@ msgstr "Geometry" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Point" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Add routine" +msgstr "Add a point" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Lines terminated by" +msgstr "Linestring" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Outer Ring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Inner Ring" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Add a new User" +msgstr "Add a linestring" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Add a new User" +msgstr "Add an inner ring" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Add column" +msgstr "Add a polygon" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometry" +msgstr "Add geometry" #: gis_data_editor.php:312 msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Chose \"GeomFromText\" from the \"Function\" column and paste the below string " +"into the \"Value\" field" #: import.php:57 #, php-format @@ -1211,10 +1207,9 @@ msgid "Query statistics" msgstr "Query statistics" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "Failed to read configuration file" +msgstr "Local monitor configuration incompatible" #: js/messages.php:94 msgid "" diff --git a/po/es.po b/po/es.po index 394a791..f14f230 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-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-16 21:46+0200\n" +"PO-Revision-Date: 2011-08-19 01:20+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -856,10 +856,10 @@ msgid "Dump has been saved to file %s." msgstr "El volcado ha sido guardado al archivo %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Valores para la columna \"%s\"" +msgstr "Valor para la columna \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" @@ -867,7 +867,7 @@ msgstr "Utilizar OpenStreetMaps como capa base" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 @@ -877,72 +877,68 @@ msgstr "Geometría" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 msgid "Point" -msgstr "" +msgstr "Punto" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:285 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "Agregar rutina" +msgstr "Agregar un punto" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Líneas terminadas en" +msgstr "Cadena de líneas" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Círculo exterior:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Círculo interior" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Agregar un nuevo usuario" +msgstr "Agregar una cadena de líneas" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Agregar un nuevo usuario" +msgstr "Agregar un círculo interior" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polígono" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Añadir columna" +msgstr "Agregar un polígono" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometría" +msgstr "Agregar geometría" #: gis_data_editor.php:312 msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Selecciones «GeomFromText» de la columna \"Función\" y pague la cadena ubicada " +"debajo en el campo \"Valor\"" #: import.php:57 #, php-format @@ -1223,10 +1219,9 @@ msgid "Query statistics" msgstr "Estadísticas de Consulta" #: js/messages.php:93 -#, fuzzy #| msgid "Local monitor configuration icompatible" msgid "Local monitor configuration incompatible" -msgstr "Configuración de monitorización local incompatible" +msgstr "Configuración local de monitorización incompatible" #: js/messages.php:94 msgid "" @@ -1825,7 +1820,7 @@ msgstr "Copiar" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Círculo exterior" #: js/messages.php:297 msgid "Add columns" @@ -2191,6 +2186,8 @@ msgstr "Segundo" #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" msgstr "" +"No se pudo dar formato a una cadena para la regla '%s'. PHP devolvió el " +"siguiente error: %s" #: libraries/Config.class.php:1159 msgid "Font size" @@ -6807,29 +6804,30 @@ msgstr "Importar monedas <i>(por ejemplo: $5.00 como 5.00)</i>" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "Archivo de forma ESRI" #: libraries/import/shp.php:254 #, php-format msgid "There was an error importing the ESRI shape file: \"%s\"." -msgstr "" +msgstr "Hubo un error importando el archivo de forma ESRI: \"%s\"." #: libraries/import/shp.php:310 msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Intentó importar un archivo no válido o el archivo importado contiene datos " +"inválidos" #: libraries/import/shp.php:312 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "La extensión espacial MySQL no soporta el tipo ESRI \"%s\"." #: libraries/import/shp.php:350 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Esta página no contiene ninguna tabla" +msgstr "El archivo importado no contiene datos" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" @@ -8163,10 +8161,9 @@ msgid "Table Search" msgstr "Búsqueda de tablas" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Insertar" +msgstr "Editar/Insertar" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -12274,12 +12271,13 @@ msgid "Query cache low memory prunes" msgstr "Reducciones al caché de consultas por falta de memoria" #: po/advisory_rules.php:91 -#, fuzzy #| msgid "The amount of free memory for query cache." msgid "" "Cached queries are removed due to low query cache memory from the query " "cache." -msgstr "La cantidad de memoria libre para el cache de consultas." +msgstr "" +"Las consultas en caché son eliminadas debido a la poca cantidad de memoria " +"de caché para el caché de consultas." #: po/advisory_rules.php:92 msgid "" @@ -12287,46 +12285,56 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" +"Podría llegar a querer aumentar «query_cache_size». Recuerde sin embargo que " +"la sobrecarga de mantener el caché es probable que aumente con su tamaño, " +"por lo que se recomienda hacerlo en pequeñas cantidades y monitorizar los " +"resultados." #: po/advisory_rules.php:93 msgid "" "The ratio of removed queries to inserted queries is %s%%. The lower this " "value is, the better (This rules firing limit: 0.1%)" msgstr "" +"La tasa de consultas eliminadas respecto de las agregadas es %s%%. Mejor es " +"mientras menor sea este valor (el límite de disparo de la regla es: 0.1%)" #: po/advisory_rules.php:95 -#, fuzzy #| msgid "Query cache" msgid "Query cache max size" -msgstr "Cache de consultas" +msgstr "Tamaño máximo del caché de consultas" #: po/advisory_rules.php:96 msgid "" "The query cache size is above 128 MiB. Big query caches may cause " "significant overhead that is required to maintain the cache." msgstr "" +"El tamaño del caché de consultas es mayor a 128 MiB. Grandes cachés pueden " +"causar grandes sobrecargas para manterlo." #: po/advisory_rules.php:97 msgid "" "Depending on your environment, it might be performance increasing to reduce " "this value." msgstr "" +"Dependiendo de su entorno, podría aumentar la performance reducir este " +"valor." #: po/advisory_rules.php:98 #, php-format msgid "Current query cache size: %s" -msgstr "" +msgstr "Tamaño del caché de consultas: %s" #: po/advisory_rules.php:100 -#, fuzzy #| msgid "Query results" msgid "Query cache min result size" -msgstr "Resultados de la Consulta" +msgstr "Tamaño mínimo de resultado en caché de consultas" #: po/advisory_rules.php:101 msgid "" "The max size of the result set in the query cache is the default of 1 MiB." msgstr "" +"El tamaño máximo del conjunto de resultados en el caché de consultas es el " +"valor predeterminado de 1 MiB." #: po/advisory_rules.php:102 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15704-g676b0cc
by Piotr Przybylski 18 Aug '11

18 Aug '11

The branch, master has been updated via 676b0cc925482a0662562fca485fb4064b228a7f (commit) via ceee6082378c61b4e13e406a461c3990ccc09788 (commit) via e08ce9450bc99da18f4d74333a7dcd35aa33618d (commit) from 9f476c85a819af1cda160256a443d31c35f9951d (commit) - Log ----------------------------------------------------------------- commit 676b0cc925482a0662562fca485fb4064b228a7f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 15:34:57 2011 +0200 Refactor initTableSorter and use it only when needed commit ceee6082378c61b4e13e406a461c3990ccc09788 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 15:21:17 2011 +0200 Tablesorter: don't apply widget twice during initialization commit e08ce9450bc99da18f4d74333a7dcd35aa33618d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 14:59:15 2011 +0200 Faster zebra widget for tablesorter, reduces processing time of status variables table from ~200ms to ~100ms ----------------------------------------------------------------------- Summary of changes: js/jquery/jquery.tablesorter.js | 6 ++- js/server_status.js | 69 +++++++++++++++++++++++--------------- js/server_status_monitor.js | 2 +- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/js/jquery/jquery.tablesorter.js b/js/jquery/jquery.tablesorter.js index e8e2323..909d947 100644 --- a/js/jquery/jquery.tablesorter.js +++ b/js/jquery/jquery.tablesorter.js @@ -826,9 +826,11 @@ // if user has supplied a sort list to constructor. if (config.sortList.length > 0) { $this.trigger("sorton", [config.sortList]); + } else { + // appendToTable used in sorton event already calls applyWidget + // apply widgets + applyWidget(this); } - // apply widgets - applyWidget(this); }); }; this.addParser = function (parser) { diff --git a/js/server_status.js b/js/server_status.js index 1d892e2..08d7679 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -43,7 +43,24 @@ $(function() { }, type: "numeric" }); - + // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check + jQuery.tablesorter.addWidget({ + id: "fast-zebra", + format: function (table) { + if (table.config.debug) { + var time = new Date(); + } + $("tr:even", table.tBodies[0]) + .removeClass(table.config.widgetZebra.css[0]) + .addClass(table.config.widgetZebra.css[1]); + $("tr:odd", table.tBodies[0]) + .removeClass(table.config.widgetZebra.css[1]) + .addClass(table.config.widgetZebra.css[0]); + if (table.config.debug) { + $.tablesorter.benchmark("Applying Fast-Zebra widget", time); + } + } + }); // Popup behaviour $('a[rel="popupLink"]').click( function() { @@ -456,6 +473,7 @@ $(function() { } } }); + initTableSorter(tab.attr('id')); break; case 'statustabs_allvars': @@ -463,43 +481,40 @@ $(function() { tab.find('.tabInnerContent').html(data); filterVariables(); } + initTableSorter(tab.attr('id')); break; } - - initTableSorter(tab.attr('id')); } + // TODO: tablesorter shouldn't sort already sorted columns function initTableSorter(tabid) { + var $table, opts; switch(tabid) { case 'statustabs_queries': - $('#serverstatusqueriesdetails').tablesorter({ - sortList: [[3, 1]], - widgets: ['zebra'], - headers: { - 1: { sorter: 'fancyNumber' }, - 2: { sorter: 'fancyNumber' } - } - }); - - $('#serverstatusqueriesdetails tr:first th') - .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); - + $table = $('#serverstatusqueriesdetails'); + opts = { + sortList: [[3, 1]], + widgets: ['fast-zebra'], + headers: { + 1: { sorter: 'fancyNumber' }, + 2: { sorter: 'fancyNumber' } + } + }; break; - case 'statustabs_allvars': - $('#serverstatusvariables').tablesorter({ - sortList: [[0, 0]], - widgets: ['zebra'], - headers: { - 1: { sorter: 'fancyNumber' } - } - }); - - $('#serverstatusvariables tr:first th') - .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); - + $table = $('#serverstatusvariables'); + opts = { + sortList: [[0, 0]], + widgets: ['fast-zebra'], + headers: { + 1: { sorter: 'fancyNumber' } + } + }; break; } + $table.tablesorter(opts); + $table.find('tr:first th') + .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">'); } /* Filters the status variables by name/category/alert in the variables tab */ diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 7ac2498..fa0f28e 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1680,7 +1680,7 @@ $(function() { $('div#logTable table').tablesorter({ sortList: [[cols.length - 1, 1]], - widgets: ['zebra'] + widgets: ['fast-zebra'] }); $('div#logTable table thead th') hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15701-g9f476c8
by Piotr Przybylski 18 Aug '11

18 Aug '11

The branch, master has been updated via 9f476c85a819af1cda160256a443d31c35f9951d (commit) from 84cc7837f5da69c588f7503da0acc9512ff29619 (commit) - Log ----------------------------------------------------------------- commit 9f476c85a819af1cda160256a443d31c35f9951d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 14:19:51 2011 +0200 Server status: faster perceived page loading Tab initialization is moved to the moment when tab is selected. All other tabs are initialized after tabs are displayed ----------------------------------------------------------------------- Summary of changes: js/server_status.js | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/js/server_status.js b/js/server_status.js index bcb25b8..1d892e2 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -110,7 +110,13 @@ $(function() { cookie: { name: 'pma_serverStatusTabs', expires: 1 }, show: function(event, ui) { // Fixes line break in the menu bar when the page overflows and scrollbar appears - menuResize(); + menuResize(); + + // Initialize selected tab + if (!$(ui.tab.hash).data('init-done')) { + initTab($(ui.tab.hash), null); + } + // Load Server status monitor if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) { $('div#statustabs_charting').append( //PMA_messages['strLoadingMonitor'] + ' ' + @@ -143,8 +149,12 @@ $(function() { // Initialize each tab $('div.ui-tabs-panel').each(function() { - initTab($(this), null); - tabStatus[$(this).attr('id')] = 'static'; + var $tab = $(this); + tabStatus[$tab.attr('id')] = 'static'; + // Initialize tabs after browser catches up with previous changes and displays tabs + setTimeout(function() { + initTab($tab, null); + }, 0.5); }); // Handles refresh rate changing @@ -362,7 +372,7 @@ $(function() { }); $('#filterText').keyup(function(e) { - word = $(this).val().replace(/_/g, ' '); + var word = $(this).val().replace(/_/g, ' '); if (word.length == 0) { textFilter = null; @@ -389,6 +399,10 @@ $(function() { /* Adjust DOM / Add handlers to the tabs */ function initTab(tab, data) { + if ($(tab).data('init-done') && !data) { + return; + } + $(tab).data('init-done', true); switch(tab.attr('id')) { case 'statustabs_traffic': if (data != null) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15700-g84cc783
by Piotr Przybylski 18 Aug '11

18 Aug '11

The branch, master has been updated via 84cc7837f5da69c588f7503da0acc9512ff29619 (commit) from 24ffd3e1d30bb5ccb08cfcf7bce118fc11bbd65f (commit) - Log ----------------------------------------------------------------- commit 84cc7837f5da69c588f7503da0acc9512ff29619 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 13:39:06 2011 +0200 Use PMA_addDatepicker only when $.datetimepicker is defined, prevents JS error on server status page where timepicker.js is loaded on demand ----------------------------------------------------------------------- Summary of changes: js/functions.js | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 11e264e..54a08d5 100644 --- a/js/functions.js +++ b/js/functions.js @@ -685,10 +685,12 @@ $(document).ready(function() { /** * Add a date/time picker to each element that needs it */ - $('.datefield, .datetimefield').each(function() { - PMA_addDatepicker($(this)); - }); -}) + if ($.datetimepicker != undefined) { + $('.datefield, .datetimefield').each(function() { + PMA_addDatepicker($(this)); + }); + } +}); /** * True if last click is to check a row. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15699-g24ffd3e
by Piotr Przybylski 18 Aug '11

18 Aug '11

The branch, master has been updated via 24ffd3e1d30bb5ccb08cfcf7bce118fc11bbd65f (commit) from 3217f24df0d6891e3783ed8295bbc98dfebe909a (commit) - Log ----------------------------------------------------------------- commit 24ffd3e1d30bb5ccb08cfcf7bce118fc11bbd65f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 18 13:17:23 2011 +0200 Change sprites for .headerSortUp and .headerSortDown to match original phpMyAdmin behavior ----------------------------------------------------------------------- Summary of changes: themes/original/css/theme_right.css.php | 4 ++-- themes/pmahomme/css/theme_right.css.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 6ab3b1f..e97b1e9 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -279,10 +279,10 @@ button { img.sortableIcon { background-position: -1727px 0; } /* Same as s_asc */ -th.headerSortUp img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } +th.headerSortUp img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } /* Same as s_desc */ -th.headerSortDown img.sortableIcon { background-position: 0 -1528px; width: 11px; height: 9px; } +th.headerSortDown img.sortableIcon { background-position: 0 -1445px; width: 11px; height: 9px; } /* Fix position */ .ic_more { vertical-align: middle; } diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 589fa54..914ef0b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -462,10 +462,10 @@ select[multiple] { img.sortableIcon { background-position: -1812px 0; } /* Same as s_asc */ -th.headerSortUp img.sortableIcon { background-position: -1516px 0; } +th.headerSortUp img.sortableIcon { background-position: 0 0; } /* Same as s_desc */ -th.headerSortDown img.sortableIcon { background-position: 0 0; } +th.headerSortDown img.sortableIcon { background-position: -1516px 0; } /* Fix position */ .ic_more { vertical-align: middle; } hooks/post-receive -- phpMyAdmin

1 0