From de98961029477e1680805bb82d5d375d87420ebc Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 13:16:03 +0300 Subject: [PATCH 001/492] SQL pretty printer feature using the codemirror tokenizer. Replaced this with old pretty-printer regexp collection in query analyzer dialog. --- js/codemirror/mode/mysql/mysql.js | 49 ++++++-- js/functions.js | 148 +++++++++++++++++++++++- js/server_status_monitor.js | 27 +---- themes/original/css/theme_right.css.php | 2 +- themes/pmahomme/css/theme_right.css.php | 2 +- 5 files changed, 195 insertions(+), 33 deletions(-) diff --git a/js/codemirror/mode/mysql/mysql.js b/js/codemirror/mode/mysql/mysql.js index 657942d2cd..755e3ec85d 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 d1c554436c..d0ba6eb507 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1613,7 +1613,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) { @@ -1631,6 +1637,146 @@ 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] + "\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]; + 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 += " "; + } + 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/server_status_monitor.js b/js/server_status_monitor.js index 7ac2498810..c82eedeb57 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1688,33 +1688,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/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 83590f927d..8649d45e66 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2270,7 +2270,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: ; } span.cm-variable { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 805041939e..0b77c962eb 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2688,7 +2688,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: ; } span.cm-variable { From 917aa3e1825e4f86466a3c48c8c27f6cf4eb90ad Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 13:37:01 +0300 Subject: [PATCH 002/492] SQL Pretty printer: Uppercase for keywords --- js/functions.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/js/functions.js b/js/functions.js index d0ba6eb507..aac55a710e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1725,7 +1725,7 @@ function PMA_SQLPrettyPrint(string) // A subquery is starting if (i > 0 && newBlock == 'statement') { indentLevel++; - output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1] + "\n" + tabs(indentLevel + 1); + output += "\n" + tabs(indentLevel) + tokens[i][1] + ' ' + tokens[i+1][1].toUpperCase() + "\n" + tabs(indentLevel + 1); currentStatement = tokens[i+1][1]; i++; continue; @@ -1741,7 +1741,7 @@ function PMA_SQLPrettyPrint(string) statementPart = statements[currentStatement].indexOf(tokens[i][1]); if (statementPart != -1) { if (i > 0) output += "\n"; - output += tabs(indentLevel) + tokens[i][1]; + output += tabs(indentLevel) + tokens[i][1].toUpperCase(); output += "\n" + tabs(indentLevel + 1); lastStatementPart = tokens[i][1]; } @@ -1752,7 +1752,11 @@ function PMA_SQLPrettyPrint(string) && output.charAt(output.length -1) != ' ' ) { output += " "; } - output += tokens[i][1]; + 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 From 25e0482a4a4db8533adbce331bdd76037dc982a3 Mon Sep 17 00:00:00 2001 From: stoyanster Date: Thu, 18 Aug 2011 14:54:52 +0200 Subject: [PATCH 003/492] Translation update done using Pootle. --- po/bg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bg.po b/po/bg.po index 0d170e6ed6..da6966a965 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@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: \n" "Language-Team: bulgarian \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:" From dd36db9ca9b60da5196303e8a4aaaa0a50e2f177 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 17:31:27 +0300 Subject: [PATCH 004/492] Fix: Incorrect word filter regex for status variables --- js/server_status.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/server_status.js b/js/server_status.js index 08d7679530..c24c15b778 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -394,7 +394,7 @@ $(function() { if (word.length == 0) { textFilter = null; } - else textFilter = new RegExp("(^|_)" + word, 'i'); + else textFilter = new RegExp("(^| )" + word, 'i'); text = word; From 67f396a7b69f06a0c756ed5212470890082a317a Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 17:46:40 +0300 Subject: [PATCH 005/492] Fix: Correct sorting for status variable values --- js/server_status.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/js/server_status.js b/js/server_status.js index c24c15b778..594e8d9ed2 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>/); + 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", @@ -507,7 +520,7 @@ $(function() { sortList: [[0, 0]], widgets: ['fast-zebra'], headers: { - 1: { sorter: 'fancyNumber' } + 1: { sorter: 'withinSpanNumber' } } }; break; From de176a3da776c3b4c659f6670a4bf2ea0194fce3 Mon Sep 17 00:00:00 2001 From: Aris Feryanto Date: Fri, 19 Aug 2011 00:02:54 +0800 Subject: [PATCH 006/492] Fix wrong relative position introduced in commit 2fdfc4fc1e19971767368061694a76499ca97463 --- js/makegrid.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index aabe9b59cd..420344ddeb 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1614,9 +1614,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * Initialize grid ******************/ - // add relative position to table so that resize handlers are correctly positioned - $(t).css('position', 'relative'); - // wrap all data cells, except actions cell, with span $(t).find('th, td:not(:has(span))') .wrapInner(''); @@ -1658,6 +1655,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // add table class $(t).addClass('pma_table'); + // add relative position to global div so that resize handlers are correctly positioned + $(g.gDiv).css('position', 'relative'); + // link the global div $(t).before(g.gDiv); $(g.gDiv).append(t); From ba21b5f3a24c893506debeb2acffe472c92547ea Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 19:11:00 +0300 Subject: [PATCH 007/492] Commit 84cc7837f5da69c588f7503da0acc9512ff29619 broke the datetime picker for the monitor loading log dialog --- js/server_status_monitor.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index 94d38bea33..ed84879dca 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({ From ccf3f5999db459d851a80ae14ac11f96c3f312f5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:11 +0200 Subject: [PATCH 008/492] Translation update done using Pootle. --- po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 3286d5c0a6..85eaf060e8 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@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: \n" +"PO-Revision-Date: 2011-08-18 18:20+0200\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -854,10 +854,10 @@ 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" From fd7f71b4ed290a3e530d73aaef4a890aec6fadd2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:38 +0200 Subject: [PATCH 009/492] Translation update done using Pootle. --- po/de.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 85eaf060e8..707d1e1b11 100644 --- a/po/de.po +++ b/po/de.po @@ -864,8 +864,9 @@ 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 From f6a5e7ff0a87e36f026c78523d4d2dbdebc274f0 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:48 +0200 Subject: [PATCH 010/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 707d1e1b11..d0ee806a11 100644 --- a/po/de.po +++ b/po/de.po @@ -876,7 +876,7 @@ msgstr "Gestaltung" #: 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 From 342b765409386f6aa8729996487d04a0d7da21ff Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:20:57 +0200 Subject: [PATCH 011/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index d0ee806a11..7640f3a7d0 100644 --- a/po/de.po +++ b/po/de.po @@ -871,7 +871,7 @@ 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 From 1ca6ea0af2155b1188b0742ac67e49a061ee86ee Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 19:21:04 +0300 Subject: [PATCH 012/492] Better wording --- js/messages.php | 2 +- js/server_status_monitor.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 10beb0ad66..7bb7bd3fa1 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_monitor.js b/js/server_status_monitor.js index ed84879dca..e89f0488bd 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -1390,7 +1390,7 @@ $(function() { if (logData.numRows > 12) { $('div#logTable').prepend( '
' + - ' ' + PMA_messages['strFilters'] + '' + + ' ' + PMA_messages['strFiltersForLogTable'] + '' + '
' + ' ' + ' ' + From b3f048c2f2a9d938869d311164ef86e76f60fbd5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:09 +0200 Subject: [PATCH 013/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 7640f3a7d0..570906f96c 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:20+0200\n" +"PO-Revision-Date: 2011-08-18 18:21+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -881,7 +881,7 @@ 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 From 2cb5ff8a8a47e03ad19d625b75fbf8c7da7b970e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:14 +0200 Subject: [PATCH 014/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 570906f96c..40585a7960 100644 --- a/po/de.po +++ b/po/de.po @@ -886,7 +886,7 @@ 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 From 9e9c62de622d0af4a44ca577d5d56447bf54fa54 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:21:29 +0200 Subject: [PATCH 015/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 40585a7960..f26e2d4f05 100644 --- a/po/de.po +++ b/po/de.po @@ -890,10 +890,9 @@ 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 From f570fce5ce0069f6ef8423b60578324d250c7a62 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:22:12 +0200 Subject: [PATCH 016/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index f26e2d4f05..0e4c112c90 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:21+0200\n" +"PO-Revision-Date: 2011-08-18 18:22+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -898,7 +898,7 @@ msgstr "Punkt hinzufügen" #, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Zeilen getrennt mit" +msgstr "Linestring" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From 98901983d582766c1c91c2da3d53415613a8404e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:23:33 +0200 Subject: [PATCH 017/492] Translation update done using Pootle. --- po/de.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 0e4c112c90..763960b923 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:22+0200\n" +"PO-Revision-Date: 2011-08-18 18:23+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -900,9 +900,11 @@ msgstr "Punkt hinzufügen" msgid "Linestring" msgstr "Linestring" +# ist hiermit der Um-kreis gemeint? #: gis_data_editor.php:221 gis_data_editor.php:275 +#, fuzzy msgid "Outer Ring:" -msgstr "" +msgstr "Außenring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 75331372a547045ed5d75d4e14900ba22c97edab Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:24:53 +0200 Subject: [PATCH 018/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 763960b923..80750e95d4 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:23+0200\n" +"PO-Revision-Date: 2011-08-18 18:24+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -900,7 +900,7 @@ msgstr "Punkt hinzufügen" msgid "Linestring" msgstr "Linestring" -# ist hiermit der Um-kreis gemeint? +# 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:" From 2329265d52c5d792f9d084d759a07e42b56a8806 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:25:37 +0200 Subject: [PATCH 019/492] Translation update done using Pootle. --- po/de.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 80750e95d4..072351d98e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:24+0200\n" +"PO-Revision-Date: 2011-08-18 18:25+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -906,9 +906,11 @@ msgstr "Linestring" msgid "Outer Ring:" 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 From db7f4797a9ed238e9cd2e7b8dd91124f3ac7bb17 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:25:48 +0200 Subject: [PATCH 020/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 072351d98e..d281646c10 100644 --- a/po/de.po +++ b/po/de.po @@ -916,7 +916,7 @@ msgstr "Innenring:" #, 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 From e4c580aa613c4472754d3d457cb3a678a86257ce Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:07 +0200 Subject: [PATCH 021/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d281646c10..020c44b31d 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:25+0200\n" +"PO-Revision-Date: 2011-08-18 18:26+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -926,7 +926,7 @@ 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 From ba51fe1500e07c514891a63fae59769dd356fdb6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:17 +0200 Subject: [PATCH 022/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 020c44b31d..c6891538f4 100644 --- a/po/de.po +++ b/po/de.po @@ -929,10 +929,9 @@ msgid "Polygon" 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 From 172c48f410d93db707b8643c8410251b592caba9 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:26:42 +0200 Subject: [PATCH 023/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index c6891538f4..b1a53348b4 100644 --- a/po/de.po +++ b/po/de.po @@ -937,7 +937,7 @@ msgstr "Polygon hinzufügen" #, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Gestaltung" +msgstr "Geometrie hinzufügen" #: gis_data_editor.php:312 msgid "" From 64396743a16f1e8040a0f33b867444703a60a914 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:28:41 +0200 Subject: [PATCH 024/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index b1a53348b4..e725a99348 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:26+0200\n" +"PO-Revision-Date: 2011-08-18 18:28+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1788,7 +1788,7 @@ 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." From 41c8e7b9a20afa71b67467e883e1f7c84920b0e5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:28:53 +0200 Subject: [PATCH 025/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index e725a99348..29b8d8b6e6 100644 --- a/po/de.po +++ b/po/de.po @@ -1792,7 +1792,7 @@ 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." From 0b225ab17ab14b23251ec190dfd71422454381cc Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:01 +0200 Subject: [PATCH 026/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 29b8d8b6e6..c2aab43ae5 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:28+0200\n" +"PO-Revision-Date: 2011-08-18 18:29+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" From 1126128143fa51af10a0b01ea1c8b413b998181b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:13 +0200 Subject: [PATCH 027/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index c2aab43ae5..5ae14c9684 100644 --- a/po/de.po +++ b/po/de.po @@ -1796,7 +1796,7 @@ 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." From 0fda6a558178f554fd0c7f7b304fe58e6dbb53c8 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:38 +0200 Subject: [PATCH 028/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 5ae14c9684..6f2db99b46 100644 --- a/po/de.po +++ b/po/de.po @@ -1812,7 +1812,7 @@ 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 From ca6a5315deaa68007d64e5d158c6b97411254d29 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:50 +0200 Subject: [PATCH 029/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 6f2db99b46..07eb9a9c8c 100644 --- a/po/de.po +++ b/po/de.po @@ -1815,10 +1815,9 @@ msgid "Strings are converted into integer for plotting" 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 "2 Spalten auswählen" #: js/messages.php:279 msgid "Select two different columns" From 73df898bdf7dfbb5be4c078ff4ae6623531c2950 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:29:56 +0200 Subject: [PATCH 030/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 07eb9a9c8c..e2f5e44c5d 100644 --- a/po/de.po +++ b/po/de.po @@ -1817,7 +1817,7 @@ msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt." #: js/messages.php:278 #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "2 Spalten auswählen" +msgstr "Zwei Spalten auswählen" #: js/messages.php:279 msgid "Select two different columns" From b6b21af405496e3b12734ac9653af03c4c3f575e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:30:05 +0200 Subject: [PATCH 031/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index e2f5e44c5d..4675c32e18 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:29+0200\n" +"PO-Revision-Date: 2011-08-18 18:30+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1834,7 +1834,7 @@ msgstr "Kopieren" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Aussenring" #: js/messages.php:297 msgid "Add columns" From e9338dbb9c5cfe71177ae81b9bddbe0d03d47c40 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:31:12 +0200 Subject: [PATCH 032/492] Translation update done using Pootle. --- po/de.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 4675c32e18..44b9e79965 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:30+0200\n" +"PO-Revision-Date: 2011-08-18 18:31+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -1908,6 +1908,8 @@ msgstr "" msgid "" "You can also edit most columns
by clicking directly on their content." msgstr "" +"Sie können die meisten Spalten bearbeiten
indem Sie auf den Inhalt " +"klicken." #: js/messages.php:319 #, fuzzy From d64439ba1991101581fad726a7851ff1fac0c490 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:31:24 +0200 Subject: [PATCH 033/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 44b9e79965..44af756152 100644 --- a/po/de.po +++ b/po/de.po @@ -1912,10 +1912,9 @@ msgstr "" "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" From c29f50d562ddd5820f8c5033fe62d1153d05b640 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:14 +0200 Subject: [PATCH 034/492] Translation update done using Pootle. --- po/de.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 44af756152..d02fd8d247 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:31+0200\n" +"PO-Revision-Date: 2011-08-18 18:32+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -4960,10 +4960,9 @@ 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 From f7f312eb399f1aface7a3bbf13bd39810906dba4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:22 +0200 Subject: [PATCH 035/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d02fd8d247..6b984c0d1e 100644 --- a/po/de.po +++ b/po/de.po @@ -4965,10 +4965,9 @@ msgid "Whether to show hint or not" 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 "" From 08d8416c85ae86a2989617618d98bfb9f15c09cf Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:32:50 +0200 Subject: [PATCH 036/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 6b984c0d1e..53e8319ec0 100644 --- a/po/de.po +++ b/po/de.po @@ -6789,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:" From 642159db368e9ccf63d68426e1f435b62bf0323e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:08 +0200 Subject: [PATCH 037/492] Translation update done using Pootle. --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 53e8319ec0..694e4a9e76 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:32+0200\n" +"PO-Revision-Date: 2011-08-18 18:33+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -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 From 6aff680e4c59e5da6f3bce833b8adaee7f2f8ba2 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:25 +0200 Subject: [PATCH 038/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 694e4a9e76..1aa28e9f1a 100644 --- a/po/de.po +++ b/po/de.po @@ -8133,10 +8133,9 @@ 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 From 788241c3f8f80eaba7c1cf45200596e8109c1771 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:34 +0200 Subject: [PATCH 039/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 1aa28e9f1a..3eef27850c 100644 --- a/po/de.po +++ b/po/de.po @@ -8138,10 +8138,9 @@ msgid "Table Search" 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 "" From 41386b87f562563ea9683cd96faca48c9859a6bd Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:33:53 +0200 Subject: [PATCH 040/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 3eef27850c..57bb1ad2b1 100644 --- a/po/de.po +++ b/po/de.po @@ -9587,10 +9587,9 @@ 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 From 3b81da6e3684888fa10e8545c76e789d04234941 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:34:00 +0200 Subject: [PATCH 041/492] Translation update done using Pootle. --- po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 57bb1ad2b1..2af540a543 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:33+0200\n" +"PO-Revision-Date: 2011-08-18 18:34+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -9592,7 +9592,6 @@ msgid "Run analyzer" msgstr "Analyse durchführen" #: server_status.php:801 -#, fuzzy #| msgid "Introduction" msgid "Instructions" msgstr "Einführung" From 5e0eba45f314accab620d98cbe305cd91f655950 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:35:17 +0200 Subject: [PATCH 042/492] Translation update done using Pootle. --- po/de.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 2af540a543..ccd82bfc28 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:34+0200\n" +"PO-Revision-Date: 2011-08-18 18:35+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -10493,10 +10493,9 @@ msgid "" msgstr "" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Überwachung pausieren" +msgstr "Benutzung der Überwachung:" #: server_status.php:1510 #, fuzzy From e25547ee6fb61d23cc9b61fbc0de3d919c0d1be4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:35:33 +0200 Subject: [PATCH 043/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index ccd82bfc28..6982670d8b 100644 --- a/po/de.po +++ b/po/de.po @@ -10495,7 +10495,7 @@ msgstr "" #: server_status.php:1508 #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Benutzung der Überwachung:" +msgstr "Verwendung der Überwachung:" #: server_status.php:1510 #, fuzzy From 3d8939dbcdd13bb24a6bbdf260566b54f1176b0e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:02 +0200 Subject: [PATCH 044/492] Translation update done using Pootle. --- po/de.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/de.po b/po/de.po index 6982670d8b..9143cba918 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 18:35+0200\n" +"PO-Revision-Date: 2011-08-18 18:36+0200\n" "Last-Translator: Sven Strickroth \n" "Language-Team: german \n" "Language: de\n" @@ -10514,16 +10514,15 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Verwendung der Überwachung:
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.

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.

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.

" #: server_status.php:1512 From 43ff3852dd132c08943ddeff1c46613c691b0fdd Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:22 +0200 Subject: [PATCH 045/492] Translation update done using Pootle. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 9143cba918..6f4c7d2932 100644 --- a/po/de.po +++ b/po/de.po @@ -10556,7 +10556,7 @@ msgstr "" #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "Bitte beachten Sie:" #: server_status.php:1521 #, fuzzy From 9e72f2ff196d068a051a96497b9a9b1a8db36082 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 18 Aug 2011 18:36:59 +0200 Subject: [PATCH 046/492] Translation update done using Pootle. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 6f4c7d2932..1727775465 100644 --- a/po/de.po +++ b/po/de.po @@ -10559,7 +10559,6 @@ msgid "Please note:" msgstr "Bitte beachten Sie:" #: server_status.php:1521 -#, fuzzy #| msgid "" #| "Please note: Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10572,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 "" -"Bitte beachten Sie: 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 From 98de725b80b384a0f644f87a344b46d37ce9bb7f Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:00:22 +0200 Subject: [PATCH 047/492] Translation update done using Pootle. --- po/br.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/br.po b/po/br.po index 7701946651..f93be450cf 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@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:00+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -856,10 +856,10 @@ 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" From 830d5bf7cc4851542296d9308142a840818ab1e3 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:01:49 +0200 Subject: [PATCH 048/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index f93be450cf..c4fa5b2630 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:00+0200\n" +"PO-Revision-Date: 2011-08-18 20:01+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -863,7 +863,7 @@ 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" From a317eafbc3c17bdd386572a219178f8f2e67ff9a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:02 +0200 Subject: [PATCH 049/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index c4fa5b2630..5e6930c38c 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:01+0200\n" +"PO-Revision-Date: 2011-08-18 20:02+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -872,7 +872,7 @@ 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 From ff62e7687a9f122f633e9c7775304e92edda6d5a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:07 +0200 Subject: [PATCH 050/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 5e6930c38c..73f4a4ff19 100644 --- a/po/br.po +++ b/po/br.po @@ -877,7 +877,7 @@ 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 From 12495bf010f0ece83f93e47c9c0f44fb00e37523 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:12 +0200 Subject: [PATCH 051/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 73f4a4ff19..ec7cb72fcd 100644 --- a/po/br.po +++ b/po/br.po @@ -882,7 +882,7 @@ 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 From 660eda0aa6a8d92aee802aaef2331c7bcb2a3bd0 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:15 +0200 Subject: [PATCH 052/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ec7cb72fcd..1a52de9a61 100644 --- a/po/br.po +++ b/po/br.po @@ -887,7 +887,7 @@ 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 From d96530b4b6e44094aa8e7504a8ad273005a2ad2a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:31 +0200 Subject: [PATCH 053/492] Translation update done using Pootle. --- po/br.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 1a52de9a61..a7f4aeb7ac 100644 --- a/po/br.po +++ b/po/br.po @@ -891,10 +891,9 @@ 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 From 5f927b658440297ecb9e6a8a0ae77f1f6225533a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:02:58 +0200 Subject: [PATCH 054/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index a7f4aeb7ac..a8092276fb 100644 --- a/po/br.po +++ b/po/br.po @@ -921,7 +921,7 @@ 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" From 2f3d4439b6b64d646c944baccdb9a1477ac4e7ce Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:03:09 +0200 Subject: [PATCH 055/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index a8092276fb..4c93c332b1 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:02+0200\n" +"PO-Revision-Date: 2011-08-18 20:03+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -925,7 +925,7 @@ 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 From a472784e80fca05b1e0d220243fef9134a82f278 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:03:16 +0200 Subject: [PATCH 056/492] Translation update done using Pootle. --- po/br.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 4c93c332b1..1f2c6aeacc 100644 --- a/po/br.po +++ b/po/br.po @@ -928,10 +928,9 @@ msgid "Add a polygon" 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 "" From f5d643fb23ba600f5f528f05212a40b53fb50ad3 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:04:33 +0200 Subject: [PATCH 057/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 1f2c6aeacc..b193bc2426 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:03+0200\n" +"PO-Revision-Date: 2011-08-18 20:04+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1170,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 From 2ae1dd4d18ff276b04fc3943b082abe73188d5aa Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:25 +0200 Subject: [PATCH 058/492] Translation update done using Pootle. --- po/br.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/br.po b/po/br.po index b193bc2426..ce71ce9982 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:04+0200\n" +"PO-Revision-Date: 2011-08-18 20:05+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1230,10 +1230,9 @@ 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" From 019a64c03485439bd5259207e405874acbe0fa94 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:41 +0200 Subject: [PATCH 059/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index ce71ce9982..de28b5066c 100644 --- a/po/br.po +++ b/po/br.po @@ -1236,7 +1236,7 @@ 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" From e2a10ea57e87c839ad24c19caa69c8706feaf58c Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:05:55 +0200 Subject: [PATCH 060/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index de28b5066c..15b0fb989f 100644 --- a/po/br.po +++ b/po/br.po @@ -1240,7 +1240,7 @@ 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" From dd8b6b1f619e756d69d88559ec77fee249a16b9e Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:06:29 +0200 Subject: [PATCH 061/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 15b0fb989f..360ef84d29 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:05+0200\n" +"PO-Revision-Date: 2011-08-18 20:06+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1400,7 +1400,7 @@ 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 "" From b062112d3fede536e6c7ce3653176e0097340a2a Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:08:44 +0200 Subject: [PATCH 062/492] Translation update done using Pootle. --- po/br.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 360ef84d29..c16133f6fe 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:06+0200\n" +"PO-Revision-Date: 2011-08-18 20:08+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1407,6 +1407,8 @@ 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 From 7b0ee1f98e05aa0a4028e58157cba07572ce7e36 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:10 +0200 Subject: [PATCH 063/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index c16133f6fe..27b1bf5423 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:08+0200\n" +"PO-Revision-Date: 2011-08-18 20:09+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1414,7 +1414,7 @@ msgstr "" #: 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 From d967cd95b9c8b08a0acb3ec740f977abe4316374 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:20 +0200 Subject: [PATCH 064/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index 27b1bf5423..dfd6118f74 100644 --- a/po/br.po +++ b/po/br.po @@ -1418,10 +1418,10 @@ 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 From ab5fb53098d07a48fcb73fedf7ec40428e858d0d Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:38 +0200 Subject: [PATCH 065/492] Translation update done using Pootle. --- po/br.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/br.po b/po/br.po index dfd6118f74..bf704c3964 100644 --- a/po/br.po +++ b/po/br.po @@ -1425,10 +1425,10 @@ 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 From 8c7a2a418dce68c1fb5869a74b099d31e7495877 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:09:54 +0200 Subject: [PATCH 066/492] Translation update done using Pootle. --- po/br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index bf704c3964..290d75064a 100644 --- a/po/br.po +++ b/po/br.po @@ -1434,7 +1434,7 @@ msgstr "Diweredekaat %s" #: 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 "" From fa3f55e086c864d6b5abc63103d79cddb4f124d9 Mon Sep 17 00:00:00 2001 From: Fulup Date: Thu, 18 Aug 2011 20:10:53 +0200 Subject: [PATCH 067/492] Translation update done using Pootle. --- po/br.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/br.po b/po/br.po index 290d75064a..8e3b8cdb09 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 20:09+0200\n" +"PO-Revision-Date: 2011-08-18 20:10+0200\n" "Last-Translator: Fulup \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -1441,6 +1441,8 @@ 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 From cfa5ec283fe4993fa8dbcb031a218f43d6cadff8 Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 22:05:22 +0300 Subject: [PATCH 068/492] - Easy editing of byte values using kb,mb,gb - Keyboard shortcuts: Enter to save, Escape to cancel --- js/server_variables.js | 13 ++++++++++++- server_variables.php | 19 +++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/js/server_variables.js b/js/server_variables.js index 0ca530440f..cb4f8c3a02 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -173,9 +173,20 @@ function editVariable(link) // hide original content $cell.html(''); // put edit field and save/cancel link - $cell.prepend(''); + $cell.prepend('
'); $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 ca39a5ed4f..4c2086ab89 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. From 1b5a61a89d011c730dcfe63228d9869047388ab7 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:02 +0200 Subject: [PATCH 069/492] Translation update done using Pootle. --- po/en_GB.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c85eaa077b..81920b9aa9 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@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 \n" +"PO-Revision-Date: 2011-08-18 22:37+0200\n" +"Last-Translator: Robert Readman \n" "Language-Team: english-gb \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 From f65350aa55d40fcc6201e052dd0d591fdf354684 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:08 +0200 Subject: [PATCH 070/492] Translation update done using Pootle. --- po/en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 81920b9aa9..a30b979ec4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -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" From 9b8641bbcfa8aae49ea6bcb409b99030c81ec39f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:11 +0200 Subject: [PATCH 071/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a30b979ec4..5ed131f6bd 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -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 From 7a817143aedc2f6c9925330508da5ad718426ab3 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:15 +0200 Subject: [PATCH 072/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 5ed131f6bd..c6ad41433d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -872,7 +872,7 @@ 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 From e14022efcc161d2bff26287e8bfa6e9eb25cad53 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:18 +0200 Subject: [PATCH 073/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index c6ad41433d..a97154e47c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -877,7 +877,7 @@ 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 From d1b812f0bb5c8bc57bf059a559739bfabfe43bcf Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:21 +0200 Subject: [PATCH 074/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a97154e47c..d4064cfa4a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -882,7 +882,7 @@ 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 From ad156d47043f5a515977374cad48ddf6129bc152 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:26 +0200 Subject: [PATCH 075/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index d4064cfa4a..7e5e8ae1a1 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -886,10 +886,9 @@ 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 From e17bc6cb6ca851747f14600252def380f060b3c9 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:34 +0200 Subject: [PATCH 076/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 7e5e8ae1a1..0361df0a09 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -891,10 +891,9 @@ msgid "Add a point" 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:" From 6c10ef3ddc150257ed3ff28fba9c7dd88da6b055 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:37 +0200 Subject: [PATCH 077/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 0361df0a09..73167f8885 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -897,7 +897,7 @@ 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" From a6ef77d298010c7a36a7333bc9fdc3b038ad3780 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:41 +0200 Subject: [PATCH 078/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 73167f8885..c328b78084 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -901,7 +901,7 @@ 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 From b83f5ce6a45778479c8387e3ffca73bd5b561716 Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:44 +0200 Subject: [PATCH 079/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c328b78084..2f7a11b03d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -904,10 +904,9 @@ msgid "Inner Ring" 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 From b0db44d4516bdbb5137fe24fed3ba8cfc5ca1bfc Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:48 +0200 Subject: [PATCH 080/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 2f7a11b03d..fd4cdbb4c0 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -909,10 +909,9 @@ msgid "Add a linestring" 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" From 4281a1a4afa03e93ece3ed9a8efd951edb35252f Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:52 +0200 Subject: [PATCH 081/492] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index fd4cdbb4c0..c7026f5e2f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -915,7 +915,7 @@ 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 From 1b9d104a90cf601ad7b0f3d73877b01b2c84457a Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:37:55 +0200 Subject: [PATCH 082/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index c7026f5e2f..92dca6d7a4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -918,10 +918,9 @@ msgid "Polygon" 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 From e779b6d8d770d336340f69755941e2323d76453c Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:38:05 +0200 Subject: [PATCH 083/492] Translation update done using Pootle. --- po/en_GB.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 92dca6d7a4..a4f0ebef53 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 22:37+0200\n" +"PO-Revision-Date: 2011-08-18 22:38+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -923,10 +923,9 @@ msgid "Add a polygon" 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 "" From f8b1c96eb5a773e774e74e8e66d2137798f8550e Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:40:06 +0200 Subject: [PATCH 084/492] Translation update done using Pootle. --- po/en_GB.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index a4f0ebef53..5b6d84416d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 22:38+0200\n" +"PO-Revision-Date: 2011-08-18 22:40+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -932,6 +932,8 @@ 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 From 59ad6b06c8dabf62a22d89b3c26fcdb2674176cf Mon Sep 17 00:00:00 2001 From: Robert Readman Date: Thu, 18 Aug 2011 22:40:16 +0200 Subject: [PATCH 085/492] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 5b6d84416d..0d385b7d6b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1207,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 "" From 1e84e4c4c14fe2bb0a2f265994cf51daed9da538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:00 +0200 Subject: [PATCH 086/492] Translation update done using Pootle. --- po/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 394a791071..53ab45104b 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@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 00:55+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \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" From 1539119bc85ca7312fecc46cc97b3f33354d0a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:15 +0200 Subject: [PATCH 087/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 53ab45104b..67c72d6a03 100644 --- a/po/es.po +++ b/po/es.po @@ -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 From 8e586dac89f4a81f717145f9b3962ac533498dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:21 +0200 Subject: [PATCH 088/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 67c72d6a03..786fd59c1f 100644 --- a/po/es.po +++ b/po/es.po @@ -877,7 +877,7 @@ 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 From fda3f52d1ec0dbb84300d09f69fccc602837a6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:25 +0200 Subject: [PATCH 089/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 786fd59c1f..44c19bf643 100644 --- a/po/es.po +++ b/po/es.po @@ -882,7 +882,7 @@ 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 From 1e23bb4366df7b9748586bc3e59db9e176a38403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:27 +0200 Subject: [PATCH 090/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 44c19bf643..12db5dbace 100644 --- a/po/es.po +++ b/po/es.po @@ -887,7 +887,7 @@ 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 From 6d41dc4b4a7f68b11eeb79788521b58bc15a34ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:55:33 +0200 Subject: [PATCH 091/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 12db5dbace..05f855b020 100644 --- a/po/es.po +++ b/po/es.po @@ -891,10 +891,9 @@ 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 From a5bd138d5d7947fe053ebcbb18668babb82fb757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:02 +0200 Subject: [PATCH 092/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 05f855b020..798f7d99e0 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:55+0200\n" +"PO-Revision-Date: 2011-08-19 00:56+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -896,10 +896,9 @@ msgid "Add a point" 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ínea" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From bb383ccb1fb1036e763318d687d0e770e90d10dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:17 +0200 Subject: [PATCH 093/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 798f7d99e0..959e9b0eee 100644 --- a/po/es.po +++ b/po/es.po @@ -902,7 +902,7 @@ msgstr "Cadena de línea" #: 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" From c5919522761463e4abde1fd81928e199e3871696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:25 +0200 Subject: [PATCH 094/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 959e9b0eee..d5cfd94bd2 100644 --- a/po/es.po +++ b/po/es.po @@ -906,7 +906,7 @@ 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 From fb400c4034c83e1a278816c2b169299df8d91ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:56:29 +0200 Subject: [PATCH 095/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index d5cfd94bd2..5279ca91b7 100644 --- a/po/es.po +++ b/po/es.po @@ -902,7 +902,7 @@ msgstr "Cadena de línea" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "Círculo exterior" +msgstr "Círculo exterior:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 2347a5458f50729c58b7a7e75030b1856be8eadf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:03 +0200 Subject: [PATCH 096/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 5279ca91b7..bb38f9de18 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:56+0200\n" +"PO-Revision-Date: 2011-08-19 00:57+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -898,7 +898,7 @@ msgstr "Agregar un punto" #: gis_data_editor.php:218 js/messages.php:287 #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Cadena de línea" +msgstr "Cadena de líneas" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From d456c4fb361b1e82cd3641ee201588327cc14c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:08 +0200 Subject: [PATCH 097/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index bb38f9de18..60a5310b95 100644 --- a/po/es.po +++ b/po/es.po @@ -909,10 +909,9 @@ msgid "Inner Ring" 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 From 9a1972565594d19d01b881dd852c24be9b915fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:16 +0200 Subject: [PATCH 098/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 60a5310b95..fafde8610d 100644 --- a/po/es.po +++ b/po/es.po @@ -914,10 +914,9 @@ msgid "Add a linestring" 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" From be8cd5978a733476db63e48f6aacdd7ce5c80533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:20 +0200 Subject: [PATCH 099/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index fafde8610d..7bdba839bb 100644 --- a/po/es.po +++ b/po/es.po @@ -920,7 +920,7 @@ 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 From 529fd302e8779c1e60b870d593abd8bf6fe3ce93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:26 +0200 Subject: [PATCH 100/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 7bdba839bb..105eb05a1b 100644 --- a/po/es.po +++ b/po/es.po @@ -923,10 +923,9 @@ msgid "Polygon" 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 From 60f054c3ee395f767958ef6e7c24eaeb192ac2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:57:35 +0200 Subject: [PATCH 101/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 105eb05a1b..4864ce4b3a 100644 --- a/po/es.po +++ b/po/es.po @@ -928,10 +928,9 @@ msgid "Add a polygon" 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 "" From 88140560e198d1b7210241405caa4c57a1ebbd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:31 +0200 Subject: [PATCH 102/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 4864ce4b3a..85be370967 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:57+0200\n" +"PO-Revision-Date: 2011-08-19 00:58+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -937,6 +937,8 @@ 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 From 6d8b54790f56e29decacab59a5bd80f2b1e9fd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:48 +0200 Subject: [PATCH 103/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 85be370967..7057f57ec9 100644 --- a/po/es.po +++ b/po/es.po @@ -1219,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 "" From 4acf467b69e0bdbc09d68e0c54a5fd04b5132d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 00:58:54 +0200 Subject: [PATCH 104/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7057f57ec9..8a377c1127 100644 --- a/po/es.po +++ b/po/es.po @@ -1820,7 +1820,7 @@ msgstr "Copiar" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Círculo exterior" #: js/messages.php:297 msgid "Add columns" From 1387307cfed4d227b3ac8b34c838b57239b3d972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:06:28 +0200 Subject: [PATCH 105/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 8a377c1127..d274f550d8 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 00:58+0200\n" +"PO-Revision-Date: 2011-08-19 01:06+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -2186,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" From 4941ab5b59cc4edfb030ef36fa9b46f31858969b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:07:17 +0200 Subject: [PATCH 106/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index d274f550d8..b3074e2c47 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:06+0200\n" +"PO-Revision-Date: 2011-08-19 01:07+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6804,7 +6804,7 @@ msgstr "Importar monedas (por ejemplo: $5.00 como 5.00)" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "Archivo de forma ESRI" #: libraries/import/shp.php:254 #, php-format From fb8b1f01fe135a1295cba450ca53eac13b937748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:08:10 +0200 Subject: [PATCH 107/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index b3074e2c47..7fc2be06dc 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:07+0200\n" +"PO-Revision-Date: 2011-08-19 01:08+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6809,7 +6809,7 @@ 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 "" From 5bba25d1be446d6c74206425c86745a2dd01a704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:09:34 +0200 Subject: [PATCH 108/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7fc2be06dc..190854ecfa 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:08+0200\n" +"PO-Revision-Date: 2011-08-19 01:09+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6816,6 +6816,8 @@ 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 From b5c62a8818314302e642e7b83f21ac96b0796218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:11:34 +0200 Subject: [PATCH 109/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 190854ecfa..ab1e235a26 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:09+0200\n" +"PO-Revision-Date: 2011-08-19 01:11+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6822,7 +6822,7 @@ msgstr "" #: 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 From 1487e8dff13f68a5a4753bc27a2dff17f38ebad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:05 +0200 Subject: [PATCH 110/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index ab1e235a26..27372fd8f1 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:11+0200\n" +"PO-Revision-Date: 2011-08-19 01:12+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -6825,10 +6825,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." 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:" From ab5155fed30bbd4f585910c6cad7249fbe9cb50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:14 +0200 Subject: [PATCH 111/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 27372fd8f1..9bb30102ee 100644 --- a/po/es.po +++ b/po/es.po @@ -8161,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 "" From 1073f6dd0ad4d32d6850df337d7db0a5d94b2d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:12:55 +0200 Subject: [PATCH 112/492] Translation update done using Pootle. --- po/es.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 9bb30102ee..7f9017e742 100644 --- a/po/es.po +++ b/po/es.po @@ -12271,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 "" From f69a04bb90aa12d9921ff1bddf637df4193bdfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:14:18 +0200 Subject: [PATCH 113/492] Translation update done using Pootle. --- po/es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7f9017e742..5d9f780f9a 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:12+0200\n" +"PO-Revision-Date: 2011-08-19 01:14+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12285,6 +12285,10 @@ 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 "" From 4125abd459db8a8e8b460e554c554105085ec6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:17 +0200 Subject: [PATCH 114/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 5d9f780f9a..709d102386 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:14+0200\n" +"PO-Revision-Date: 2011-08-19 01:16+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12295,6 +12295,8 @@ 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 From 7e210372b2a89fbf3622799df62fe26c586778c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:29 +0200 Subject: [PATCH 115/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 709d102386..e3490035c4 100644 --- a/po/es.po +++ b/po/es.po @@ -12299,10 +12299,9 @@ msgstr "" "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 "" From ace483fe9de1c23c6179fa52b0933045a73477e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:16:36 +0200 Subject: [PATCH 116/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index e3490035c4..bc301d83fc 100644 --- a/po/es.po +++ b/po/es.po @@ -12301,7 +12301,7 @@ msgstr "" #: po/advisory_rules.php:95 #| msgid "Query cache" msgid "Query cache max size" -msgstr "Tamaño máximo del caché de consultas." +msgstr "Tamaño máximo del caché de consultas" #: po/advisory_rules.php:96 msgid "" From dfd707f445ed01404fad6b4a7511d755b3fb4692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:17:27 +0200 Subject: [PATCH 117/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index bc301d83fc..83b68b0c99 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:16+0200\n" +"PO-Revision-Date: 2011-08-19 01:17+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12308,6 +12308,8 @@ 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 "" From 6d279568bca8e72dbbd007a385f379b7d34bc372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:18:50 +0200 Subject: [PATCH 118/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 83b68b0c99..6024513125 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:17+0200\n" +"PO-Revision-Date: 2011-08-19 01:18+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12316,6 +12316,8 @@ 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 From 05917283064b13e7b27728e8212578cd61a2baab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:19:07 +0200 Subject: [PATCH 119/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 6024513125..0c63d1c64d 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:18+0200\n" +"PO-Revision-Date: 2011-08-19 01:19+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12322,7 +12322,7 @@ msgstr "" #: 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 From 850c187504f285b95757b10ba2ffcfb30dba4d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:19:48 +0200 Subject: [PATCH 120/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 0c63d1c64d..8fc356cd43 100644 --- a/po/es.po +++ b/po/es.po @@ -12325,10 +12325,9 @@ msgid "Current query cache size: %s" 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 "" From fd60f78d3bfc0822c7a0c13330e9375ab2abfbb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 01:20:47 +0200 Subject: [PATCH 121/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 8fc356cd43..f14f230476 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:19+0200\n" +"PO-Revision-Date: 2011-08-19 01:20+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12333,6 +12333,8 @@ msgstr "Tamaño mínimo de resultado en caché de consultas" 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 "" From 46262835b6eb88290fbe32eec53c71b2568360a4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:03:35 +0530 Subject: [PATCH 122/492] Only non-empty search values should go into where clause --- libraries/tbl_select.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index af97aa434e..bec997f871 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -342,7 +342,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $fields = ''; $w = $backquoted_name . ' ' . $func_type; - } elseif (in_array($types, PMA_getGISDatatypes())) { + } elseif (in_array($types, PMA_getGISDatatypes()) && ! empty($fields)) { // create gis data from the string $gis_data = PMA_createGISData($fields); $w = $backquoted_name . ' ' . $func_type . ' ' . $gis_data; From 337a153f33167f768b4809a7f7d000943bfea68b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:11:15 +0200 Subject: [PATCH 123/492] Translation update done using Pootle. --- po/ta.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 1a43107479..847aabfe93 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-14 22:35+0200\n" -"Last-Translator: சுரேஸ்குமார் செல்வநாயகம் \n" +"PO-Revision-Date: 2011-08-19 07:11+0200\n" +"Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -628,7 +628,7 @@ msgstr "" #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:543 msgid "Replication" -msgstr "" +msgstr "படியெடுத்தல்" #: db_structure.php:443 msgid "Sum" From 0ee6d85ac0ab883e216ead9656abdd421ca54600 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:11:57 +0200 Subject: [PATCH 124/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 847aabfe93..da2264150a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -632,7 +632,7 @@ msgstr "படியெடுத்தல்" #: db_structure.php:443 msgid "Sum" -msgstr "" +msgstr "கூட்டுத்தொகை" #: db_structure.php:450 libraries/StorageEngine.class.php:313 #, php-format From b735ceedcc40a921f23bf4e4f810e39e39e5a2b1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:12:26 +0200 Subject: [PATCH 125/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index da2264150a..97496a480e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:11+0200\n" +"PO-Revision-Date: 2011-08-19 07:12+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -671,7 +671,7 @@ msgstr "" #: server_privileges.php:1441 server_status.php:1485 #: setup/frames/menu.inc.php:21 msgid "Export" -msgstr "" +msgstr "ஏற்றுமதி" #: db_structure.php:500 db_structure.php:554 #: libraries/display_tbl.lib.php:2479 tbl_structure.php:609 From 2d4a4427ef861373065b8630d5d6b6377c425eb3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:42:57 +0530 Subject: [PATCH 126/492] Fix doc blocks --- libraries/tbl_select.lib.php | 137 +++++++++++++---------------------- 1 file changed, 51 insertions(+), 86 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index bec997f871..d97c12cb1e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -11,15 +11,14 @@ require_once 'url_generating.lib.php'; - /** - * PMA_tbl_setTitle() sets the title for foreign keys display link +/** + * Sets the title for foreign keys display link. * - * @param $propertiesIconic Type of icon property - * @param $themeImage Icon Image - * @return string $str Value of the Title + * @param mixed $propertiesIconic Type of icon property + * @param string $pmaThemeImage Icon Image * + * @return string $str Value of the Title */ - function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ if ($propertiesIconic == true) { $str = '\n" "Language-Team: Tamil \n" "Language: ta\n" @@ -681,7 +681,7 @@ msgstr "" #: db_structure.php:504 libraries/common.lib.php:3120 #: libraries/common.lib.php:3121 msgid "Empty" -msgstr "" +msgstr "வெறுமை" #: db_structure.php:506 db_tracking.php:104 libraries/Index.class.php:482 #: libraries/common.lib.php:3118 libraries/common.lib.php:3119 From 911133640d3c6f05ab2804f4871f5dbec2edaa72 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:13:59 +0200 Subject: [PATCH 128/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 9a2c57b44a..2d72e2e186 100644 --- a/po/ta.po +++ b/po/ta.po @@ -688,7 +688,7 @@ msgstr "வெறுமை" #: server_databases.php:265 tbl_structure.php:151 tbl_structure.php:152 #: tbl_structure.php:570 msgid "Drop" -msgstr "" +msgstr "அழி" #: db_structure.php:508 tbl_operations.php:608 msgid "Check table" From 0741a534017d2df65208eb1d288a079a84c76dc8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:44:33 +0530 Subject: [PATCH 129/492] Remove tab characters --- libraries/tbl_select.lib.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index d97c12cb1e..d14db6cc21 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -22,16 +22,16 @@ require_once 'url_generating.lib.php'; function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ if ($propertiesIconic == true) { $str = '' . __('Browse foreign values') . ''; + .'b_browse.png" alt="' . __('Browse foreign values') . '" title="' + . __('Browse foreign values') . '" />'; - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); + if ($propertiesIconic === 'both') { + $str .= __('Browse foreign values'); return $str; - } - } else { - return __('Browse foreign values'); - } + } + } else { + return __('Browse foreign values'); + } } /** @@ -113,7 +113,7 @@ return ' - + '; @@ -184,19 +184,19 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= '' ; + $str .= '' ; } else{ - $str .= '' ; + $str .= '' ; } ?> - '; + '; // ' . str_replace("'", "\'", $titles['Browse']) . ''; From abfe0e672ca1e595f171492e430112b76041d768 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:14:46 +0200 Subject: [PATCH 130/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 2d72e2e186..e76fad6bf7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:13+0200\n" +"PO-Revision-Date: 2011-08-19 07:14+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -743,7 +743,7 @@ msgstr "" #: db_tracking.php:86 msgid "Last version" -msgstr "" +msgstr "இறுதி பதிப்பு" #: db_tracking.php:87 tbl_tracking.php:636 msgid "Created" From 8605dca1e36e22d5073d90321cccb8cec8163a2c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:15:03 +0200 Subject: [PATCH 131/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e76fad6bf7..98785ff360 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:14+0200\n" +"PO-Revision-Date: 2011-08-19 07:15+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -747,7 +747,7 @@ msgstr "இறுதி பதிப்பு" #: db_tracking.php:87 tbl_tracking.php:636 msgid "Created" -msgstr "" +msgstr "உருவாக்கப்பட்டது" #: db_tracking.php:88 tbl_tracking.php:637 msgid "Updated" From 9674582c19989c398065e8f3bdadd87cb88edce8 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:15:21 +0200 Subject: [PATCH 132/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 98785ff360..6c48b4c963 100644 --- a/po/ta.po +++ b/po/ta.po @@ -751,7 +751,7 @@ msgstr "உருவாக்கப்பட்டது" #: db_tracking.php:88 tbl_tracking.php:637 msgid "Updated" -msgstr "" +msgstr "புதுப்பிக்கப்பட்டது" #: db_tracking.php:89 libraries/rte/rte_events.lib.php:380 #: libraries/rte/rte_list.lib.php:67 libraries/server_links.inc.php:51 From f9bf42987bc8703ed3a2780afe902c37e207b800 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:15:38 +0200 Subject: [PATCH 133/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6c48b4c963..a12d9ee165 100644 --- a/po/ta.po +++ b/po/ta.po @@ -757,7 +757,7 @@ msgstr "புதுப்பிக்கப்பட்டது" #: libraries/rte/rte_list.lib.php:67 libraries/server_links.inc.php:51 #: server_status.php:1121 sql.php:880 tbl_tracking.php:638 msgid "Status" -msgstr "" +msgstr "தகுநிலை" #: db_tracking.php:90 libraries/Index.class.php:430 #: libraries/db_structure.lib.php:39 libraries/rte/rte_list.lib.php:52 From d19759ac48fb984ecbe7e557858e1eab750a4c75 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:16:02 +0200 Subject: [PATCH 134/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a12d9ee165..4dc8f5d495 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:15+0200\n" +"PO-Revision-Date: 2011-08-19 07:16+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -781,7 +781,7 @@ msgstr "" #: db_tracking.php:134 msgid "Versions" -msgstr "" +msgstr "பதிப்புக்கள்" #: db_tracking.php:135 tbl_tracking.php:400 tbl_tracking.php:667 msgid "Tracking report" From 1c0ffe3f2ddc4b4565a6dfd04df1ee5874d0ae14 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:18:31 +0200 Subject: [PATCH 135/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4dc8f5d495..b291d60e16 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:16+0200\n" +"PO-Revision-Date: 2011-08-19 07:18+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -622,7 +622,7 @@ msgstr "" #: db_structure.php:388 db_structure.php:402 libraries/header.inc.php:158 #: libraries/tbl_info.inc.php:60 tbl_structure.php:210 msgid "View" -msgstr "" +msgstr "நோக்கு" #: db_structure.php:439 libraries/db_structure.lib.php:35 #: libraries/server_links.inc.php:90 server_replication.php:31 From 067bfbe6553ff8219bad404ddd1932e3dc5f69a7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:18:57 +0200 Subject: [PATCH 136/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b291d60e16..e5502b1be3 100644 --- a/po/ta.po +++ b/po/ta.po @@ -651,7 +651,7 @@ msgstr "" #: server_databases.php:261 server_privileges.php:671 #: server_privileges.php:1754 tbl_structure.php:557 msgid "Check All" -msgstr "" +msgstr "அனைத்தையும் தெரி" #: db_structure.php:485 libraries/display_tbl.lib.php:2373 #: libraries/replication_gui.lib.php:35 server_databases.php:263 From 9ac81a17136c5e1c4234cb9d439d424a020fc3ac Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:19:26 +0200 Subject: [PATCH 137/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e5502b1be3..6746b6fc21 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:18+0200\n" +"PO-Revision-Date: 2011-08-19 07:19+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -676,7 +676,7 @@ msgstr "ஏற்றுமதி" #: db_structure.php:500 db_structure.php:554 #: libraries/display_tbl.lib.php:2479 tbl_structure.php:609 msgid "Print view" -msgstr "" +msgstr "அச்சுப் பார்வை" #: db_structure.php:504 libraries/common.lib.php:3120 #: libraries/common.lib.php:3121 From 6c8be3fbb0f186144309a0efbb57d1d18b90c2f1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:19:48 +0200 Subject: [PATCH 138/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6746b6fc21..df5b41b3e5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -692,7 +692,7 @@ msgstr "அழி" #: db_structure.php:508 tbl_operations.php:608 msgid "Check table" -msgstr "" +msgstr "அட்டவணையை சரிபார்" #: db_structure.php:510 tbl_operations.php:657 tbl_structure.php:810 msgid "Optimize table" From 5468eec3353c20e1006a9135771c900540e4fea2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:20:13 +0200 Subject: [PATCH 139/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index df5b41b3e5..be9d251029 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:19+0200\n" +"PO-Revision-Date: 2011-08-19 07:20+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -696,7 +696,7 @@ msgstr "அட்டவணையை சரிபார்" #: db_structure.php:510 tbl_operations.php:657 tbl_structure.php:810 msgid "Optimize table" -msgstr "" +msgstr "அட்டவணையை உகப்பாக்கு" #: db_structure.php:512 tbl_operations.php:644 msgid "Repair table" From 38ff75344cb6aed5d3673cd3c7983f1466bb8413 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:20:38 +0200 Subject: [PATCH 140/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index be9d251029..a272609f32 100644 --- a/po/ta.po +++ b/po/ta.po @@ -700,7 +700,7 @@ msgstr "அட்டவணையை உகப்பாக்கு" #: db_structure.php:512 tbl_operations.php:644 msgid "Repair table" -msgstr "" +msgstr "அட்டவணையை திருத்து" #: db_structure.php:514 tbl_operations.php:631 msgid "Analyze table" From e436499ebe58537801e74c32c4c4beaef8d68a82 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:21:18 +0200 Subject: [PATCH 141/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a272609f32..c28ca9223f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:20+0200\n" +"PO-Revision-Date: 2011-08-19 07:21+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -704,7 +704,7 @@ msgstr "அட்டவணையை திருத்து" #: db_structure.php:514 tbl_operations.php:631 msgid "Analyze table" -msgstr "" +msgstr "அட்டவணையை பகுப்பாய்" #: db_structure.php:516 msgid "Add prefix to table" From 7c0a1de8540d6e1a89f61dfd06595a2721524c29 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:21:41 +0200 Subject: [PATCH 142/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c28ca9223f..f801c21101 100644 --- a/po/ta.po +++ b/po/ta.po @@ -722,7 +722,7 @@ msgstr "" #: db_structure.php:560 libraries/schema/User_Schema.class.php:403 msgid "Data Dictionary" -msgstr "" +msgstr "தரவு அகராதி" #: db_tracking.php:79 msgid "Tracked tables" From 67a8128f9d4041426023240c45b3b33cbec8d5cf Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:22:01 +0200 Subject: [PATCH 143/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index f801c21101..7c684c40a4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:21+0200\n" +"PO-Revision-Date: 2011-08-19 07:22+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -739,7 +739,7 @@ msgstr "" #: server_synchronize.php:1248 server_synchronize.php:1252 #: tbl_tracking.php:633 msgid "Database" -msgstr "" +msgstr "தரவுத்தளம்" #: db_tracking.php:86 msgid "Last version" From b2c3c216ca4f7387bcb71cde87938943e42a68af Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:23:11 +0200 Subject: [PATCH 144/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 7c684c40a4..d81e7fc706 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:22+0200\n" +"PO-Revision-Date: 2011-08-19 07:23+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -773,7 +773,7 @@ msgstr "" #: db_tracking.php:119 tbl_tracking.php:590 tbl_tracking.php:648 msgid "active" -msgstr "" +msgstr "செயற்படு" #: db_tracking.php:121 tbl_tracking.php:592 tbl_tracking.php:650 msgid "not active" From 50fdda1ceb67d64d590e2c0aab0483cb74baffa1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:23:37 +0200 Subject: [PATCH 145/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d81e7fc706..63b76e1323 100644 --- a/po/ta.po +++ b/po/ta.po @@ -777,7 +777,7 @@ msgstr "செயற்படு" #: db_tracking.php:121 tbl_tracking.php:592 tbl_tracking.php:650 msgid "not active" -msgstr "" +msgstr "செயற்பாடற்ற" #: db_tracking.php:134 msgid "Versions" From e5d252ba548fa594b24c390030805b8ad73403d1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:25:11 +0200 Subject: [PATCH 146/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 63b76e1323..903b4b90b9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:23+0200\n" +"PO-Revision-Date: 2011-08-19 07:25+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" From 1e31068233d27f4c589d5bcfce22ff5224d2203c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:27:44 +0200 Subject: [PATCH 147/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 903b4b90b9..238c6de366 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:25+0200\n" +"PO-Revision-Date: 2011-08-19 07:27+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -645,7 +645,7 @@ msgstr "" #: server_databases.php:264 server_privileges.php:1751 tbl_structure.php:554 #: tbl_structure.php:563 msgid "With selected:" -msgstr "" +msgstr "உடன் தெரிவுசெய்யப்பட்டது" #: db_structure.php:481 libraries/display_tbl.lib.php:2372 #: server_databases.php:261 server_privileges.php:671 From 2e459d6a0fc9c67ab8adeff29e368e783c9ccad0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:28:25 +0200 Subject: [PATCH 148/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 238c6de366..1f6ac49c02 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:27+0200\n" +"PO-Revision-Date: 2011-08-19 07:28+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -818,7 +818,7 @@ msgstr "" #: enum_editor.php:67 gis_data_editor.php:311 msgid "Output" -msgstr "" +msgstr "வெளியிடு" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" From 99a1fa854afae50d426707c4b22ff2897159f997 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:28:59 +0200 Subject: [PATCH 149/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1f6ac49c02..c36f8b1ff0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -818,7 +818,7 @@ msgstr "" #: enum_editor.php:67 gis_data_editor.php:311 msgid "Output" -msgstr "வெளியிடு" +msgstr "வெளியீடு" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" From 3aff2614afeeb26567ad0adc21f831798f9411d8 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:29:36 +0200 Subject: [PATCH 150/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index c36f8b1ff0..0ee7f55ead 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:28+0200\n" +"PO-Revision-Date: 2011-08-19 07:29+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -865,7 +865,7 @@ msgstr "" #: gis_data_editor.php:151 js/messages.php:289 #: libraries/display_tbl.lib.php:663 msgid "Geometry" -msgstr "" +msgstr "கேத்திர கணிதம்" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:286 From 80e14eaed629e7da150ac68fd37ee62f3b9c1277 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:30:00 +0200 Subject: [PATCH 151/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 0ee7f55ead..1a01d082bf 100644 --- a/po/ta.po +++ b/po/ta.po @@ -870,7 +870,7 @@ msgstr "கேத்திர கணிதம்" #: 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 "புள்ளி" #: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:284 From 041e17944dfc207722e1c00dfbc7ee614fcdf50d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:31:03 +0200 Subject: [PATCH 152/492] Translation update done using Pootle. --- po/ta.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 1a01d082bf..08e4405446 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:29+0200\n" +"PO-Revision-Date: 2011-08-19 07:31+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -884,10 +884,9 @@ msgstr "" #: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:292 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add a point" -msgstr "%s களத்தை சேர்க்க" +msgstr "ஒரு புள்ளியை சேர்" #: gis_data_editor.php:218 js/messages.php:287 msgid "Linestring" From cee4485f5262109a515e7227f79e6efbd613b3ef Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:31:48 +0200 Subject: [PATCH 153/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 08e4405446..614303ac64 100644 --- a/po/ta.po +++ b/po/ta.po @@ -912,7 +912,7 @@ msgstr "" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "பல்கோணி" #: gis_data_editor.php:300 js/messages.php:294 #, fuzzy From 4b294604e5e7790d306850c9f903aecdaee5d2a0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:32:37 +0200 Subject: [PATCH 154/492] Translation update done using Pootle. --- po/ta.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 614303ac64..ccc5159148 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:31+0200\n" +"PO-Revision-Date: 2011-08-19 07:32+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -915,10 +915,9 @@ msgid "Polygon" msgstr "பல்கோணி" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add a polygon" -msgstr "%s களத்தை சேர்க்க" +msgstr "ஒரு பல்கோணியை சேர்" #: gis_data_editor.php:304 #, fuzzy From 41ae58d97ec67427d041251bcc060bce51530fdd Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:33:53 +0200 Subject: [PATCH 155/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ccc5159148..65294b6be1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:32+0200\n" +"PO-Revision-Date: 2011-08-19 07:33+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1003,7 +1003,7 @@ msgstr "" #: import_status.php:29 libraries/common.lib.php:636 #: libraries/schema/Export_Relation_Schema.class.php:203 user_password.php:109 msgid "Back" -msgstr "" +msgstr "திரும்பி" #: index.php:164 msgid "phpMyAdmin is more friendly with a frames-capable browser." From 0e0de7a6318b9a541d90afd03103743c3ce076c1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:35:30 +0200 Subject: [PATCH 156/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 65294b6be1..3c162c23ba 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:33+0200\n" +"PO-Revision-Date: 2011-08-19 07:35+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1070,7 +1070,7 @@ msgstr "" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 msgid "Total count" -msgstr "" +msgstr "மொத்தம் எண்ணல்" #: js/messages.php:54 msgid "The host name is empty!" From 4f438c33170e44f16282156540a1a6ab0b097035 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 11:07:11 +0530 Subject: [PATCH 157/492] Coding style corrections --- libraries/tbl_select.lib.php | 40 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index d14db6cc21..4aaddc0bc7 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -19,14 +19,15 @@ require_once 'url_generating.lib.php'; * * @return string $str Value of the Title */ -function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ +function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage) +{ if ($propertiesIconic == true) { $str = '' . __('Browse foreign values') . ''; - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); + if ($propertiesIconic === 'both') { + $str .= __('Browse foreign values'); return $str; } } else { @@ -44,28 +45,33 @@ function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){ * @return array Array containing the field list, field types, collations * and null constraint */ -function PMA_tbl_getFields($table,$db) { - +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); + $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_list = $fields_null = $fields_type = $fields_collation = array(); $geom_column_present = false; $geom_types = PMA_getGISDatatypes(); + while ($row = PMA_DBI_fetch_assoc($result)) { $fields_list[] = $row['Field']; $type = $row['Type']; + // check whether table contains geometric columns if (in_array($type, $geom_types)) { $geom_column_present = true; } + // reformat mysql query output if (strncasecmp($type, 'set', 3) == 0 - || strncasecmp($type, 'enum', 4) == 0) { + || strncasecmp($type, 'enum', 4) == 0 + ) { $type = str_replace(',', ', ', $type); } else { - // strip the "BINARY" attribute, except if we find "BINARY(" because // this would be a BINARY or VARBINARY field type if (!preg_match('@BINARY[\(]@i', $type)) { @@ -81,7 +87,7 @@ function PMA_tbl_getFields($table,$db) { } $fields_null[] = $row['Null']; $fields_type[] = $type; - $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL' + $fields_collation[] = ! empty($row['Collation']) && $row['Collation'] != 'NULL' ? $row['Collation'] : ''; } // end while @@ -99,21 +105,21 @@ function PMA_tbl_getFields($table,$db) { * * @return HTML content, the tags and content for table header */ -function PMA_tbl_setTableHeader($geom_column_present = false){ - +function PMA_tbl_setTableHeader($geom_column_present = false) +{ // Display the Function column only if there is alteast one geomety colum $func = ''; if ($geom_column_present) { $func = ''; } -return ' + return '' . $func . ' - + '; @@ -126,10 +132,9 @@ return ' * @return array Array containing configuration (icon, text, link, id, args) * of sub-tabs for Table Search and Zoom search */ -function PMA_tbl_getSubTabs(){ - +function PMA_tbl_getSubTabs() +{ $subtabs = array(); - $subtabs['search']['icon'] = 'b_search.png'; $subtabs['search']['text'] = __('Table Search'); $subtabs['search']['link'] = 'tbl_select.php'; @@ -142,7 +147,6 @@ function PMA_tbl_getSubTabs(){ $subtabs['zoom']['id'] = 'zoom_search_id'; return $subtabs; - } /** From a2c290b1ae2de257ca77f42290478ced24451a06 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:37:22 +0200 Subject: [PATCH 158/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 3c162c23ba..52b3ae7f4a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:35+0200\n" +"PO-Revision-Date: 2011-08-19 07:37+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1106,7 +1106,7 @@ msgstr "" #: js/messages.php:61 js/messages.php:130 libraries/tbl_properties.inc.php:758 #: tbl_tracking.php:235 tbl_tracking.php:400 msgid "Close" -msgstr "" +msgstr "மூடு" #: js/messages.php:64 js/messages.php:249 libraries/Index.class.php:460 #: libraries/common.lib.php:580 libraries/common.lib.php:1116 From cf61696044bcfcfd635d32c295bf4b2cc5b2ef0d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:37:32 +0200 Subject: [PATCH 159/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 52b3ae7f4a..f3383ff1dd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1114,7 +1114,7 @@ msgstr "மூடு" #: libraries/config/messages.inc.php:478 libraries/display_tbl.lib.php:1326 #: libraries/schema/User_Schema.class.php:185 setup/frames/index.inc.php:138 msgid "Edit" -msgstr "" +msgstr "தொகு" #: js/messages.php:65 server_status.php:705 msgid "Live traffic chart" From c6c76a327be51e4ca85f147f49d6f0d0b1b9d290 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:37:50 +0200 Subject: [PATCH 160/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index f3383ff1dd..b715748b5f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1138,7 +1138,7 @@ msgstr "" #: server_status.php:1021 server_status.php:1082 tbl_printview.php:315 #: tbl_structure.php:798 msgid "Total" -msgstr "" +msgstr "மொத்தம்" #. l10n: Other, small valued, queries #: js/messages.php:73 server_status.php:919 From 6630f7cb3333bbc21b06e65fd2d804d65db60837 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:38:09 +0200 Subject: [PATCH 161/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b715748b5f..af12f98791 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:37+0200\n" +"PO-Revision-Date: 2011-08-19 07:38+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" From 9a917e33f64fbdf716a34a88670543fbdcbc0a0c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:39:33 +0200 Subject: [PATCH 162/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index af12f98791..eba046a3fb 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:38+0200\n" +"PO-Revision-Date: 2011-08-19 07:39+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1143,7 +1143,7 @@ msgstr "மொத்தம்" #. l10n: Other, small valued, queries #: js/messages.php:73 server_status.php:919 msgid "Other" -msgstr "" +msgstr "ஏனையது" #. l10n: Thousands separator #: js/messages.php:75 libraries/common.lib.php:1359 From f164333e387ea92da91893650162f92e03264927 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:42:44 +0200 Subject: [PATCH 163/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index eba046a3fb..ab2f19c12e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:39+0200\n" +"PO-Revision-Date: 2011-08-19 07:42+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1223,7 +1223,7 @@ msgstr "" #: js/messages.php:101 msgid "System memory" -msgstr "" +msgstr "முறைமை நினைவகம்" #: js/messages.php:102 msgid "System swap" From 8833d172e9e524fb4fc9e0e8cd425e42507f02c2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:43:39 +0200 Subject: [PATCH 164/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ab2f19c12e..8e59d2902d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:42+0200\n" +"PO-Revision-Date: 2011-08-19 07:43+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1245,7 +1245,7 @@ msgstr "" #: js/messages.php:107 msgid "Total memory" -msgstr "" +msgstr "மொத்த நினைவகம்" #: js/messages.php:108 msgid "Cached memory" From 68ef65f4fac4f6d28e84d05d4927111297d7533e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:46:52 +0200 Subject: [PATCH 165/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 8e59d2902d..140384bec8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:43+0200\n" +"PO-Revision-Date: 2011-08-19 07:46+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1249,7 +1249,7 @@ msgstr "மொத்த நினைவகம்" #: js/messages.php:108 msgid "Cached memory" -msgstr "" +msgstr "இடைமாற்று நினைவகம்" #: js/messages.php:109 msgid "Buffered memory" From b92df4fb7bf49bf5188df76e49f3ded7de0e7b59 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:47:42 +0200 Subject: [PATCH 166/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 140384bec8..54ed5e51fc 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:46+0200\n" +"PO-Revision-Date: 2011-08-19 07:47+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1257,7 +1257,7 @@ msgstr "" #: js/messages.php:110 msgid "Free memory" -msgstr "" +msgstr "விடுபட்ட நினைவகம்" #: js/messages.php:111 msgid "Used memory" From 3509f9d00d171891357e89308830a03c3bc25124 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:48:30 +0200 Subject: [PATCH 167/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 54ed5e51fc..5ff254e941 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:47+0200\n" +"PO-Revision-Date: 2011-08-19 07:48+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1261,7 +1261,7 @@ msgstr "விடுபட்ட நினைவகம்" #: js/messages.php:111 msgid "Used memory" -msgstr "" +msgstr "பாவிக்கப்பட்ட நினைவகம்" #: js/messages.php:113 msgid "Total Swap" From b68c43254a5d0e0bf6e7a661d202ded9db5b2920 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:49:04 +0200 Subject: [PATCH 168/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 5ff254e941..b04e4e2b88 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:48+0200\n" +"PO-Revision-Date: 2011-08-19 07:49+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1289,7 +1289,7 @@ msgstr "" #: js/messages.php:120 server_status.php:1040 msgid "Connections" -msgstr "" +msgstr "இணைப்புகள்" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:124 From 1e66543795505a1ea55e18d56725e73099de8a2e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:49:20 +0200 Subject: [PATCH 169/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b04e4e2b88..ae5fbd04af 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1294,7 +1294,7 @@ msgstr "இணைப்புகள்" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:124 msgid "Questions" -msgstr "" +msgstr "வினாக்கள்" #: js/messages.php:125 server_status.php:995 msgid "Traffic" From 77b2b7627d714f2621c5d320b5cfe5450229b7a5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 11:21:21 +0530 Subject: [PATCH 170/492] Adhere to PEAR coding standards --- libraries/tbl_select.lib.php | 69 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 4aaddc0bc7..b2eb0b0e57 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -88,13 +88,13 @@ function PMA_tbl_getFields($table,$db) $fields_null[] = $row['Null']; $fields_type[] = $type; $fields_collation[] = ! empty($row['Collation']) && $row['Collation'] != 'NULL' - ? $row['Collation'] - : ''; + ? $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); + return array($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present); } @@ -121,8 +121,6 @@ function PMA_tbl_setTableHeader($geom_column_present = false) '; - - } /** @@ -286,7 +284,6 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu ); $w = ''; - // If geometry function is set apply it to the field name if ($geom_func != null && trim($geom_func) != '') { // Get details about the geometry fucntions @@ -295,8 +292,8 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // If the function takes a single parameter if ($geom_funcs[$geom_func]['params'] == 1) { $backquoted_name = $geom_func . '(' . PMA_backquote($names) . ')'; - // If the function takes two parameters } else { + // If the function takes two parameters // create gis data from the string $gis_data = PMA_createGISData($fields); @@ -307,7 +304,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu // New output type is the output type of the function being applied $types = $geom_funcs[$geom_func]['type']; - // If the intended where clause is something like 'IsEmpty(`spatial_col_name`)' + // If the where clause is something like 'IsEmpty(`spatial_col_name`)' if (isset($geom_unary_functions[$geom_func]) && trim($fields) == '') { $w = $backquoted_name; return $w; @@ -316,9 +313,9 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $backquoted_name = PMA_backquote($names); } - if($unaryFlag){ + if ($unaryFlag) { $fields = ''; - $w = $backquoted_name . ' ' . $func_type; + $w = $backquoted_name . ' ' . $func_type; } elseif (in_array($types, PMA_getGISDatatypes()) && ! empty($fields)) { // create gis data from the string @@ -341,23 +338,25 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $parens_open = '('; $parens_close = ')'; - } else { - $parens_open = ''; - $parens_close = ''; - } - $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; - for ($e = 1; $e < $enum_selected_count; $e++) { - $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; - } + } else { + $parens_open = ''; + $parens_close = ''; + } + $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\''; + for ($e = 1; $e < $enum_selected_count; $e++) { + $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\''; + } - $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; + $w = $backquoted_name . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close; } } elseif ($fields != '') { // For these types we quote the value. Even if it's another type (like INT), // for a LIKE we always quote the value. MySQL converts strings to numbers // and numbers to strings as necessary during the comparison - if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) || strpos(' ' . $func_type, 'LIKE')) { + if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) + || strpos(' ' . $func_type, 'LIKE') + ) { $quot = '\''; } else { $quot = ''; @@ -373,23 +372,28 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu $fields = '^' . $fields . '$'; } - if ($func_type == 'IN (...)' || $func_type == 'NOT IN (...)' || $func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + if ($func_type == 'IN (...)' + || $func_type == 'NOT IN (...)' + || $func_type == 'BETWEEN' + || $func_type == 'NOT BETWEEN' + ) { $func_type = str_replace(' (...)', '', $func_type); - // quote values one by one - $values = explode(',', $fields); - foreach ($values as &$value) - $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + // quote values one by one + $values = explode(',', $fields); + foreach ($values as &$value) { + $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot; + } - if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') - $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : ''); - else + if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') { + $w = $backquoted_name . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') + . ' AND ' . (isset($values[1]) ? $values[1] : ''); + } else { $w = $backquoted_name . ' ' . $func_type . ' (' . implode(',', $values) . ')'; - } - else { + } + } else { $w = $backquoted_name . ' ' . $func_type . ' ' . $quot . PMA_sqlAddslashes($fields) . $quot;; } - } // end if return $w; @@ -405,7 +409,7 @@ function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $fu */ function PMA_SVG_scatter_plot($data, &$settings) { - require_once './libraries/svg_plot/pma_scatter_plot.php'; + include_once './libraries/svg_plot/pma_scatter_plot.php'; if (empty($data)) { // empty data @@ -422,6 +426,5 @@ function PMA_SVG_scatter_plot($data, &$settings) } return $scatter_plot->asSVG(); } - } ?> From b515aeb547359ae921b9a9d904e8027838949a40 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:53:54 +0200 Subject: [PATCH 171/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ae5fbd04af..4770ae55e2 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:49+0200\n" +"PO-Revision-Date: 2011-08-19 07:53+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1298,7 +1298,7 @@ msgstr "வினாக்கள்" #: js/messages.php:125 server_status.php:995 msgid "Traffic" -msgstr "" +msgstr "போக்குவரத்து" #: js/messages.php:126 libraries/server_links.inc.php:73 #: server_status.php:1442 From 30f12491dcfed1895aa8b30fd15ac5baa1291778 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:55:45 +0200 Subject: [PATCH 172/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4770ae55e2..e713b72b67 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:53+0200\n" +"PO-Revision-Date: 2011-08-19 07:55+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1303,7 +1303,7 @@ msgstr "போக்குவரத்து" #: js/messages.php:126 libraries/server_links.inc.php:73 #: server_status.php:1442 msgid "Settings" -msgstr "" +msgstr "அமைப்புகள்" #: js/messages.php:127 msgid "Remove chart" From 3217c4bffbb62936caba278317b8d336edb4d0fe Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:57:11 +0200 Subject: [PATCH 173/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e713b72b67..f13b74f6e7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:55+0200\n" +"PO-Revision-Date: 2011-08-19 07:57+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1307,7 +1307,7 @@ msgstr "அமைப்புகள்" #: js/messages.php:127 msgid "Remove chart" -msgstr "" +msgstr "வரைபடத்தை நீக்கு" #: js/messages.php:128 msgid "Edit title and labels" From 2051249dc75e4d3ad4cef324b97dce5d8c42b416 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:57:37 +0200 Subject: [PATCH 174/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index f13b74f6e7..01a1df344c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1327,7 +1327,7 @@ msgstr "" #: server_privileges.php:2040 server_status.php:1155 server_status.php:1582 #: tbl_zoom_select.php:158 tbl_zoom_select.php:283 msgid "None" -msgstr "" +msgstr "எதுவுமில்லை" #: js/messages.php:133 msgid "Resume monitor" From ed178a59c2a996eb3d1b38202818eac5322e8e2d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:58:46 +0200 Subject: [PATCH 175/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 01a1df344c..50d7ac80a1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:57+0200\n" +"PO-Revision-Date: 2011-08-19 07:58+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1390,7 +1390,7 @@ msgstr "" #: js/messages.php:148 #, php-format msgid "Enable %s" -msgstr "" +msgstr "இயலச்செய் %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:150 From 58421ca2abc36b25d77e9430ce6961e7d6f7ae32 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 07:59:32 +0200 Subject: [PATCH 176/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 50d7ac80a1..a7d3e96200 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:58+0200\n" +"PO-Revision-Date: 2011-08-19 07:59+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1396,7 +1396,7 @@ msgstr "இயலச்செய் %s" #: js/messages.php:150 #, php-format msgid "Disable %s" -msgstr "" +msgstr "முடக்கு %s" #. l10n: %d seconds #: js/messages.php:152 From eeb6ef41601e5616f395027a92b5538e1d8acaee Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:00:35 +0200 Subject: [PATCH 177/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a7d3e96200..d714c16303 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 07:59+0200\n" +"PO-Revision-Date: 2011-08-19 08:00+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1420,7 +1420,7 @@ msgstr "" #: js/messages.php:157 server_status.php:1530 msgid "Chart Title" -msgstr "" +msgstr "வரைபடத் தலைப்பு" #. l10n: As in differential values #: js/messages.php:159 From 838c2c0da0bc13e5063ef6ee7d30017ff8bc01f2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:01:27 +0200 Subject: [PATCH 178/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d714c16303..a7aaf9d3b5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:00+0200\n" +"PO-Revision-Date: 2011-08-19 08:01+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" From d03222c19034b6b0c3e026f6b55305cb1613e79d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:02:04 +0200 Subject: [PATCH 179/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a7aaf9d3b5..74547845ed 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:01+0200\n" +"PO-Revision-Date: 2011-08-19 08:02+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1412,7 +1412,7 @@ msgstr "" #: js/messages.php:154 msgid "Change settings" -msgstr "" +msgstr "அமைப்புக்களை மாற்று" #: js/messages.php:155 msgid "Current settings" From e457d28fe3c62522093f01a3edb9d2d620a4cfd9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:02:39 +0200 Subject: [PATCH 180/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 74547845ed..e8eccc99d2 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1416,7 +1416,7 @@ msgstr "அமைப்புக்களை மாற்று" #: js/messages.php:155 msgid "Current settings" -msgstr "" +msgstr "நடப்பு அமைப்புக்கள்" #: js/messages.php:157 server_status.php:1530 msgid "Chart Title" From 65ce28323aa83548c2202bc64f90489ace5e693c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:03:24 +0200 Subject: [PATCH 181/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e8eccc99d2..7920736cd9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:02+0200\n" +"PO-Revision-Date: 2011-08-19 08:03+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1425,7 +1425,7 @@ msgstr "வரைபடத் தலைப்பு" #. l10n: As in differential values #: js/messages.php:159 msgid "Differential" -msgstr "" +msgstr "வேற்றுமை" #: js/messages.php:160 #, php-format From 65d38574c0fabf024d0ce6ec4d8d656b11f6bb85 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:05:09 +0200 Subject: [PATCH 182/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 7920736cd9..0a9e80edc3 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:03+0200\n" +"PO-Revision-Date: 2011-08-19 08:05+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1430,7 +1430,7 @@ msgstr "வேற்றுமை" #: js/messages.php:160 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "வகுக்கப்பட்ட %s" #: js/messages.php:162 msgid "From slow log" From 08cc23b5dfc466799c281e451caa7258691fb20b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:05:58 +0200 Subject: [PATCH 183/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 0a9e80edc3..6c52b42e44 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1473,7 +1473,7 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:173 msgid "Filters" -msgstr "" +msgstr "வடிகட்டிகள்" #. l10n: Filter as in "Start Filtering" #: js/messages.php:175 From 2ea610b2110f135dda6a8f10f7a698d7e6601830 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:06:05 +0200 Subject: [PATCH 184/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 6c52b42e44..80b4d3b617 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:05+0200\n" +"PO-Revision-Date: 2011-08-19 08:06+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1478,7 +1478,7 @@ msgstr "வடிகட்டிகள்" #. l10n: Filter as in "Start Filtering" #: js/messages.php:175 msgid "Filter" -msgstr "" +msgstr "வடிகட்டி" #: js/messages.php:176 msgid "Filter queries by word/regexp:" From b9f1b96fb0d1fbdd871abc1bcbf7ad55184fc25d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:06:24 +0200 Subject: [PATCH 185/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 80b4d3b617..5c9a6669cd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1494,7 +1494,7 @@ msgstr "" #: js/messages.php:179 msgid "Total:" -msgstr "" +msgstr "மொத்த:" #: js/messages.php:181 msgid "Loading logs" From 5d53f387fd2381f71c1c44bbf0c894252f2896fb Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:07:01 +0200 Subject: [PATCH 186/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 5c9a6669cd..4c87bf3c40 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:06+0200\n" +"PO-Revision-Date: 2011-08-19 08:07+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1513,7 +1513,7 @@ msgstr "" #: js/messages.php:184 msgid "Reload page" -msgstr "" +msgstr "பக்கத்தை திரும்ப ஏற்று" #: js/messages.php:186 msgid "Affected rows:" From c605ac4eff800d7080ae9281d49b922b4538e12c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:08:38 +0200 Subject: [PATCH 187/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4c87bf3c40..a9f1ba8a30 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:07+0200\n" +"PO-Revision-Date: 2011-08-19 08:08+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1517,7 +1517,7 @@ msgstr "பக்கத்தை திரும்ப ஏற்று" #: js/messages.php:186 msgid "Affected rows:" -msgstr "" +msgstr "பாவனையான வரிசைகள்" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" From f596325dd2bd9aaa4db1a40bd92438ffebfb8b00 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:09:00 +0200 Subject: [PATCH 188/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a9f1ba8a30..44e43b97a6 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:08+0200\n" +"PO-Revision-Date: 2011-08-19 08:09+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1534,7 +1534,7 @@ msgstr "" #: libraries/tbl_links.inc.php:89 prefs_manage.php:229 server_status.php:1485 #: setup/frames/menu.inc.php:20 msgid "Import" -msgstr "" +msgstr "இறக்குமதி" #: js/messages.php:192 msgid "Analyse Query" From 7eb5423918165121dabe8657abcb73d68d8575a6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:11:32 +0200 Subject: [PATCH 189/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 44e43b97a6..a91e142e17 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:09+0200\n" +"PO-Revision-Date: 2011-08-19 08:11+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1550,7 +1550,7 @@ msgstr "" #: js/messages.php:198 msgid "Issue" -msgstr "" +msgstr "பிரச்சினை" #: js/messages.php:199 msgid "Recommendation" From bcab1e7075a6f0ba570a2cf762f04e3e16dc2e90 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:12:03 +0200 Subject: [PATCH 190/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index a91e142e17..1880f7e6f4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:11+0200\n" +"PO-Revision-Date: 2011-08-19 08:12+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1554,7 +1554,7 @@ msgstr "பிரச்சினை" #: js/messages.php:199 msgid "Recommendation" -msgstr "" +msgstr "பரிந்துரை" #: js/messages.php:200 msgid "Rule details" From ccab719000b98bca4801b7384fd3285cdd41eac7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:12:50 +0200 Subject: [PATCH 191/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1880f7e6f4..68947a4b9b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1558,7 +1558,7 @@ msgstr "பரிந்துரை" #: js/messages.php:200 msgid "Rule details" -msgstr "" +msgstr "ஆளுகை விபரங்கள்" #: js/messages.php:201 #, fuzzy From de3dd0ef54e992f5b129fca46197b93e6c1870d4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:22:03 +0200 Subject: [PATCH 192/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 68947a4b9b..feffcc8713 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:12+0200\n" +"PO-Revision-Date: 2011-08-19 08:22+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1572,7 +1572,7 @@ msgstr "" #: js/messages.php:203 msgid "Test" -msgstr "" +msgstr "சோதனை" #: js/messages.php:208 libraries/tbl_properties.inc.php:763 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 From b7805f932468253fa69ffeff8205db159effe126 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:22:22 +0200 Subject: [PATCH 193/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index feffcc8713..7e8b2d9feb 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1583,7 +1583,7 @@ msgstr "விலக்கு" #: js/messages.php:211 msgid "Loading" -msgstr "" +msgstr "ஏற்றப்படுகிறது" #: js/messages.php:212 msgid "Processing Request" From 23a82ab995b3e1208ec813d56c4d37c2ec74be00 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:22:33 +0200 Subject: [PATCH 194/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 7e8b2d9feb..c7b6c18641 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1606,7 +1606,7 @@ msgstr "" #: pmd_general.php:543 pmd_general.php:591 pmd_general.php:667 #: pmd_general.php:721 pmd_general.php:784 msgid "OK" -msgstr "" +msgstr "சரி" #: js/messages.php:219 msgid "Renaming Databases" From 59a6e72230814a0b2e0ab86795734207d0c95c82 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:22:54 +0200 Subject: [PATCH 195/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c7b6c18641..7eadd2da80 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1632,7 +1632,7 @@ msgstr "நீங்கள் புதிய பயனாளரை சேர் #: js/messages.php:224 msgid "Create Table" -msgstr "" +msgstr "அட்டவணையை உருவாக்கு" #: js/messages.php:229 msgid "Insert Table" From 24b5b0e95e15b826debb6b5d726c20fce1fef408 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:23:29 +0200 Subject: [PATCH 196/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 7eadd2da80..0ffdb888eb 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:22+0200\n" +"PO-Revision-Date: 2011-08-19 08:23+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1636,7 +1636,7 @@ msgstr "அட்டவணையை உருவாக்கு" #: js/messages.php:229 msgid "Insert Table" -msgstr "" +msgstr "அட்டவணையை செருகு" #: js/messages.php:230 msgid "Hide indexes" From fc85bc84e6395d31e4a0e0438fbcb0adc7e81153 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:25:16 +0200 Subject: [PATCH 197/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 0ffdb888eb..beae6e79ba 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:23+0200\n" +"PO-Revision-Date: 2011-08-19 08:25+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1640,7 +1640,7 @@ msgstr "அட்டவணையை செருகு" #: js/messages.php:230 msgid "Hide indexes" -msgstr "" +msgstr "சுட்டுகளை மறை" #: js/messages.php:231 msgid "Show indexes" From 49dd36b924a5836f2aa5eb1e03ebaadcda871a4c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:25:33 +0200 Subject: [PATCH 198/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index beae6e79ba..cd70d0d41f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1644,7 +1644,7 @@ msgstr "சுட்டுகளை மறை" #: js/messages.php:231 msgid "Show indexes" -msgstr "" +msgstr "சுட்டுகளை காட்டு" #: js/messages.php:234 msgid "Searching" From 0eb4e7650962188afa663e6730ee70f830fbcffa Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:25:48 +0200 Subject: [PATCH 199/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index cd70d0d41f..de1cae7dca 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1648,7 +1648,7 @@ msgstr "சுட்டுகளை காட்டு" #: js/messages.php:234 msgid "Searching" -msgstr "" +msgstr "தேடுதல்" #: js/messages.php:235 msgid "Hide search results" From 2d14ce64cfc6e39484dae4f07bf7cb2d794ac16a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:27:04 +0200 Subject: [PATCH 200/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index de1cae7dca..dbef41b0fe 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:25+0200\n" +"PO-Revision-Date: 2011-08-19 08:27+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1652,7 +1652,7 @@ msgstr "தேடுதல்" #: js/messages.php:235 msgid "Hide search results" -msgstr "" +msgstr "தேடல் முடிவுகளை மறை" #: js/messages.php:236 msgid "Show search results" From 30581b3ffa78cbf0c83f136e13ce8162d23e115c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:27:18 +0200 Subject: [PATCH 201/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index dbef41b0fe..d530795290 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1656,7 +1656,7 @@ msgstr "தேடல் முடிவுகளை மறை" #: js/messages.php:236 msgid "Show search results" -msgstr "" +msgstr "தேடல் முடிவுகளை காட்டு" #: js/messages.php:237 msgid "Browsing" From 27e56368087fa81e0ae37b2f90aa0f7e223b3d50 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:27:34 +0200 Subject: [PATCH 202/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d530795290..0926236c20 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1660,7 +1660,7 @@ msgstr "தேடல் முடிவுகளை காட்டு" #: js/messages.php:237 msgid "Browsing" -msgstr "" +msgstr "உலாவுதல்" #: js/messages.php:238 msgid "Deleting" From b855cdde51514491b36a21cb523767cb1b6169ae Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:27:45 +0200 Subject: [PATCH 203/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 0926236c20..e1ce313eba 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1664,7 +1664,7 @@ msgstr "உலாவுதல்" #: js/messages.php:238 msgid "Deleting" -msgstr "" +msgstr "அழித்தல்" #: js/messages.php:241 msgid "The definition of a stored function must contain a RETURN statement!" From 26f3a83e3c5a097cd257af7615b8dc393044e02d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:27:59 +0200 Subject: [PATCH 204/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e1ce313eba..f9c93f032c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1691,7 +1691,7 @@ msgstr "" #: libraries/display_tbl.lib.php:2385 querywindow.php:90 querywindow.php:94 #: querywindow.php:97 tbl_structure.php:150 tbl_structure.php:569 msgid "Change" -msgstr "" +msgstr "மாற்று" #: js/messages.php:252 msgid "Query execution time" From d708af7245ea973070bb616cb49217cb055e84ee Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:28:15 +0200 Subject: [PATCH 205/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index f9c93f032c..39c3d359b7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:27+0200\n" +"PO-Revision-Date: 2011-08-19 08:28+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1703,7 +1703,7 @@ msgstr "" #: setup/frames/index.inc.php:228 tbl_change.php:1019 #: tbl_gis_visualization.php:193 tbl_indexes.php:261 tbl_relation.php:563 msgid "Save" -msgstr "" +msgstr "சேமி" #: js/messages.php:258 msgid "Hide search criteria" From adb13f301eedd1e2c64b3179961470630de04b6e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:29:19 +0200 Subject: [PATCH 206/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 39c3d359b7..3a7087fe8c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:28+0200\n" +"PO-Revision-Date: 2011-08-19 08:29+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1760,7 +1760,7 @@ msgstr "" #: js/messages.php:282 tbl_change.php:317 tbl_indexes.php:211 #: tbl_indexes.php:238 msgid "Ignore" -msgstr "" +msgstr "புறக்கணி" #: js/messages.php:283 libraries/display_tbl.lib.php:1327 msgid "Copy" From 61a9a2f3a8774a617c99041b1e6e698366ff3586 Mon Sep 17 00:00:00 2001 From: Aris Feryanto Date: Fri, 19 Aug 2011 14:29:46 +0800 Subject: [PATCH 207/492] Grid edit: handle escaping HTML entities + remove 'edit area' when editing normal text --- js/functions.js | 11 +- js/makegrid.js | 214 ++++++++++++------------ themes/pmahomme/css/theme_right.css.php | 15 +- 3 files changed, 124 insertions(+), 116 deletions(-) diff --git a/js/functions.js b/js/functions.js index 54a08d5371..156c25b3d4 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3157,13 +3157,20 @@ function PMA_getCellValue(td) { return ''; } else if (! $(td).is('.to_be_saved') && $(td).data('original_data')) { return $(td).data('original_data'); - } else if ($(td).is(':not(.transformed, .relation, .enum, .set, .null)')) { - return unescape($(td).find('span').html()).replace(/
/g, "\n"); } else { return $(td).text(); } } +function PMA_htmlEncode(s) +{ + var el = document.createElement("div"); + el.innerText = el.textContent = s; + s = el.innerHTML; + delete el; + return s; +} + /* Loads a js file, an array may be passed as well */ loadJavascript=function(file) { if($.isArray(file)) { diff --git a/js/makegrid.js b/js/makegrid.js index 420344ddeb..2e3b7fec95 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -372,7 +372,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $.post('sql.php', post_params, function(data) { if (data.success != true) { var $temp_div = $(document.createElement('div')); - $temp_div.html(data.error); + $temp_div.html(PMA_htmlEncode(data.error)); $temp_div.addClass("error"); PMA_ajaxShowMessage($temp_div); } @@ -564,7 +564,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi !g.colRsz && !g.colReorder) { if (!g.isCellEditActive) { - $cell = $(cell); + var $cell = $(cell); // remove all edit area and hide it $(g.cEdit).find('.edit_area').empty().hide(); // reposition the cEdit element @@ -573,24 +573,19 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi left: $cell.position().left }) .show() - .find('input') + .find('.edit_box') .css({ width: $cell.outerWidth(), height: $cell.outerHeight() }); - // fill the cell edit with text from @@ -919,8 +943,9 @@ function printQueryStatistics()
0) + if ($other_sum > 0) { $chart_json[__('Other')] = $other_sum; + } echo json_encode($chart_json); ?> @@ -975,8 +1000,7 @@ function printServerTraffic() } /* if the server works as master or slave in replication process, display useful information */ - if ($server_master_status || $server_slave_status) - { + if ($server_master_status || $server_slave_status) { ?>
@@ -1125,7 +1149,8 @@ function printServerTraffic()
From f6fd4323381cb0e8c041e8d7f1b3cfc13302bb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 11:57:44 +0200 Subject: [PATCH 365/492] Use PMA_DBI_get_tables instead of own query --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 0331e4bda3..e9a8c551f0 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -55,10 +55,10 @@ if ($cfgRelation['commwork']) { * Selects the database and gets tables names */ PMA_DBI_select_db($db); -$rowset = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE); +$tables = PMA_DBI_get_tables($db); $count = 0; -while ($row = PMA_DBI_fetch_row($rowset)) { +foreach($tables as $row) { $table = $row[0]; $comments = PMA_getComments($db, $table); From 889ea0afb047b255e81ebb1fe54f5bb825a804ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:05:15 +0200 Subject: [PATCH 366/492] Fix getting tables --- db_datadict.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e9a8c551f0..e74524d09d 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -58,8 +58,7 @@ PMA_DBI_select_db($db); $tables = PMA_DBI_get_tables($db); $count = 0; -foreach($tables as $row) { - $table = $row[0]; +foreach($tables as $table) { $comments = PMA_getComments($db, $table); echo '
' . "\n"; From 414363d38d788c1c126d0aafc4eda69c0a8157c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:06:04 +0200 Subject: [PATCH 367/492] Revert "More of missing escaping" This reverts commit 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a. --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462972..938ebf7a1a 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
From 8cec4ac91ce0da8e73d8b8313cdb5c34d03bdb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:07:32 +0200 Subject: [PATCH 368/492] Revert "Revert "More of missing escaping"" This reverts commit 414363d38d788c1c126d0aafc4eda69c0a8157c8. Okay, it needs to be escaped here, but not escaped above. --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7a1a..6981462972 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { From da6e51d00780dd941f4b496c69ae15d0d09bd3a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:08:07 +0200 Subject: [PATCH 369/492] Do not escape field here, it is used as index to vairous arrays --- db_datadict.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index 6981462972..b910c761ae 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -227,7 +227,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { } else { $row['Default'] = htmlspecialchars($row['Default']); } - $field_name = htmlspecialchars($row['Field']); + $field_name = $row['Field']; if (PMA_MYSQL_INT_VERSION < 50025 && ! empty($analyzed_sql[0]['create_table_fields'][$field_name]['type']) From 679814416f4842f8e0e189c054772edf2d20ddef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:11:31 +0200 Subject: [PATCH 370/492] Format --- server_privileges.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server_privileges.php b/server_privileges.php index 78e4f06933..a1b7acb839 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2353,7 +2353,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . ' ' . ($current['Grant_priv'] == 'Y' ? __('Yes') : __('No')) . "\n" . ' ' . "\n" . ' - @@ -185,6 +172,11 @@ for ($i = 0; $i < $name_cnt; $i++) { + +
+ +
+ ]" type="hidden" id="t_v__" /> -
' + + '
' . __('Collation') . ' ' . __('Operator') . ' ' . __('Value') . '
' . __('Function') . '
' . __('Column') . ' ' . __('Type') . ' ' . __('Collation') . ' ' . __('Operator') . ' ' . __('Value') . '
' . __('Value') . '
, if it is not null - var value = $cell.is(':not(.null)') ? PMA_getCellValue(cell) : ''; - $(g.cEdit).find('input') - .val(value); + // fill the cell edit with text from + var value = PMA_getCellValue(cell); + $(g.cEdit).find('.edit_box').val(value); g.currentEditCell = cell; - $(g.cEdit).find('input[type=text]').focus(); + $(g.cEdit).find('.edit_box').focus(); $(g.cEdit).find('*').removeAttr('disabled'); } - } else { - if (g.isCellEditActive) { - g.hideEditCell(); - } } }, @@ -605,7 +600,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi */ hideEditCell: function(force, data, field) { if (g.isCellEditActive && !force) { - // cell is being edited, post the edited data + // cell is being edited, save or post the edited data g.saveOrPostEditedCell(); return; } @@ -620,21 +615,19 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if (g.currentEditCell) { // save value of currently edited cell // replace current edited field with the new value var $this_field = $(g.currentEditCell); - var new_html = $this_field.data('value'); var is_null = $this_field.data('value') == null; if (is_null) { $this_field.find('span').html('NULL'); $this_field.addClass('null'); } else { $this_field.removeClass('null'); + var new_html = $this_field.data('value'); if ($this_field.is('.truncated')) { if (new_html.length > g.maxTruncatedLen) { new_html = new_html.substring(0, g.maxTruncatedLen) + '...'; } } - // replace '\n' with
- new_html = new_html.replace(/\n/g, '
'); - $this_field.find('span').html(new_html); + $this_field.find('span').text(new_html); } } if (data.transformations != undefined) { @@ -657,7 +650,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // hide the cell editing area $(g.cEdit).hide(); - $(g.cEdit).find('input[type=text]').blur(); + $(g.cEdit).find('.edit_box').blur(); g.isCellEditActive = false; g.currentEditCell = null; // destroy datepicker in edit area, if exist @@ -671,8 +664,17 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if (!g.isCellEditActive) { // make sure the edit area has not been shown g.isCellEditActive = true; g.isEditCellTextEditable = false; + /** + * @var $td current edited cell + */ var $td = $(g.currentEditCell); + /** + * @var $editArea the editing area + */ var $editArea = $(g.cEdit).find('.edit_area'); + /** + * @var where_clause WHERE clause for the edited cell + */ var where_clause = $td.parent('tr').find('.where_clause').val(); /** * @var field_name String containing the name of this field. @@ -720,24 +722,24 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if ($td.is('.enum, .set')) { $editArea.find('select').live('change', function(e) { $checkbox.attr('checked', false); - }) + }); } else if ($td.is('.relation')) { $editArea.find('select').live('change', function(e) { $checkbox.attr('checked', false); - }) + }); $editArea.find('.browse_foreign').live('click', function(e) { $checkbox.attr('checked', false); - }) + }); } else { - $(g.cEdit).find('input[type=text]').live('keypress change', function(e) { + $(g.cEdit).find('.edit_box').live('keypress change', function(e) { $checkbox.attr('checked', false); - }) + }); $editArea.find('textarea').live('keydown', function(e) { $checkbox.attr('checked', false); - }) + }); } - // if 'checkbox_null__' is clicked empty the corresponding select/editor. + // if null checkbox is clicked empty the corresponding select/editor. $checkbox.click(function(e) { if ($td.is('.enum')) { $editArea.find('select').attr('value', ''); @@ -745,7 +747,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $editArea.find('select').find('option').each(function() { var $option = $(this); $option.attr('selected', false); - }) + }); } else if ($td.is('.relation')) { // if the dropdown is there to select the foreign value if ($editArea.find('select').length > 0) { @@ -754,12 +756,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } else { $editArea.find('textarea').val(''); } - $(g.cEdit).find('input[type=text]').val(''); - }) + $(g.cEdit).find('.edit_box').val(''); + }); } - if($td.is('.relation')) { - /** @lends jQuery */ + if ($td.is('.relation')) { //handle relations $editArea.addClass('edit_area_loading'); @@ -770,15 +771,15 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi * @var post_params Object containing parameters for the POST request */ var post_params = { - 'ajax_request' : true, - 'get_relational_values' : true, - 'server' : g.server, - 'db' : g.db, - 'table' : g.table, - 'column' : field_name, - 'token' : g.token, - 'curr_value' : relation_curr_value, - 'relation_key_or_display_column' : relation_key_or_display_column + 'ajax_request' : true, + 'get_relational_values' : true, + 'server' : g.server, + 'db' : g.db, + 'table' : g.table, + 'column' : field_name, + 'token' : g.token, + 'curr_value' : relation_curr_value, + 'relation_key_or_display_column' : relation_key_or_display_column } g.lastXHR = $.post('sql.php', post_params, function(data) { @@ -788,18 +789,18 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var value = $(data.dropdown).val(); $td.data('original_data', value); // update the text input field, in case where the "Relational display column" is checked - $(g.cEdit).find('input[type=text]').val(value); + $(g.cEdit).find('.edit_box').val(value); $editArea.append(data.dropdown); $editArea.append('
' + g.cellEditHint + '
'); }) // end $.post() $editArea.find('select').live('change', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); + $(g.cEdit).find('.edit_box').val($(this).val()); }) + $editArea.show(); } else if($td.is('.enum')) { - /** @lends jQuery */ //handle enum fields $editArea.addClass('edit_area_loading'); @@ -824,11 +825,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }) // end $.post() $editArea.find('select').live('change', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); + $(g.cEdit).find('.edit_box').val($(this).val()); }) + $editArea.show(); } else if($td.is('.set')) { - /** @lends jQuery */ //handle set fields $editArea.addClass('edit_area_loading'); @@ -854,23 +855,25 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }) // end $.post() $editArea.find('select').live('change', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); + $(g.cEdit).find('.edit_box').val($(this).val()); }) + $editArea.show(); } else if($td.is('.truncated, .transformed')) { if ($td.is('.to_be_saved')) { // cell has been edited var value = $td.data('value'); - $(g.cEdit).find('input[type=text]').val(value); - $editArea.append(''); - $editArea.find('textarea').live('keyup', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); - }); - $(g.cEdit).find('input[type=text]').live('keyup', function(e) { + $(g.cEdit).find('.edit_box').val(value); + $editArea.append(''); + $editArea.find('textarea') + .val(value) + .live('keyup', function(e) { + $(g.cEdit).find('.edit_box').val($(this).val()); + }); + $(g.cEdit).find('.edit_box').live('keyup', function(e) { $editArea.find('textarea').val($(this).val()); }); $editArea.append('
' + g.cellEditHint + '
'); } else { - /** @lends jQuery */ //handle truncated/transformed values values $editArea.addClass('edit_area_loading'); @@ -900,12 +903,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } $td.data('original_data', data.value); - $(g.cEdit).find('input[type=text]').val(data.value); - $editArea.append(''); - $editArea.find('textarea').live('keyup', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); - }); - $(g.cEdit).find('input[type=text]').live('keyup', function(e) { + $(g.cEdit).find('.edit_box').val(data.value); + $editArea.append(''); + $editArea.find('textarea') + .val(data.value) + .live('keyup', function(e) { + $(g.cEdit).find('.edit_box').val($(this).val()); + }); + $(g.cEdit).find('.edit_box').live('keyup', function(e) { $editArea.find('textarea').val($(this).val()); }); $editArea.append('
' + g.cellEditHint + '
'); @@ -916,8 +921,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi }) // end $.post() } g.isEditCellTextEditable = true; + $editArea.show(); } else if ($td.is('.datefield, .datetimefield, .timestampfield')) { - var $input_field = $(g.cEdit).find('input[type=text]'); + var $input_field = $(g.cEdit).find('.edit_box'); // remember current datetime value in $input_field, if it is not null var is_null = $td.is('.null'); @@ -943,19 +949,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } else { $input_field.val(''); } + $editArea.show(); } else { - $editArea.append(''); - $editArea.find('textarea').live('keyup', function(e) { - $(g.cEdit).find('input[type=text]').val($(this).val()); - }); - $(g.cEdit).find('input[type=text]').live('keyup', function(e) { - $editArea.find('textarea').val($(this).val()); - }); - $editArea.append('
' + g.cellEditHint + '
'); g.isEditCellTextEditable = true; } - - $editArea.show(); } }, @@ -1138,7 +1135,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if (!g.saveCellsAtOnce) { $(g.cEdit).find('*').attr('disabled', 'disabled'); var $editArea = $(g.cEdit).find('.edit_area'); - $editArea.addClass('edit_area_posting'); + $(g.cEdit).find('.edit_box').addClass('edit_box_posting'); } else { $('.save_edited').addClass('saving_edited_data') .find('input').attr('disabled', 'disabled'); // disable the save button @@ -1153,52 +1150,52 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.isSaving = false; if (!g.saveCellsAtOnce) { $(g.cEdit).find('*').removeAttr('disabled'); - $editArea.removeClass('edit_area_posting'); + $(g.cEdit).find('.edit_box').removeClass('edit_box_posting'); } else { $('.save_edited').removeClass('saving_edited_data') .find('input').removeAttr('disabled'); // enable the save button back } if(data.success == true) { PMA_ajaxShowMessage(data.message); - $('.to_be_saved').each(function() { - var new_clause = $(this).parent('tr').data('new_clause'); - if (new_clause != '') { - var $where_clause = $(this).parent('tr').find('.where_clause'); - var old_clause = $where_clause.attr('value'); - var decoded_old_clause = PMA_urldecode(old_clause); - var decoded_new_clause = PMA_urldecode(new_clause); + // update where_clause related data in each edited row + $('.to_be_saved').parents('tr').each(function() { + var new_clause = $(this).data('new_clause'); + var $where_clause = $(this).find('.where_clause'); + var old_clause = $where_clause.attr('value'); + var decoded_old_clause = PMA_urldecode(old_clause); + var decoded_new_clause = PMA_urldecode(new_clause); - $where_clause.attr('value', new_clause); - // update Edit, Copy, and Delete links also - $(this).parent('tr').find('a').each(function() { - $(this).attr('href', $(this).attr('href').replace(old_clause, new_clause)); - // update delete confirmation in Delete link - if ($(this).attr('href').indexOf('DELETE') > -1) { - $(this).removeAttr('onclick') - .unbind('click') - .bind('click', function() { - return confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' + - decoded_new_clause + (is_unique ? '' : ' LIMIT 1')); - }); - } - }); - // update the multi edit checkboxes - $(this).parent('tr').find('input[type=checkbox]').each(function() { - var $checkbox = $(this); - var checkbox_name = $checkbox.attr('name'); - var checkbox_value = $checkbox.attr('value'); + $where_clause.attr('value', new_clause); + // update Edit, Copy, and Delete links also + $(this).find('a').each(function() { + $(this).attr('href', $(this).attr('href').replace(old_clause, new_clause)); + // update delete confirmation in Delete link + if ($(this).attr('href').indexOf('DELETE') > -1) { + $(this).removeAttr('onclick') + .unbind('click') + .bind('click', function() { + return confirmLink(this, 'DELETE FROM `' + g.db + '`.`' + g.table + '` WHERE ' + + decoded_new_clause + (is_unique ? '' : ' LIMIT 1')); + }); + } + }); + // update the multi edit checkboxes + $(this).find('input[type=checkbox]').each(function() { + var $checkbox = $(this); + var checkbox_name = $checkbox.attr('name'); + var checkbox_value = $checkbox.attr('value'); - $checkbox.attr('name', checkbox_name.replace(old_clause, new_clause)); - $checkbox.attr('value', checkbox_value.replace(decoded_old_clause, decoded_new_clause)); - }); - } + $checkbox.attr('name', checkbox_name.replace(old_clause, new_clause)); + $checkbox.attr('value', checkbox_value.replace(decoded_old_clause, decoded_new_clause)); + }); }); - // remove possible previous feedback message + // update the display of executed SQL query command $('#result_query').remove(); if (typeof data.sql_query != 'undefined') { // display feedback $('#sqlqueryresults').prepend(data.sql_query); } + // hide and/or update the successfully saved cells g.hideEditCell(true, data); // remove the "Save edited cells" button @@ -1247,6 +1244,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi var value; if ($(g.cEdit).find('.edit_area').is('.edit_area_loading')) { + // the edit area is still loading (retrieving cell data), no need to post need_to_post = false; } else if (is_null) { if (!g.wasEditedCellNull) { @@ -1255,7 +1253,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi } } else { if ($this_field.is('.bit')) { - this_field_params[field_name] = '0b' + $(g.cEdit).find('textarea').val(); + this_field_params[field_name] = '0b' + $(g.cEdit).find('.edit_box').val(); } else if ($this_field.is('.set')) { $test_element = $(g.cEdit).find('select'); this_field_params[field_name] = $test_element.map(function(){ @@ -1273,10 +1271,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi if ($test_element.length != 0) { this_field_params[field_name] = $test_element.text(); } - } else if ($this_field.is('.datefield, .datetimefield, .timestampfield')) { - this_field_params[field_name] = $(g.cEdit).find('input[type=text]').val(); } else { - this_field_params[field_name] = $(g.cEdit).find('textarea').val(); + this_field_params[field_name] = $(g.cEdit).find('.edit_box').val(); } if (g.wasEditedCellNull || this_field_params[field_name] != PMA_getCellValue(g.currentEditCell)) { need_to_post = true; @@ -1533,7 +1529,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // adjust g.cEdit g.cEdit.className = 'cEdit'; - $(g.cEdit).html('
'); + $(g.cEdit).html('
'); $(g.cEdit).hide(); // assign cell editing hint @@ -1560,10 +1556,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi e.preventDefault(); } }); - $(g.cEdit).find('input[type=text]').focus(function(e) { + $(g.cEdit).find('.edit_box').focus(function(e) { g.showEditArea(); }); - $(g.cEdit).find('input[type=text], select').live('keydown', function(e) { + $(g.cEdit).find('.edit_box, select').live('keydown', function(e) { if (e.which == 13) { // post on pressing "Enter" e.preventDefault(); diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 914ef0bf09..64c60918d3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2992,16 +2992,21 @@ span.cm-number { margin: 0.3em 0.2em; } +.cEdit .edit_box { + overflow: hidden; + padding: 0; +} + +.cEdit .edit_box_posting { + background: #FFF url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat right center; + padding-right: 1.5em; +} + .cEdit .edit_area_loading { background: #FFF url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat center; height: 10em; } -.cEdit .edit_area_posting { - background: #FFF url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat center top; - padding-top: 1.5em; -} - .cEdit .goto_link { background: #EEE; color: #555; From 43286629a88ba381130c2eb81472a421a426de38 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:30:13 +0200 Subject: [PATCH 208/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 3a7087fe8c..1af2043d1a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:29+0200\n" +"PO-Revision-Date: 2011-08-19 08:30+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1764,7 +1764,7 @@ msgstr "புறக்கணி" #: js/messages.php:283 libraries/display_tbl.lib.php:1327 msgid "Copy" -msgstr "" +msgstr "நகல்" #: js/messages.php:291 msgid "Outer Ring" From 19da17df7b70994ce1fe87044221186f0706b9bc Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:31:29 +0200 Subject: [PATCH 209/492] Translation update done using Pootle. --- po/ta.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 1af2043d1a..5d5bcfbc99 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:30+0200\n" +"PO-Revision-Date: 2011-08-19 08:31+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1771,10 +1771,9 @@ msgid "Outer Ring" msgstr "" #: js/messages.php:297 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add columns" -msgstr "%s களத்தை சேர்க்க" +msgstr "வரிசைகளை சேர்" #: js/messages.php:300 msgid "Select referenced key" From 15b19efc7c9eeaef80280176f4a9eea43b8f547f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:31:52 +0200 Subject: [PATCH 210/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 5d5bcfbc99..e2e1f4e564 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1840,7 +1840,7 @@ msgstr "" #: js/messages.php:319 msgid "Go to link" -msgstr "" +msgstr "இணைப்புக்கு செல்" #: js/messages.php:322 msgid "Generate password" From 107122e0920b59addb141f8fe3e3c9f2dc404bef Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:32:27 +0200 Subject: [PATCH 211/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e2e1f4e564..72c07e82a9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:31+0200\n" +"PO-Revision-Date: 2011-08-19 08:32+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1844,7 +1844,7 @@ msgstr "இணைப்புக்கு செல்" #: js/messages.php:322 msgid "Generate password" -msgstr "" +msgstr "கடவுச்சொல்லை இயற்று" #: js/messages.php:323 libraries/replication_gui.lib.php:369 msgid "Generate" From 3f3187e76fd18408e388b3e1372136faf335f00d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:32:32 +0200 Subject: [PATCH 212/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 72c07e82a9..0086b87e6c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1848,7 +1848,7 @@ msgstr "கடவுச்சொல்லை இயற்று" #: js/messages.php:323 libraries/replication_gui.lib.php:369 msgid "Generate" -msgstr "" +msgstr "இயற்று" #: js/messages.php:324 msgid "Change Password" From 026e23f23baafa64e8f2ad04ba56f9b694a53365 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:32:44 +0200 Subject: [PATCH 213/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 0086b87e6c..3d1d2bc7a8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1852,7 +1852,7 @@ msgstr "இயற்று" #: js/messages.php:324 msgid "Change Password" -msgstr "" +msgstr "கடவுச்சொல்லை மாற்று" #: js/messages.php:327 tbl_structure.php:464 #, fuzzy From c3f97e956a201b6860eb22315c61f49e09098529 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:32:53 +0200 Subject: [PATCH 214/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 3d1d2bc7a8..70bcce90f5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1855,10 +1855,9 @@ msgid "Change Password" msgstr "கடவுச்சொல்லை மாற்று" #: js/messages.php:327 tbl_structure.php:464 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "திங்கள்" +msgstr "மேலும்" #: js/messages.php:330 setup/lib/index.lib.php:173 #, php-format From b387623828acfab5dd817bf8732472fd3749f3f7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:33:27 +0200 Subject: [PATCH 215/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 70bcce90f5..57aacbd82e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:32+0200\n" +"PO-Revision-Date: 2011-08-19 08:33+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1880,7 +1880,7 @@ msgstr "" #. l10n: Display text for calendar close link #: js/messages.php:352 msgid "Done" -msgstr "" +msgstr "முடிந்த" #: js/messages.php:356 msgctxt "Previous month" From 0a6199bc1d5b8e9fe1d1481a336135a0e839786c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:33:38 +0200 Subject: [PATCH 216/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 57aacbd82e..ef3a9d0dd6 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1885,7 +1885,7 @@ msgstr "முடிந்த" #: js/messages.php:356 msgctxt "Previous month" msgid "Prev" -msgstr "" +msgstr "பின்" #: js/messages.php:361 msgctxt "Next month" From 7c6d62a6c2b713e3380dad9bf7f5956db6231a67 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:33:53 +0200 Subject: [PATCH 217/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index ef3a9d0dd6..ab97048edd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1890,7 +1890,7 @@ msgstr "பின்" #: js/messages.php:361 msgctxt "Next month" msgid "Next" -msgstr "" +msgstr "அடுத்த" #. l10n: Display text for current month link in calendar #: js/messages.php:364 From 594f6739a7521143c4c9ecd22cfeeb0105d8332e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:35:41 +0200 Subject: [PATCH 218/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ab97048edd..dd62686bb0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:33+0200\n" +"PO-Revision-Date: 2011-08-19 08:35+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -1895,7 +1895,7 @@ msgstr "அடுத்த" #. l10n: Display text for current month link in calendar #: js/messages.php:364 msgid "Today" -msgstr "" +msgstr "இன்று" #: js/messages.php:367 #, fuzzy From 77220172b7703c2317e4421cf48f41b33f27dc5d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:35:45 +0200 Subject: [PATCH 219/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index dd62686bb0..b4c21bb246 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1898,7 +1898,6 @@ msgid "Today" msgstr "இன்று" #: js/messages.php:367 -#, fuzzy #| msgid "Jan" msgid "January" msgstr "தை" From a9bdee5a3f417c68bfa1095f9b9549380fce635d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:35:54 +0200 Subject: [PATCH 220/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b4c21bb246..903146fdfe 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1904,7 +1904,7 @@ msgstr "தை" #: js/messages.php:368 msgid "February" -msgstr "" +msgstr "மாசி" #: js/messages.php:369 #, fuzzy From f9365ee052d91e8e094dfa8b96dec32163848c8d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:35:57 +0200 Subject: [PATCH 221/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 903146fdfe..4c17146c97 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1907,7 +1907,6 @@ msgid "February" msgstr "மாசி" #: js/messages.php:369 -#, fuzzy #| msgid "Mar" msgid "March" msgstr "பங்குனி" From e96e0800c66e4adff205768204bddbab04660859 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:01 +0200 Subject: [PATCH 222/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 4c17146c97..e1197fe479 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:35+0200\n" +"PO-Revision-Date: 2011-08-19 08:36+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" From d8ddd3dd0151bc60778271bc90d173abf1215355 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:10 +0200 Subject: [PATCH 223/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e1197fe479..d76d676b8c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1922,7 +1922,6 @@ msgid "May" msgstr "வைகாசி" #: js/messages.php:372 -#, fuzzy #| msgid "Jun" msgid "June" msgstr "ஆணி" From 77a049c05fa047ea771e250ce23a5b85689a951b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:14 +0200 Subject: [PATCH 224/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d76d676b8c..e1d1fc9e67 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1927,7 +1927,6 @@ msgid "June" msgstr "ஆணி" #: js/messages.php:373 -#, fuzzy #| msgid "Jul" msgid "July" msgstr "ஆடி" From c27398b4dac44fae2217e2b56a8cad8aa2cf341b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:24 +0200 Subject: [PATCH 225/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e1d1fc9e67..9b99727040 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1932,7 +1932,6 @@ msgid "July" msgstr "ஆடி" #: js/messages.php:374 -#, fuzzy #| msgid "Aug" msgid "August" msgstr "ஆவணி" From c61e58e8253326cb3f7e35c1d03ed203376d56e8 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:38 +0200 Subject: [PATCH 226/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 9b99727040..6c68977626 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1938,7 +1938,7 @@ msgstr "ஆவணி" #: js/messages.php:375 msgid "September" -msgstr "" +msgstr "புரட்டாதி" #: js/messages.php:376 #, fuzzy From 43d1707c4bee4be6e6e744b0d1373cc9e69471de Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:50 +0200 Subject: [PATCH 227/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6c68977626..a5ceaa0d2d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1948,7 +1948,7 @@ msgstr "ஐப்பசி" #: js/messages.php:377 msgid "November" -msgstr "" +msgstr "கார்த்திகை" #: js/messages.php:378 msgid "December" From 52e6834a55fac8b82a03517488d23d1306bc8970 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:36:57 +0200 Subject: [PATCH 228/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index a5ceaa0d2d..f79ce985b5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1952,7 +1952,7 @@ msgstr "கார்த்திகை" #: js/messages.php:378 msgid "December" -msgstr "" +msgstr "மார்கழி" #. l10n: Short month name #: js/messages.php:382 libraries/common.lib.php:1509 From f20383ef5de0895cb79bb2ca61ee4bf18cb50fba Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:37:02 +0200 Subject: [PATCH 229/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index f79ce985b5..18077a226d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:36+0200\n" +"PO-Revision-Date: 2011-08-19 08:37+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" From 194f0a81d905041d40a39380af42901fdb479494 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:02 +0200 Subject: [PATCH 230/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 18077a226d..5cbc85dcac 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:37+0200\n" +"PO-Revision-Date: 2011-08-19 08:38+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2037,7 +2037,7 @@ msgstr "செவ்வாய்" #: js/messages.php:410 msgid "Wednesday" -msgstr "" +msgstr "புதன்" #: js/messages.php:411 msgid "Thursday" From 9639de0f59fb34cbb3f2c6e28fdc45b1d16e2859 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:09 +0200 Subject: [PATCH 231/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 5cbc85dcac..1698a7a45d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2041,7 +2041,7 @@ msgstr "புதன்" #: js/messages.php:411 msgid "Thursday" -msgstr "" +msgstr "வியாழன்" #: js/messages.php:412 #, fuzzy From 63200d26bf24f6a18e02d8b0da1de035c21fc24a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:19 +0200 Subject: [PATCH 232/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1698a7a45d..e69840f151 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2051,7 +2051,7 @@ msgstr "வெள்ளி" #: js/messages.php:413 msgid "Saturday" -msgstr "" +msgstr "சனி" #. l10n: Short week day name #: js/messages.php:417 From 3456267f7984f8cb47229a2a2ed1195dad621663 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:30 +0200 Subject: [PATCH 233/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e69840f151..f86635bd4b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2059,7 +2059,7 @@ msgstr "சனி" #| msgctxt "Short week day name" #| msgid "Sun" msgid "Sun" -msgstr "ஞாயிறு" +msgstr "ஞாயி" #. l10n: Short week day name #: js/messages.php:419 libraries/common.lib.php:1536 From f6d9fa958df3addc930022ab0a22367971b3ecc0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:35 +0200 Subject: [PATCH 234/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index f86635bd4b..b58f3e9ab9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2064,7 +2064,7 @@ msgstr "ஞாயி" #. l10n: Short week day name #: js/messages.php:419 libraries/common.lib.php:1536 msgid "Mon" -msgstr "திங்கள்" +msgstr "திங்" #. l10n: Short week day name #: js/messages.php:421 libraries/common.lib.php:1538 From 69503e49e2ca81f0cc621a24a5769358d1d24fb0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:39 +0200 Subject: [PATCH 235/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b58f3e9ab9..8bea96361d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2069,7 +2069,7 @@ msgstr "திங்" #. l10n: Short week day name #: js/messages.php:421 libraries/common.lib.php:1538 msgid "Tue" -msgstr "செவ்வாய்" +msgstr "செவ்" #. l10n: Short week day name #: js/messages.php:423 libraries/common.lib.php:1540 From 455a88dbd99a9edf323de8ee34601107675733ed Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:44 +0200 Subject: [PATCH 236/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 8bea96361d..b88492dc9b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2074,7 +2074,7 @@ msgstr "செவ்" #. l10n: Short week day name #: js/messages.php:423 libraries/common.lib.php:1540 msgid "Wed" -msgstr "புதன்" +msgstr "புத" #. l10n: Short week day name #: js/messages.php:425 libraries/common.lib.php:1542 From 42cd451b272ce0339da928b9673fb533b57df863 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:49 +0200 Subject: [PATCH 237/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index b88492dc9b..52a96e75ca 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2079,7 +2079,7 @@ msgstr "புத" #. l10n: Short week day name #: js/messages.php:425 libraries/common.lib.php:1542 msgid "Thu" -msgstr "வியாழன்" +msgstr "வியா" #. l10n: Short week day name #: js/messages.php:427 libraries/common.lib.php:1544 From 3553c8f657a18ce044b31df8e94eb1a14ca6a90f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:38:54 +0200 Subject: [PATCH 238/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 52a96e75ca..4092923ef6 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2084,7 +2084,7 @@ msgstr "வியா" #. l10n: Short week day name #: js/messages.php:427 libraries/common.lib.php:1544 msgid "Fri" -msgstr "வெள்ளி" +msgstr "வெள்" #. l10n: Short week day name #: js/messages.php:429 libraries/common.lib.php:1546 From bef0a89514ba5303073aca5d1ef1c748c604060f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:07 +0200 Subject: [PATCH 239/492] Translation update done using Pootle. --- po/ta.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4092923ef6..7af8798123 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:38+0200\n" +"PO-Revision-Date: 2011-08-19 08:39+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2093,10 +2093,9 @@ msgstr "சனி" #. l10n: Minimal week day name #: js/messages.php:433 -#, fuzzy #| msgid "Sun" msgid "Su" -msgstr "ஞாயிறு" +msgstr "ஞாயி" #. l10n: Minimal week day name #: js/messages.php:435 From 6bc618d54fc232a80e8e6b19f34a535bdf3666d4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:20 +0200 Subject: [PATCH 240/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 7af8798123..fe1e744efc 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2099,10 +2099,9 @@ msgstr "ஞாயி" #. l10n: Minimal week day name #: js/messages.php:435 -#, fuzzy #| msgid "Mon" msgid "Mo" -msgstr "திங்கள்" +msgstr "திங்" #. l10n: Minimal week day name #: js/messages.php:437 From e8c4639d87e59bfc47f961ae97bcf37e323c06c2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:24 +0200 Subject: [PATCH 241/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index fe1e744efc..9a47262738 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2105,10 +2105,9 @@ msgstr "திங்" #. l10n: Minimal week day name #: js/messages.php:437 -#, fuzzy #| msgid "Tue" msgid "Tu" -msgstr "செவ்வாய்" +msgstr "செவ்" #. l10n: Minimal week day name #: js/messages.php:439 From 592653a82ef3918f2e99883bf0b510f1a3dd258e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:28 +0200 Subject: [PATCH 242/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 9a47262738..1c568e5cc1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2111,10 +2111,9 @@ msgstr "செவ்" #. l10n: Minimal week day name #: js/messages.php:439 -#, fuzzy #| msgid "Wed" msgid "We" -msgstr "புதன்" +msgstr "புத" #. l10n: Minimal week day name #: js/messages.php:441 From 19dcad7f329b474fa7494ac30565331a519d4de7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:35 +0200 Subject: [PATCH 243/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 1c568e5cc1..2b5d72f7ff 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2117,10 +2117,9 @@ msgstr "புத" #. l10n: Minimal week day name #: js/messages.php:441 -#, fuzzy #| msgid "Thu" msgid "Th" -msgstr "வியாழன்" +msgstr "வியா" #. l10n: Minimal week day name #: js/messages.php:443 From a4c31cb7ca12cd65a6207d4ce5ef43e479aa6653 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:41 +0200 Subject: [PATCH 244/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 2b5d72f7ff..d6a5e93b49 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2123,10 +2123,9 @@ msgstr "வியா" #. l10n: Minimal week day name #: js/messages.php:443 -#, fuzzy #| msgid "Fri" msgid "Fr" -msgstr "வெள்ளி" +msgstr "வெள்" #. l10n: Minimal week day name #: js/messages.php:445 From ecdc28ed9fe04a8c9d94e8d46c73b2021266fc0d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:39:46 +0200 Subject: [PATCH 245/492] Translation update done using Pootle. --- po/ta.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d6a5e93b49..18c3b8aefd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2129,7 +2129,6 @@ msgstr "வெள்" #. l10n: Minimal week day name #: js/messages.php:445 -#, fuzzy #| msgid "Sat" msgid "Sa" msgstr "சனி" From c491c78e808a80e07bc8068c6c6e464a7d343ece Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:40:40 +0200 Subject: [PATCH 246/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 18c3b8aefd..1fcaa442ac 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:39+0200\n" +"PO-Revision-Date: 2011-08-19 08:40+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2136,7 +2136,7 @@ msgstr "சனி" #. l10n: Column header for week of the year in calendar #: js/messages.php:447 msgid "Wk" -msgstr "" +msgstr "கிழமை" #: js/messages.php:449 msgid "Hour" From 8ece0cc71f922e2635358fb7b3317e9b27069672 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:40:51 +0200 Subject: [PATCH 247/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1fcaa442ac..e74fd9fbca 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2140,7 +2140,7 @@ msgstr "கிழமை" #: js/messages.php:449 msgid "Hour" -msgstr "" +msgstr "மணித்தியாலம்" #: js/messages.php:450 msgid "Minute" From 85b7bb40697288ffbaf62ec2581898ca83a66cab Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:40:59 +0200 Subject: [PATCH 248/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e74fd9fbca..200353d054 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2144,7 +2144,7 @@ msgstr "மணித்தியாலம்" #: js/messages.php:450 msgid "Minute" -msgstr "" +msgstr "நிமிடம்" #: js/messages.php:451 msgid "Second" From cf303c05f891993ceb816504c7f316b7fda53cf0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:41:07 +0200 Subject: [PATCH 249/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 200353d054..1cced8a769 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:40+0200\n" +"PO-Revision-Date: 2011-08-19 08:41+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2148,7 +2148,7 @@ msgstr "நிமிடம்" #: js/messages.php:451 msgid "Second" -msgstr "" +msgstr "வினாடிகள்" #: libraries/Advisor.class.php:145 #, php-format From dcae7d8b99cbeab34298fb92d41ac6d62ece4248 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:41:36 +0200 Subject: [PATCH 250/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1cced8a769..ac5708a786 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2157,7 +2157,7 @@ msgstr "" #: libraries/Config.class.php:1159 msgid "Font size" -msgstr "" +msgstr "எழுத்துரு அளவு" #: libraries/File.class.php:221 msgid "File was not an uploaded file." From b615bf7820ec513a93ed796184c26978c75888f2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:42:58 +0200 Subject: [PATCH 251/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ac5708a786..2fcdfc3503 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:41+0200\n" +"PO-Revision-Date: 2011-08-19 08:42+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2183,7 +2183,7 @@ msgstr "" #: libraries/File.class.php:287 msgid "Missing a temporary folder." -msgstr "" +msgstr "ஒரு தற்காலிய உறையை காணவில்லை" #: libraries/File.class.php:290 msgid "Failed to write file to disk." From 27a5a10068009e1bf9e5271e19c307dcd273539f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:43:20 +0200 Subject: [PATCH 252/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 2fcdfc3503..866e75736a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:42+0200\n" +"PO-Revision-Date: 2011-08-19 08:43+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2218,7 +2218,7 @@ msgstr "" #: libraries/Index.class.php:423 libraries/build_html_for_db.lib.php:41 #: tbl_tracking.php:300 msgid "Indexes" -msgstr "" +msgstr "சுட்டுகள்" #: libraries/Index.class.php:434 libraries/tbl_properties.inc.php:488 #: tbl_structure.php:155 tbl_structure.php:160 tbl_structure.php:573 From 0e0bb6f381a89362faeba0117b5dd5fc826942b4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:43:55 +0200 Subject: [PATCH 253/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 866e75736a..f1bc4cba20 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2224,7 +2224,7 @@ msgstr "சுட்டுகள்" #: tbl_structure.php:155 tbl_structure.php:160 tbl_structure.php:573 #: tbl_tracking.php:306 msgid "Unique" -msgstr "" +msgstr "தனித்தன்மை" #: libraries/Index.class.php:435 tbl_tracking.php:307 msgid "Packed" From 3ccba3df0c81fe9daefa7b2d566b22065da2c6bc Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:44:20 +0200 Subject: [PATCH 254/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index f1bc4cba20..647a822334 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:43+0200\n" +"PO-Revision-Date: 2011-08-19 08:44+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2228,7 +2228,7 @@ msgstr "தனித்தன்மை" #: libraries/Index.class.php:435 tbl_tracking.php:307 msgid "Packed" -msgstr "" +msgstr "பொதிக்கப்பட்டது" #: libraries/Index.class.php:437 tbl_tracking.php:309 msgid "Cardinality" From 8b9f5e33ba8b548bf629609cee997ccd91d7649a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:44:45 +0200 Subject: [PATCH 255/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 647a822334..3d65f2c19a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2238,7 +2238,7 @@ msgstr "" #: libraries/rte/rte_routines.lib.php:950 tbl_tracking.php:263 #: tbl_tracking.php:312 msgid "Comment" -msgstr "" +msgstr "கருத்துரை" #: libraries/Index.class.php:466 msgid "The primary key has been dropped" From 57cd65601454108fc93a125a680cb7f18d97aa26 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:45:07 +0200 Subject: [PATCH 256/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 3d65f2c19a..cd17576ab1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:44+0200\n" +"PO-Revision-Date: 2011-08-19 08:45+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2260,7 +2260,7 @@ msgstr "" #: libraries/server_links.inc.php:43 server_databases.php:99 #: server_privileges.php:1825 msgid "Databases" -msgstr "" +msgstr "தரவுத்தளங்கள்" #: libraries/Message.class.php:193 libraries/blobstreaming.lib.php:325 #: libraries/blobstreaming.lib.php:331 libraries/common.lib.php:547 From 463b21957d7c69ad8752f0c2591c7c8527704dd0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:46:04 +0200 Subject: [PATCH 257/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index cd17576ab1..de84d2a69b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:45+0200\n" +"PO-Revision-Date: 2011-08-19 08:46+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2267,7 +2267,7 @@ msgstr "தரவுத்தளங்கள்" #: libraries/core.lib.php:210 libraries/import.lib.php:140 tbl_change.php:905 #: tbl_operations.php:229 tbl_relation.php:287 view_operations.php:60 msgid "Error" -msgstr "" +msgstr "வலு" #: libraries/Message.class.php:241 #, php-format From f719b50f0654c59004000e39448631ab83a26349 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:46:38 +0200 Subject: [PATCH 258/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index de84d2a69b..8089d5d822 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2299,10 +2299,9 @@ msgid "Could not save recent table" msgstr "" #: libraries/RecentTable.class.php:142 -#, fuzzy #| msgid "Display table filter" msgid "Recent tables" -msgstr "கருதிட்குள் சேர்க்க" +msgstr "சமீபத்திய அட்டவணைகள்" #: libraries/RecentTable.class.php:149 msgid "There are no recent tables" From 7c74338604e2f5deb507f3d74837c14f17d44fc3 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:47:50 +0200 Subject: [PATCH 259/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 8089d5d822..e5017a9838 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:46+0200\n" +"PO-Revision-Date: 2011-08-19 08:47+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2333,7 +2333,7 @@ msgstr "" #: libraries/Table.class.php:1034 msgid "Invalid database" -msgstr "" +msgstr "தகுதியற்ற தரவுத்தளம்" #: libraries/Table.class.php:1048 tbl_get_field.php:25 msgid "Invalid table name" From 3eef5cfe3239491f9a4f3f64a958824821bb3c45 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:48:14 +0200 Subject: [PATCH 260/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e5017a9838..b8018c4161 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:47+0200\n" +"PO-Revision-Date: 2011-08-19 08:48+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2337,7 +2337,7 @@ msgstr "தகுதியற்ற தரவுத்தளம்" #: libraries/Table.class.php:1048 tbl_get_field.php:25 msgid "Invalid table name" -msgstr "" +msgstr "தகுதியற்ற அட்டவணைப் பெயர்" #: libraries/Table.class.php:1063 #, php-format From ec8823c3f93292edaa99582dc20d0d0103cb4e0d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:49:34 +0200 Subject: [PATCH 261/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index b8018c4161..690873ab1e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:48+0200\n" +"PO-Revision-Date: 2011-08-19 08:49+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2371,7 +2371,7 @@ msgstr "" #: libraries/Theme.class.php:343 msgid "take it" -msgstr "" +msgstr "அதை ஏற்றுக்கொள்" #: libraries/Theme_Manager.class.php:110 #, php-format From 2b37d6762c2529b81a27a9111c59a33d9936b35f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:50:28 +0200 Subject: [PATCH 262/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 690873ab1e..df04cc2cb4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:49+0200\n" +"PO-Revision-Date: 2011-08-19 08:50+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2400,7 +2400,7 @@ msgstr "" #: libraries/auth/cookie.auth.lib.php:174 libraries/auth/http.auth.lib.php:64 #, php-format msgid "Welcome to %s" -msgstr "" +msgstr "வரவேற்கிறது %s" #: libraries/auth/config.auth.lib.php:100 #, php-format From f1ed4e7e689be8d66a91a708ed08e4a90167d30b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:50:53 +0200 Subject: [PATCH 263/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index df04cc2cb4..18568eb1f5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2424,7 +2424,7 @@ msgstr "" #: libraries/auth/cookie.auth.lib.php:199 msgid "Log in" -msgstr "" +msgstr "உள்நுழையா" #: libraries/auth/cookie.auth.lib.php:201 #: libraries/auth/cookie.auth.lib.php:203 From e34531e95c714856b7b8c48b2f9212df5ebafaf9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:51:23 +0200 Subject: [PATCH 264/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 18568eb1f5..9c15dcb881 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:50+0200\n" +"PO-Revision-Date: 2011-08-19 08:51+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2431,7 +2431,7 @@ msgstr "உள்நுழையா" #: libraries/navigation_header.inc.php:92 #: libraries/navigation_header.inc.php:96 msgid "phpMyAdmin documentation" -msgstr "" +msgstr "phpMyAdmin ஆவணச்சான்று" #: libraries/auth/cookie.auth.lib.php:213 #: libraries/auth/cookie.auth.lib.php:214 From c6ff4968337c3aeba1201fb00d9baeaf39ccd061 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:51:42 +0200 Subject: [PATCH 265/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 9c15dcb881..cfd8aacbe9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2440,7 +2440,7 @@ msgstr "" #: libraries/auth/cookie.auth.lib.php:213 msgid "Server:" -msgstr "" +msgstr "சேவையன்:" #: libraries/auth/cookie.auth.lib.php:218 msgid "Username:" From c6021d8c5b71a5afcdf6209f7fac7858f5a9a2e7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:51:53 +0200 Subject: [PATCH 266/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index cfd8aacbe9..bf3887f7d3 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2444,7 +2444,7 @@ msgstr "சேவையன்:" #: libraries/auth/cookie.auth.lib.php:218 msgid "Username:" -msgstr "" +msgstr "பயனாளர்:" #: libraries/auth/cookie.auth.lib.php:222 msgid "Password:" From 08bb0fc9bce54675a0be86bc968dbc3e7607a429 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:52:02 +0200 Subject: [PATCH 267/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index bf3887f7d3..2471080491 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:51+0200\n" +"PO-Revision-Date: 2011-08-19 08:52+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2448,7 +2448,7 @@ msgstr "பயனாளர்:" #: libraries/auth/cookie.auth.lib.php:222 msgid "Password:" -msgstr "" +msgstr "கடவுச்சொல்" #: libraries/auth/cookie.auth.lib.php:229 msgid "Server Choice" From c2d9d55e0b048b80e1590efa49dd813ce05c826a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:52:28 +0200 Subject: [PATCH 268/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 2471080491..c101547a38 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2452,7 +2452,7 @@ msgstr "கடவுச்சொல்" #: libraries/auth/cookie.auth.lib.php:229 msgid "Server Choice" -msgstr "" +msgstr "சேவையன் தேர்வு" #: libraries/auth/cookie.auth.lib.php:275 libraries/header.inc.php:87 msgid "Cookies must be enabled past this point." From 572a0f93d9180cced40a70978c8a1d2b17f498f7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:52:42 +0200 Subject: [PATCH 269/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c101547a38..de8ab4321f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2504,7 +2504,7 @@ msgstr "" #: libraries/blobstreaming.lib.php:244 msgid "PBMS error" -msgstr "" +msgstr "PBMS வழு" #: libraries/blobstreaming.lib.php:277 msgid "PBMS connection failed:" From ab7320c3a158158402f65766b890e90b92b2a9e1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:53:25 +0200 Subject: [PATCH 270/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index de8ab4321f..642c57fb2e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:52+0200\n" +"PO-Revision-Date: 2011-08-19 08:53+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2520,7 +2520,7 @@ msgstr "" #: libraries/blobstreaming.lib.php:363 msgid "View image" -msgstr "" +msgstr "படத்தை பார்" #: libraries/blobstreaming.lib.php:367 msgid "Play audio" From 5096ca747a05f78f5b423afcf8c54dcc7e2ea338 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:54:07 +0200 Subject: [PATCH 271/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 642c57fb2e..ac88d17bc7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:53+0200\n" +"PO-Revision-Date: 2011-08-19 08:54+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2524,7 +2524,7 @@ msgstr "படத்தை பார்" #: libraries/blobstreaming.lib.php:367 msgid "Play audio" -msgstr "" +msgstr "கேட்பொலியை ஒலிக்கச்செய்" #: libraries/blobstreaming.lib.php:372 msgid "View video" From ae5cbca55eedd28b61e0786c63df883e9eceb35b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:54:28 +0200 Subject: [PATCH 272/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index ac88d17bc7..6965dce089 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2528,7 +2528,7 @@ msgstr "கேட்பொலியை ஒலிக்கச்செய்" #: libraries/blobstreaming.lib.php:372 msgid "View video" -msgstr "" +msgstr "காணொலி பார்" #: libraries/blobstreaming.lib.php:376 msgid "Download file" From a0e784d826eee97187acaf9b5266c5da10dfa4a9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:54:44 +0200 Subject: [PATCH 273/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6965dce089..750cfab8c8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2532,7 +2532,7 @@ msgstr "காணொலி பார்" #: libraries/blobstreaming.lib.php:376 msgid "Download file" -msgstr "" +msgstr "கோப்பை பதிவிறக்கு" #: libraries/blobstreaming.lib.php:443 #, php-format From 07f8379021a6ef1b3d72eb148a7affd039a1ce5f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:55:23 +0200 Subject: [PATCH 274/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 750cfab8c8..791e87cd54 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:54+0200\n" +"PO-Revision-Date: 2011-08-19 08:55+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2541,7 +2541,7 @@ msgstr "" #: libraries/bookmark.lib.php:73 msgid "shared" -msgstr "" +msgstr "பகிரப்பட்டது" #: libraries/build_html_for_db.lib.php:26 #: libraries/config/messages.inc.php:183 libraries/export/xml.php:49 From 35b405e0c9b79705ee7a24f4770803c9c8907bf6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:55:33 +0200 Subject: [PATCH 275/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 791e87cd54..775bddb63d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2547,7 +2547,7 @@ msgstr "பகிரப்பட்டது" #: libraries/config/messages.inc.php:183 libraries/export/xml.php:49 #: server_status.php:545 msgid "Tables" -msgstr "" +msgstr "அட்டவணைகள்" #: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:302 #: libraries/config/setup.forms.php:338 libraries/config/setup.forms.php:361 From 71020eb694ec3a89e3f0a4829223263de751130e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:55:41 +0200 Subject: [PATCH 276/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 775bddb63d..542835b145 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2560,7 +2560,7 @@ msgstr "அட்டவணைகள்" #: server_privileges.php:601 server_replication.php:314 tbl_printview.php:281 #: tbl_structure.php:767 msgid "Data" -msgstr "" +msgstr "தரவு" #: libraries/build_html_for_db.lib.php:51 libraries/db_structure.lib.php:55 #: tbl_printview.php:300 tbl_structure.php:784 From e1f627e3e4b4b7437cd6454270e0c650934db7f2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:56:50 +0200 Subject: [PATCH 277/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 542835b145..282853f513 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:55+0200\n" +"PO-Revision-Date: 2011-08-19 08:56+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2623,7 +2623,7 @@ msgstr "" #: libraries/header.inc.php:136 main.php:161 server_status.php:686 #: server_synchronize.php:1228 msgid "Server" -msgstr "" +msgstr "சேவையன்" #: libraries/common.inc.php:835 msgid "Invalid authentication method set in configuration:" From a13b5a855e9bde534443a0a1683c81dacd9f7752 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:57:13 +0200 Subject: [PATCH 278/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 282853f513..a82c9ba4fa 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:56+0200\n" +"PO-Revision-Date: 2011-08-19 08:57+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2643,7 +2643,7 @@ msgstr "" #: libraries/common.lib.php:388 msgctxt "MySQL 5.5 documentation language" msgid "en" -msgstr "en" +msgstr "ஆங்" #. l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:392 From 1f9c5c716cdf450c59299227613e20d60b2f1130 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:57:16 +0200 Subject: [PATCH 279/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index a82c9ba4fa..84dbdd13ac 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2649,7 +2649,7 @@ msgstr "ஆங்" #: libraries/common.lib.php:392 msgctxt "MySQL 5.1 documentation language" msgid "en" -msgstr "en" +msgstr "ஆங்" #. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. #: libraries/common.lib.php:396 From 870dbcba11778b6f1d206c89b6b80b2c8d1b839c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:57:20 +0200 Subject: [PATCH 280/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 84dbdd13ac..1e50beb59f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2655,7 +2655,7 @@ msgstr "ஆங்" #: libraries/common.lib.php:396 msgctxt "MySQL 5.0 documentation language" msgid "en" -msgstr "en" +msgstr "ஆங்" #: libraries/common.lib.php:410 libraries/common.lib.php:412 #: libraries/common.lib.php:414 libraries/common.lib.php:431 From 347a046e89a5a972f6ee03111378774f247fe53f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:57:36 +0200 Subject: [PATCH 281/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 1e50beb59f..8980888031 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2666,7 +2666,7 @@ msgstr "ஆங்" #: libraries/sql_query_form.lib.php:387 libraries/sql_query_form.lib.php:390 #: main.php:212 server_variables.php:114 msgid "Documentation" -msgstr "" +msgstr "ஆவணச்சான்று" #: libraries/common.lib.php:559 libraries/header_printview.inc.php:60 #: server_status.php:532 server_status.php:1123 From 4a53fe9160978c1a29e4aa57683cf6898466f0ea Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:58:50 +0200 Subject: [PATCH 282/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 8980888031..fff3abadca 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:57+0200\n" +"PO-Revision-Date: 2011-08-19 08:58+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2671,7 +2671,7 @@ msgstr "ஆவணச்சான்று" #: libraries/common.lib.php:559 libraries/header_printview.inc.php:60 #: server_status.php:532 server_status.php:1123 msgid "SQL query" -msgstr "" +msgstr "SQL வினவல்" #: libraries/common.lib.php:595 libraries/rte/rte_events.lib.php:103 #: libraries/rte/rte_events.lib.php:108 libraries/rte/rte_events.lib.php:118 From 4b8c4c412202ed10e2aa74c275ef914cd9493c8a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:59:12 +0200 Subject: [PATCH 283/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index fff3abadca..6a8f8f349a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:58+0200\n" +"PO-Revision-Date: 2011-08-19 08:59+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2684,7 +2684,7 @@ msgstr "SQL வினவல்" #: libraries/rte/rte_triggers.lib.php:91 #: libraries/rte/rte_triggers.lib.php:104 msgid "MySQL said: " -msgstr "" +msgstr "MySQL சொன்னது" #: libraries/common.lib.php:1050 msgid "Failed to connect to SQL validator!" From 4e483e5cd1d06616a7bcc4039170ae46a7b0f6f6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:59:19 +0200 Subject: [PATCH 284/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6a8f8f349a..bb6afe7c70 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2684,7 +2684,7 @@ msgstr "SQL வினவல்" #: libraries/rte/rte_triggers.lib.php:91 #: libraries/rte/rte_triggers.lib.php:104 msgid "MySQL said: " -msgstr "MySQL சொன்னது" +msgstr "MySQL சொன்னது:" #: libraries/common.lib.php:1050 msgid "Failed to connect to SQL validator!" From 286a86bd1ea58a0eec4d22e1c306e6841f2ee4ae Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:00:14 +0200 Subject: [PATCH 285/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index bb6afe7c70..e6209791e4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 08:59+0200\n" +"PO-Revision-Date: 2011-08-19 09:00+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2704,7 +2704,7 @@ msgstr "" #: libraries/common.lib.php:1132 libraries/config/messages.inc.php:481 msgid "Create PHP Code" -msgstr "" +msgstr "PHP குறிமுறை உருவாக்கு" #: libraries/common.lib.php:1151 libraries/config/messages.inc.php:480 #: server_status.php:697 server_status.php:719 server_status.php:738 From 0423014c7b41f629e25bb900b0d706bc8548dfc6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:00:35 +0200 Subject: [PATCH 286/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index e6209791e4..e632ff50b7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2709,7 +2709,7 @@ msgstr "PHP குறிமுறை உருவாக்கு" #: libraries/common.lib.php:1151 libraries/config/messages.inc.php:480 #: server_status.php:697 server_status.php:719 server_status.php:738 msgid "Refresh" -msgstr "" +msgstr "புதுப்பி" #: libraries/common.lib.php:1161 msgid "Skip Validate SQL" From bad8050558c852f31b357376ea2b2e3b83b49e85 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:01:02 +0200 Subject: [PATCH 287/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index e632ff50b7..4f63f9bb88 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:00+0200\n" +"PO-Revision-Date: 2011-08-19 09:01+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2782,7 +2782,7 @@ msgstr "" #: libraries/display_tbl.lib.php:306 msgctxt "First page" msgid "Begin" -msgstr "" +msgstr "ஆரம்பம்" #: libraries/common.lib.php:2295 libraries/common.lib.php:2298 #: libraries/display_tbl.lib.php:307 server_binlog.php:135 From b5a31db25b9f5d076a230043efe6c9612a4e0c83 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:01:23 +0200 Subject: [PATCH 288/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 4f63f9bb88..a3c04becde 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2789,7 +2789,7 @@ msgstr "ஆரம்பம்" #: server_binlog.php:137 msgctxt "Previous page" msgid "Previous" -msgstr "" +msgstr "முந்தைய" #: libraries/common.lib.php:2324 libraries/common.lib.php:2327 #: libraries/display_tbl.lib.php:370 server_binlog.php:170 From 8723a825eaa6d7e1da654ac4b7a4be4b926b8840 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:01:30 +0200 Subject: [PATCH 289/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index a3c04becde..8eef3753b1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2796,7 +2796,7 @@ msgstr "முந்தைய" #: server_binlog.php:172 msgctxt "Next page" msgid "Next" -msgstr "" +msgstr "அடுத்து" #: libraries/common.lib.php:2325 libraries/common.lib.php:2328 #: libraries/display_tbl.lib.php:385 From be26dcb34bdb94ffe60990053ce6b0e4d7bf8564 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:01:39 +0200 Subject: [PATCH 290/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 8eef3753b1..79201360cf 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2802,7 +2802,7 @@ msgstr "அடுத்து" #: libraries/display_tbl.lib.php:385 msgctxt "Last page" msgid "End" -msgstr "" +msgstr "முடிவு" #: libraries/common.lib.php:2393 #, php-format From 0907cefa4ab4f86df414dc669209cda8298e5dad Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:02:04 +0200 Subject: [PATCH 291/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 79201360cf..8098e77db1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:01+0200\n" +"PO-Revision-Date: 2011-08-19 09:02+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2829,7 +2829,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:608 pmd_general.php:151 #: server_privileges.php:601 server_replication.php:313 tbl_tracking.php:253 msgid "Structure" -msgstr "" +msgstr "கட்டமைப்பு" #: libraries/common.lib.php:2920 libraries/common.lib.php:2927 #: libraries/config/messages.inc.php:214 libraries/db_links.inc.php:53 From ecb999e010986143bb1c715c932f3c94d676f72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:02:11 +0200 Subject: [PATCH 292/492] Remove some unused variables --- libraries/replication.inc.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 58ed7c5acc..857f4dc8da 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) { From a455d0434cf2fc63e78cb6b8f6910bb9decec8a8 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:02:12 +0200 Subject: [PATCH 293/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 8098e77db1..438e3e874f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2837,7 +2837,7 @@ msgstr "கட்டமைப்பு" #: libraries/server_links.inc.php:47 libraries/tbl_links.inc.php:65 #: querywindow.php:64 msgid "SQL" -msgstr "" +msgstr "SQL" #: libraries/common.lib.php:2922 libraries/common.lib.php:3115 #: libraries/common.lib.php:3116 libraries/sql_query_form.lib.php:284 From 8a8c1947009507e383f31192eb7b72e2d7dafc65 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:02:36 +0200 Subject: [PATCH 294/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 438e3e874f..d6a8f87fbf 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2843,7 +2843,7 @@ msgstr "SQL" #: libraries/common.lib.php:3116 libraries/sql_query_form.lib.php:284 #: libraries/sql_query_form.lib.php:287 libraries/tbl_links.inc.php:74 msgid "Insert" -msgstr "" +msgstr "செருகு" #: libraries/common.lib.php:2929 libraries/db_links.inc.php:86 #: libraries/tbl_links.inc.php:93 libraries/tbl_links.inc.php:114 From 80b0cf55aea23a963d8ca77477d5bad46641fa50 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:04:00 +0200 Subject: [PATCH 295/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index d6a8f87fbf..ff825ccc06 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:02+0200\n" +"PO-Revision-Date: 2011-08-19 09:04+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2849,7 +2849,7 @@ msgstr "செருகு" #: libraries/tbl_links.inc.php:93 libraries/tbl_links.inc.php:114 #: view_operations.php:87 msgid "Operations" -msgstr "" +msgstr "செயல்பாடுகள்" #: libraries/common.lib.php:3061 msgid "Browse your computer:" From c5435cb2e068ef6d0ee50c601b1fd0b0db5da179 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:04:29 +0200 Subject: [PATCH 296/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index ff825ccc06..8428809c29 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2853,7 +2853,7 @@ msgstr "செயல்பாடுகள்" #: libraries/common.lib.php:3061 msgid "Browse your computer:" -msgstr "" +msgstr "உனது கணினியை உலாவு" #: libraries/common.lib.php:3078 #, php-format From df5a04a565053fb98443de8b8040c7f279e3396e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:04:44 +0200 Subject: [PATCH 297/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 8428809c29..ecfe5aa9ed 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2871,7 +2871,7 @@ msgstr "" #: libraries/common.lib.php:3126 libraries/common.lib.php:3127 msgid "Execute" -msgstr "" +msgstr "நிறைவேற்று" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 From ae0e06f9751cdba8b5cd68e664f442058ae735ff Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:05:07 +0200 Subject: [PATCH 298/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index ecfe5aa9ed..06a48613bc 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:04+0200\n" +"PO-Revision-Date: 2011-08-19 09:05+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2876,7 +2876,7 @@ msgstr "நிறைவேற்று" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 msgid "Both" -msgstr "" +msgstr "இரு சார்பிலும்" #: libraries/config.values.php:47 msgid "Nowhere" From 66ce2296e20f4e04ed3c2c8047f4739374bc957d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:05:21 +0200 Subject: [PATCH 299/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 06a48613bc..27757b8179 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2884,7 +2884,7 @@ msgstr "" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "இடது" #: libraries/config.values.php:47 msgid "Right" From 8e651f32271e2ea6960f21d29ab1d8818a9f7865 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:05:33 +0200 Subject: [PATCH 300/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 27757b8179..cbea52830c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2888,7 +2888,7 @@ msgstr "இடது" #: libraries/config.values.php:47 msgid "Right" -msgstr "" +msgstr "வலது" #: libraries/config.values.php:75 msgid "Open" From 543127e6f729c91a7139d277531d7798cb72c9d9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:05:41 +0200 Subject: [PATCH 301/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index cbea52830c..3383c80435 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2892,7 +2892,7 @@ msgstr "வலது" #: libraries/config.values.php:75 msgid "Open" -msgstr "" +msgstr "திற" #: libraries/config.values.php:75 msgid "Closed" From ce41ca9851fa7bcfe1fdc3fa44fba3af7ca25a68 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:05:53 +0200 Subject: [PATCH 302/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 3383c80435..14f1807ee1 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2896,7 +2896,7 @@ msgstr "திற" #: libraries/config.values.php:75 msgid "Closed" -msgstr "" +msgstr "மூடப்பட்டது" #: libraries/config.values.php:96 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 From b72167ab95c9f6e94b937ffd5213b1b433451b65 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:06:08 +0200 Subject: [PATCH 303/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 14f1807ee1..c3f7887ec2 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:05+0200\n" +"PO-Revision-Date: 2011-08-19 09:06+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -2902,7 +2902,7 @@ msgstr "மூடப்பட்டது" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:129 libraries/export/texytext.php:24 msgid "structure" -msgstr "" +msgstr "கட்டமைப்பு" #: libraries/config.values.php:97 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 From 13f896e6c8a76be7970bb39ea8cdec1c78d812e3 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:06:18 +0200 Subject: [PATCH 304/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c3f7887ec2..922b7c771e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2908,7 +2908,7 @@ msgstr "கட்டமைப்பு" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:130 libraries/export/texytext.php:24 msgid "data" -msgstr "" +msgstr "தரவு" #: libraries/config.values.php:98 libraries/export/htmlword.php:25 #: libraries/export/latex.php:42 libraries/export/odt.php:34 From 95e8bbb550e0f7957c21da28aa7aa4886082b3de Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:06:32 +0200 Subject: [PATCH 305/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 922b7c771e..9dc0ef3e5c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2914,7 +2914,7 @@ msgstr "தரவு" #: libraries/export/latex.php:42 libraries/export/odt.php:34 #: libraries/export/sql.php:131 libraries/export/texytext.php:24 msgid "structure and data" -msgstr "" +msgstr "கட்டமைப்பும் தரவும்" #: libraries/config.values.php:100 msgid "Quick - display only the minimal options to configure" From ab166dd8490cba11d172e8573f8b407fe4d776d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:06:46 +0200 Subject: [PATCH 306/492] Remove some unused vars --- libraries/schema/User_Schema.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 95d60e127b..53d29fec07 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; ?>
@@ -505,12 +505,12 @@ 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"; + /* TODO: use PMA_DBI_get_columns */ $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 '
' . $temp_sh_page['table_name'] . ''; if (isset($with_field_names)) { From 88ef580bd5c575b8cdaa8dea2a3968cfd2504efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:09:12 +0200 Subject: [PATCH 307/492] Use PMA_DBI_get_columns instead of custom query --- libraries/schema/User_Schema.class.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 53d29fec07..4ed00f2e18 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -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"; - /* TODO: use PMA_DBI_get_columns */ - $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); - echo '
' . $temp_sh_page['table_name'] . ''; 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 '
' . htmlspecialchars($row['Field']) . "\n"; } } echo '
' . "\n"; - PMA_DBI_free_result($fields_rs); - unset($fields_rs); $i++; } ?> From 640d5271bc00df82e125fae865ae6970cfaed4d3 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:10:35 +0200 Subject: [PATCH 308/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 9dc0ef3e5c..03904f372c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:06+0200\n" +"PO-Revision-Date: 2011-08-19 09:10+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -11153,7 +11153,7 @@ msgstr "" #: po/advisory_rules.php:40 po/advisory_rules.php:45 msgid "Minor Version" -msgstr "" +msgstr "சிறு பதிப்பு" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." From 67f04dafa32a8f75c214b0f807ac501cef371fbf Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:10:44 +0200 Subject: [PATCH 309/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 03904f372c..37079ad90c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -11153,7 +11153,7 @@ msgstr "" #: po/advisory_rules.php:40 po/advisory_rules.php:45 msgid "Minor Version" -msgstr "சிறு பதிப்பு" +msgstr "சிறுய பதிப்பு" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." From dd046f10b338bbdd491526a12f3e6dd0a7c45dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:11:01 +0200 Subject: [PATCH 310/492] Fix typo --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 4ed00f2e18..36029587f5 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -507,7 +507,7 @@ class PMA_User_Schema echo '
' . $temp_sh_page['table_name'] . ''; 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 '
' . htmlspecialchars($row['Field']) . "\n"; } From f0babc56a34afaf2664328a332e871c0116468d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:11:06 +0200 Subject: [PATCH 311/492] Fix indentation --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 36029587f5..41a2b9e6fe 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -509,7 +509,7 @@ class PMA_User_Schema if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); foreach ($fields as $row) { - echo '
' . htmlspecialchars($row['Field']) . "\n"; + echo '
' . htmlspecialchars($row['Field']) . "\n"; } } echo '
' . "\n"; From 22619d4135f6b1364caf0e37fe5c5484ed897f68 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:11:36 +0200 Subject: [PATCH 312/492] Translation update done using Pootle. --- po/ta.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ta.po b/po/ta.po index 37079ad90c..c4e1ea0b69 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:10+0200\n" +"PO-Revision-Date: 2011-08-19 09:11+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -11174,10 +11174,9 @@ msgid "You should upgrade, to a stable version of MySQL 5.5" msgstr "" #: po/advisory_rules.php:50 po/advisory_rules.php:55 -#, fuzzy #| msgid "Action" msgid "Distribution" -msgstr "செயல்" +msgstr "பரம்பல்" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." From 27253b11082f51a168918c96521d6fea20751101 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:12:31 +0200 Subject: [PATCH 313/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index c4e1ea0b69..4af6d6f5e2 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:11+0200\n" +"PO-Revision-Date: 2011-08-19 09:12+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -11149,7 +11149,7 @@ msgstr "" #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 #, php-format msgid "Current version: %s" -msgstr "" +msgstr "நடப்பு பதிப்பு: %s" #: po/advisory_rules.php:40 po/advisory_rules.php:45 msgid "Minor Version" From 5b43e90bdef1144a332705e8d1000556c3c45412 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:13:18 +0200 Subject: [PATCH 314/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4af6d6f5e2..c897b1374e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:12+0200\n" +"PO-Revision-Date: 2011-08-19 09:13+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10999,7 +10999,7 @@ msgstr "" #: transformation_overview.php:47 msgctxt "for MIME transformation" msgid "Description" -msgstr "" +msgstr "விவரிப்பு" #: user_password.php:34 msgid "You don't have sufficient privileges to be here right now!" From e350eaeae71dcacc946e5686a526576103f5f32c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:13:21 +0200 Subject: [PATCH 315/492] Use PMA_DBI_get_columns instead of custom query --- db_search.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/db_search.php b/db_search.php index c0f2c082af..6242a53d9b 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 From 7221220d6042393e73db0280fdfd3d087ef2e05c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:13:42 +0200 Subject: [PATCH 316/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c897b1374e..bf7f46207c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -11011,7 +11011,7 @@ msgstr "" #: view_create.php:141 msgid "VIEW name" -msgstr "" +msgstr "பெயரை பார்" #: view_operations.php:91 msgid "Rename view to" From 7373a4549061f64da522d537bc6db906a0bc9043 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:14:11 +0200 Subject: [PATCH 317/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index bf7f46207c..ef1a2cfd13 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:13+0200\n" +"PO-Revision-Date: 2011-08-19 09:14+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10977,7 +10977,7 @@ msgstr "" #: tbl_zoom_select.php:394 msgid "How to use" -msgstr "" +msgstr "எப்படி பயன்படுத்துவது" #: themes.php:28 msgid "Get more themes!" From ed1905ff8439dc2879a21901cf8e3529fb3edec5 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:14:40 +0200 Subject: [PATCH 318/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index ef1a2cfd13..4fab372400 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10951,7 +10951,7 @@ msgstr "" #: tbl_tracking.php:731 msgid "Create version" -msgstr "" +msgstr "பதிப்பை உருவாக்கு" #: tbl_zoom_select.php:140 msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" From f66f8b7074679180790312f87c874fecda86b86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:14:54 +0200 Subject: [PATCH 319/492] Use PMA_DBI_get_columns instead of custom query --- libraries/schema/Pdf_Relation_Schema.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index e74c14d126..ed96efd053 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(); From d1d840d0885aa994ffce71784a7ab2d513415ec1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:15:02 +0200 Subject: [PATCH 320/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 4fab372400..6c94302d79 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:14+0200\n" +"PO-Revision-Date: 2011-08-19 09:15+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10916,7 +10916,7 @@ msgstr "" #: tbl_tracking.php:635 msgid "Version" -msgstr "" +msgstr "பதிப்பு" #: tbl_tracking.php:683 #, php-format From 9d8fa2e1b17b12efeb7880dfa4ce9ee5e48705e7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:15:34 +0200 Subject: [PATCH 321/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 6c94302d79..bd51b89a23 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10934,7 +10934,7 @@ msgstr "" #: tbl_tracking.php:698 msgid "Activate now" -msgstr "" +msgstr "இப்போது செயற்படுத்து" #: tbl_tracking.php:711 #, php-format From 6224d14bf5f7651527afe89975798f370adf08b7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:15:55 +0200 Subject: [PATCH 322/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index bd51b89a23..978406e75b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10912,7 +10912,7 @@ msgstr "" #: tbl_tracking.php:603 msgid "Show versions" -msgstr "" +msgstr "பதிப்புகளை காட்டு" #: tbl_tracking.php:635 msgid "Version" From c208d237bd5ebb8657c12101d147992e4d7dab9e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:16:11 +0200 Subject: [PATCH 323/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 978406e75b..a0d8b12a14 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:15+0200\n" +"PO-Revision-Date: 2011-08-19 09:16+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10879,7 +10879,7 @@ msgstr "" #: tbl_tracking.php:444 tbl_tracking.php:501 msgid "Date" -msgstr "" +msgstr "திகதி" #: tbl_tracking.php:446 msgid "Data definition statement" From 624fdc8b2a62971abe3dc14a46132bc61356a888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:16:17 +0200 Subject: [PATCH 324/492] Remove not used variable --- transformation_wrapper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/transformation_wrapper.php b/transformation_wrapper.php index 577a4353a0..1c5e16a3ec 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); From a64d51fc900198c80176e5dc2dc6592854ed8289 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:16:28 +0200 Subject: [PATCH 325/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index a0d8b12a14..587dd25e04 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10875,7 +10875,7 @@ msgstr "" #: tbl_tracking.php:434 msgid "No data" -msgstr "" +msgstr "தரவு இல்லை" #: tbl_tracking.php:444 tbl_tracking.php:501 msgid "Date" From 6088680e1b1a6431bad45eb22e0c7bc9c2852e72 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:17:00 +0200 Subject: [PATCH 326/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 587dd25e04..d0024a94db 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:16+0200\n" +"PO-Revision-Date: 2011-08-19 09:17+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10854,7 +10854,7 @@ msgstr "" #: tbl_tracking.php:375 tbl_tracking.php:392 msgid "Query error" -msgstr "" +msgstr "வினவல் வழு" #: tbl_tracking.php:390 msgid "Tracking data manipulation successfully deleted" From cea5d8791ef776dc87961ae4f69c393acdffe381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:17:21 +0200 Subject: [PATCH 327/492] Use PMA_DBI_get_columns instead of custom query --- tbl_change.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 5329f159a1..bf0704a899 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 From 31bda80aad6ce55d7d956215a7b7c87f810889cd Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:17:57 +0200 Subject: [PATCH 328/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index d0024a94db..9bfcb6eccd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10740,7 +10740,7 @@ msgstr "" #: tbl_structure.php:358 msgctxt "None for default" msgid "None" -msgstr "" +msgstr "ஒன்றுமில்லாத" #: tbl_structure.php:371 #, php-format From 5209562dd3504c160f26f3d6466683fda7cdabfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:18:27 +0200 Subject: [PATCH 329/492] Use PMA_DBI_get_columns instead of custom query --- libraries/sql_query_form.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 542cfc3306..beab95d80b 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 = ' Date: Fri, 19 Aug 2011 09:18:32 +0200 Subject: [PATCH 330/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 9bfcb6eccd..3013923806 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:17+0200\n" +"PO-Revision-Date: 2011-08-19 09:18+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10771,7 +10771,7 @@ msgstr "புதிய பயனாளரை சேர்க்க" #: tbl_structure.php:620 msgid "Relation view" -msgstr "" +msgstr "தொடர்பு பார்வை" #: tbl_structure.php:626 msgid "Propose table structure" From 97f5c6251540d34b116976e22024b99fd1258eb4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:18:48 +0200 Subject: [PATCH 331/492] Translation update done using Pootle. --- po/ta.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 3013923806..82ab8a5dc7 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10764,10 +10764,9 @@ msgid "Show more actions" msgstr "" #: tbl_structure.php:603 -#, fuzzy #| msgid "Add a new User" msgid "Edit view" -msgstr "புதிய பயனாளரை சேர்க்க" +msgstr "தொகுப்பு பார்வை" #: tbl_structure.php:620 msgid "Relation view" From 107001737b8db1bac137cf8695d44a3933145d20 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:19:43 +0200 Subject: [PATCH 332/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 82ab8a5dc7..2cd2d2d5fe 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:18+0200\n" +"PO-Revision-Date: 2011-08-19 09:19+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10664,7 +10664,7 @@ msgstr "" #: tbl_printview.php:378 tbl_structure.php:892 msgid "Row size" -msgstr "" +msgstr "நிரல் அளவு" #: tbl_printview.php:388 tbl_structure.php:900 msgid "Next autoindex" From f40d52d33c18a19647834fe33557850b8450f25e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:20:04 +0200 Subject: [PATCH 333/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 2cd2d2d5fe..cf7ea82cc4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:19+0200\n" +"PO-Revision-Date: 2011-08-19 09:20+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10660,7 +10660,7 @@ msgstr "" #: tbl_printview.php:368 tbl_structure.php:884 msgid "Row length" -msgstr "" +msgstr "நிரல் நீளம்" #: tbl_printview.php:378 tbl_structure.php:892 msgid "Row size" From c4c445b0e9ba76f53de048d1b322595c06ebce26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:20:23 +0200 Subject: [PATCH 334/492] Use PMA_DBI_get_columns instead of custom query --- libraries/tbl_select.lib.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index af97aa434e..57c520dfc5 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); From 730b208431e3481616f14162d5e0cb8da5299fc9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:20:47 +0200 Subject: [PATCH 335/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index cf7ea82cc4..055ea7c628 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10656,7 +10656,7 @@ msgstr "" #: tbl_printview.php:346 tbl_structure.php:841 msgid "dynamic" -msgstr "" +msgstr "இறக்காற்றல்" #: tbl_printview.php:368 tbl_structure.php:884 msgid "Row length" From a226409e7b7c0c5cb23dbf810343fafcb15df45f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:21:05 +0200 Subject: [PATCH 336/492] Translation update done using Pootle. --- po/ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ta.po b/po/ta.po index 055ea7c628..c3639f02e5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 09:20+0200\n" +"PO-Revision-Date: 2011-08-19 09:21+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10652,7 +10652,7 @@ msgstr "" #: tbl_printview.php:344 tbl_structure.php:839 msgid "static" -msgstr "" +msgstr "மாறா" #: tbl_printview.php:346 tbl_structure.php:841 msgid "dynamic" From 4162309826bbd222a450cd8a95fc534ead3831ac Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:21:20 +0200 Subject: [PATCH 337/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index c3639f02e5..2af005a010 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10640,7 +10640,7 @@ msgstr "" #: tbl_printview.php:278 tbl_structure.php:762 msgid "Usage" -msgstr "" +msgstr "பாவனையளவு" #: tbl_printview.php:305 tbl_structure.php:789 msgid "Effective" From 37aa1d2507dec8fe72725c9d3acfc8acb7746d8e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 09:21:50 +0200 Subject: [PATCH 338/492] Translation update done using Pootle. --- po/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ta.po b/po/ta.po index 2af005a010..0f84323b53 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10632,7 +10632,7 @@ msgstr "" #: tbl_printview.php:72 msgid "Show tables" -msgstr "" +msgstr "அட்டவணைகளை காட்டு" #: tbl_printview.php:274 tbl_structure.php:758 msgid "Space usage" From e73110f21f2c85a0eb59d32c617e9a6c18a8931c Mon Sep 17 00:00:00 2001 From: Aris Feryanto Date: Fri, 19 Aug 2011 15:30:26 +0800 Subject: [PATCH 339/492] Grid edit: remove unused function --- js/functions.js | 9 --------- js/makegrid.js | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/js/functions.js b/js/functions.js index 156c25b3d4..9f0b7f5ec6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3162,15 +3162,6 @@ function PMA_getCellValue(td) { } } -function PMA_htmlEncode(s) -{ - var el = document.createElement("div"); - el.innerText = el.textContent = s; - s = el.innerHTML; - delete el; - return s; -} - /* Loads a js file, an array may be passed as well */ loadJavascript=function(file) { if($.isArray(file)) { diff --git a/js/makegrid.js b/js/makegrid.js index 2e3b7fec95..70e9b9adb1 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -372,7 +372,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $.post('sql.php', post_params, function(data) { if (data.success != true) { var $temp_div = $(document.createElement('div')); - $temp_div.html(PMA_htmlEncode(data.error)); + $temp_div.html(data.error); $temp_div.addClass("error"); PMA_ajaxShowMessage($temp_div); } From 555aa5cfa2f40382068c9f23c12ecc3c7023c2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:31:43 +0200 Subject: [PATCH 340/492] Fix indentation --- server_status.php | 366 +++++++++++++++++++++++----------------------- 1 file changed, 185 insertions(+), 181 deletions(-) diff --git a/server_status.php b/server_status.php index 8d196adb85..ce4df7564e 100644 --- a/server_status.php +++ b/server_status.php @@ -31,161 +31,161 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { // real-time charting data if (isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { - // Process and Connections realtime chart - case 'proc': - $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $num_procs = PMA_DBI_num_rows($result); + // Process and Connections realtime chart + case 'proc': + $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $num_procs = PMA_DBI_num_rows($result); - $ret = array( - 'x' => microtime(true)*1000, - 'y_proc' => $num_procs, - 'y_conn' => $c['Connections'] - ); + $ret = array( + 'x' => microtime(true)*1000, + 'y_proc' => $num_procs, + 'y_conn' => $c['Connections'] + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Query realtime chart - case 'queries': - $queries = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') - AND Value > 0'", 0, 1); - cleanDeprecated($queries); - // admin commands are not queries - unset($queries['Com_admin_commands']); - $questions = $queries['Questions']; - unset($queries['Questions']); + // Query realtime chart + case 'queries': + $queries = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') + AND Value > 0'", 0, 1); + cleanDeprecated($queries); + // admin commands are not queries + unset($queries['Com_admin_commands']); + $questions = $queries['Questions']; + unset($queries['Questions']); - //$sum=array_sum($queries); - $ret = array( - 'x' => microtime(true)*1000, - 'y' => $questions, - 'pointInfo' => $queries - ); + //$sum=array_sum($queries); + $ret = array( + 'x' => microtime(true)*1000, + 'y' => $questions, + 'pointInfo' => $queries + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Traffic realtime chart - case 'traffic': - $traffic = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name = 'Bytes_received' - OR Variable_name = 'Bytes_sent'", 0, 1); + // Traffic realtime chart + case 'traffic': + $traffic = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name = 'Bytes_received' + OR Variable_name = 'Bytes_sent'", 0, 1); - $ret = array( - 'x' => microtime(true)*1000, - 'y_sent' => $traffic['Bytes_sent'], - 'y_received' => $traffic['Bytes_received'] - ); + $ret = array( + 'x' => microtime(true)*1000, + 'y_sent' => $traffic['Bytes_sent'], + 'y_received' => $traffic['Bytes_received'] + ); - exit(json_encode($ret)); + exit(json_encode($ret)); - // Data for the monitor - case 'chartgrid': - $ret = json_decode($_REQUEST['requiredData'], true); - $statusVars = array(); - $serverVars = array(); - $sysinfo = $cpuload = $memory = 0; - $pName = ''; + // Data for the monitor + case 'chartgrid': + $ret = json_decode($_REQUEST['requiredData'], true); + $statusVars = array(); + $serverVars = array(); + $sysinfo = $cpuload = $memory = 0; + $pName = ''; - /* Accumulate all required variables and data */ - // For each chart - foreach ($ret as $chart_id => $chartNodes) { - // For each data series - foreach ($chartNodes as $node_id => $nodeDataPoints) { - // For each data point in the series (usually just 1) - foreach ($nodeDataPoints as $point_id => $dataPoint) { - $pName = $dataPoint['name']; + /* Accumulate all required variables and data */ + // For each chart + foreach ($ret as $chart_id => $chartNodes) { + // For each data series + foreach ($chartNodes as $node_id => $nodeDataPoints) { + // For each data point in the series (usually just 1) + foreach ($nodeDataPoints as $point_id => $dataPoint) { + $pName = $dataPoint['name']; - switch ($dataPoint['type']) { - /* We only collect the status and server variables here to - * read them all in one query, and only afterwards assign them. - * Also do some white list filtering on the names - */ - case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $serverVars[] = $pName; - break; + switch ($dataPoint['type']) { + /* We only collect the status and server variables here to + * read them all in one query, and only afterwards assign them. + * Also do some white list filtering on the names + */ + case 'servervar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $serverVars[] = $pName; + break; - case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) - $statusVars[] = $pName; - break; + case 'statusvar': + if (!preg_match('/[^a-zA-Z_]+/', $pName)) + $statusVars[] = $pName; + break; - case 'proc': - $result = PMA_DBI_query('SHOW PROCESSLIST'); - $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); - break; + case 'proc': + $result = PMA_DBI_query('SHOW PROCESSLIST'); + $ret[$chart_id][$node_id][$point_id]['value'] = PMA_DBI_num_rows($result); + break; - case 'cpu': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$cpuload) - $cpuload = $sysinfo->loadavg(); - - if (PHP_OS == 'Linux') { - $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; - $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; - } else - $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; - - break; - - case 'memory': - if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); - $sysinfo = getSysInfo(); - } - if (!$memory) - $memory = $sysinfo->memory(); - - $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; - break; + case 'cpu': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); } + if (!$cpuload) + $cpuload = $sysinfo->loadavg(); + + if (PHP_OS == 'Linux') { + $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; + $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy']; + } else + $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg']; + + break; + + case 'memory': + if (!$sysinfo) { + require_once('libraries/sysinfo.lib.php'); + $sysinfo = getSysInfo(); + } + if (!$memory) + $memory = $sysinfo->memory(); + + $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; + break; + } /* switch */ + } /* foreach */ + } /* foreach */ + } /* foreach */ + + // Retrieve all required status variables + if (count($statusVars)) { + $statusVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); + } else { + $statusVarValues = array(); + } + + // Retrieve all required server variables + if (count($serverVars)) { + $serverVarValues = PMA_DBI_fetch_result( + "SHOW GLOBAL VARIABLES + WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); + } else { + $serverVarValues = array(); + } + + // ...and now assign them + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $nodeDataPoints) { + foreach ($nodeDataPoints as $point_id => $dataPoint) { + switch($dataPoint['type']) { + case 'statusvar': + $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; + break; + case 'servervar': + $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; + break; } } } + } - // Retrieve all required status variables - if (count($statusVars)) { - $statusVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL STATUS - WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); - } else { - $statusVarValues = array(); - } + $ret['x'] = microtime(true)*1000; - // Retrieve all required server variables - if (count($serverVars)) { - $serverVarValues = PMA_DBI_fetch_result( - "SHOW GLOBAL VARIABLES - WHERE Variable_name='" . implode("' OR Variable_name='", $serverVars) . "'", 0, 1); - } else { - $serverVarValues = array(); - } - - // ...and now assign them - foreach ($ret as $chart_id => $chartNodes) { - foreach ($chartNodes as $node_id => $nodeDataPoints) { - foreach ($nodeDataPoints as $point_id => $dataPoint) { - switch($dataPoint['type']) { - case 'statusvar': - $ret[$chart_id][$node_id][$point_id]['value'] = $statusVarValues[$dataPoint['name']]; - break; - case 'servervar': - $ret[$chart_id][$node_id][$point_id]['value'] = $serverVarValues[$dataPoint['name']]; - break; - } - } - } - } - - $ret['x'] = microtime(true)*1000; - - exit(json_encode($ret)); + exit(json_encode($ret)); } } @@ -210,16 +210,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $type = strtolower(substr($row['sql_text'], 0, strpos($row['sql_text'], ' '))); switch($type) { - case 'insert': - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['sql_text']) > 220) - $row['sql_text'] = substr($row['sql_text'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) . ']'; - - break; - default: - break; + case 'insert': + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if (strlen($row['sql_text']) > 220) { + $row['sql_text'] = substr($row['sql_text'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) + . ']'; + } + break; + default: + break; } if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; @@ -261,35 +263,37 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $return['sum'][$type] += $row['#']; switch($type) { - case 'insert': - // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { - $insertTables[$matches[2]]++; - if ($insertTables[$matches[2]] > 1) { - $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; + case 'insert': + // Group inserts if selected + if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + $insertTables[$matches[2]]++; + if ($insertTables[$matches[2]] > 1) { + $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; - // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') - $return['rows'][$insertTablesFirst]['argument'] .= '
...'; + // Add a ... to the end of this query to indicate that there's been other queries + if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + $return['rows'][$insertTablesFirst]['argument'] .= '
...'; - // Group this value, thus do not add to the result list - continue 2; - } else { - $insertTablesFirst = $i; - $insertTables[$matches[2]] += $row['#'] - 1; - } + // Group this value, thus do not add to the result list + continue 2; + } else { + $insertTablesFirst = $i; + $insertTables[$matches[2]] += $row['#'] - 1; } - // No break here + } + // No break here - case 'update': - // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) - $row['argument'] = substr($row['argument'], 0, 200) . '... [' . - implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) . ']'; + case 'update': + // Cut off big inserts and updates, but append byte count therefor + if(strlen($row['argument']) > 220) { + $row['argument'] = substr($row['argument'], 0, 200) + . '... [' + . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) + . ']'; + } + break; - break; - - default: break; + default: break; } $return['rows'][] = $row; @@ -623,19 +627,19 @@ if(PMA_DRIZZLE) { /* Ajax request refresh */ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) { switch($_REQUEST['show']) { - case 'query_statistics': - printQueryStatistics(); - exit(); - case 'server_traffic': - printServerTraffic(); - exit(); - case 'variables_table': - // Prints the variables table - printVariablesTable(); - exit(); + case 'query_statistics': + printQueryStatistics(); + exit(); + case 'server_traffic': + printServerTraffic(); + exit(); + case 'variables_table': + // Prints the variables table + printVariablesTable(); + exit(); - default: - break; + default: + break; } } From 6f33d1366af39331653d29df5a739ee036ce2997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 09:32:26 +0200 Subject: [PATCH 341/492] Fix coding style --- server_status.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server_status.php b/server_status.php index ce4df7564e..6bd9fd6330 100644 --- a/server_status.php +++ b/server_status.php @@ -38,7 +38,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $num_procs = PMA_DBI_num_rows($result); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y_proc' => $num_procs, 'y_conn' => $c['Connections'] ); @@ -59,7 +59,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { //$sum=array_sum($queries); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y' => $questions, 'pointInfo' => $queries ); @@ -74,7 +74,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { OR Variable_name = 'Bytes_sent'", 0, 1); $ret = array( - 'x' => microtime(true)*1000, + 'x' => microtime(true) * 1000, 'y_sent' => $traffic['Bytes_sent'], 'y_received' => $traffic['Bytes_received'] ); @@ -183,7 +183,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - $ret['x'] = microtime(true)*1000; + $ret['x'] = microtime(true) * 1000; exit(json_encode($ret)); } @@ -649,7 +649,7 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true)*1000) . ";\n" . + 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . 'server_os = \'' . PHP_OS . "';\n" . 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . From 52648bbcf61fc1b1d0495f7d911e84a96c6d1913 Mon Sep 17 00:00:00 2001 From: Aris Feryanto Date: Fri, 19 Aug 2011 15:33:31 +0800 Subject: [PATCH 342/492] Grid edit: modify class for Original theme --- themes/original/css/theme_right.css.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index e97b1e9c9d..07c559009a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -2548,17 +2548,21 @@ span.cm-number { margin: 0.3em 0.2em; } +.cEdit .edit_box { + overflow: hidden; + padding: 0; +} + +.cEdit .edit_box_posting { + background: #FFF url(getImgPath(); ?>ajax_clock_small.gif) no-repeat right center; + padding-right: 1.5em; +} + .cEdit .edit_area_loading { background: #FFF url(getImgPath(); ?>ajax_clock_small.gif) no-repeat center; height: 10em; } - -.cEdit .edit_area_posting { - background: #FFF url(getImgPath(); ?>ajax_clock_small.gif) no-repeat center top; - padding-top: 1.5em; -} - .cEdit .goto_link { background: #EEE; color: #555; From c5b393665ca77d719bc67290cc4ddd003354cf4a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 13:36:28 +0530 Subject: [PATCH 343/492] More code style corrections --- libraries/tbl_select.lib.php | 82 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index b2eb0b0e57..bcfe96caaa 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -95,7 +95,6 @@ function PMA_tbl_getFields($table,$db) unset($result, $type); return array($fields_list, $fields_type, $fields_collation, $fields_null, $geom_column_present); - } /** @@ -167,24 +166,23 @@ function PMA_tbl_getSubTabs() * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false){ - +function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false) +{ $str = ''; - if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) { // f o r e i g n k e y s - $str .= ' ' . "\n"; // go back to first row // here, the 4th parameter is empty because there is no current // value of data for the dropdown (the search page initial values // are displayed empty) - $str .= PMA_foreignDropdown($foreignData['disp_row'], - $foreignData['foreign_field'], - $foreignData['foreign_display'], - '', $foreignMaxLimit); - $str .= ' ' . "\n"; - } - elseif ($foreignData['foreign_link'] == true) { + $str .= PMA_foreignDropdown( + $foreignData['disp_row'], $foreignData['foreign_field'], + $foreignData['foreign_display'], '', $foreignMaxLimit + ); + $str .= '' . "\n"; + + } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ $str .= '' . str_replace("'", "\'", $titles['Browse']) . ''; // ]] $str .= ''; + } elseif (in_array($tbl_fields_type[$i], PMA_getGISDatatypes())) { // g e o m e t r y $str .= '' . "\n"; - for ($j = 0; $j < $cnt_enum_value; $j++) { - if(isset($fields[$i]) && is_array($fields[$i]) && in_array($enum_value[$j],$fields[$i])){ - $str .= ' '; - } - else{ - $str .= ' '; - } - } // end for - $str .= ' ' . "\n"; - } - else { + .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; + + for ($j = 0; $j < $cnt_enum_value; $j++) { + if (isset($fields[$i]) + && is_array($fields[$i]) + && in_array($enum_value[$j], $fields[$i]) + ) { + $str .= ''; + } else { + $str .= ''; + } + } // end for + $str .= '' . "\n"; + + } else { // o t h e r c a s e s $the_class = 'textfield'; $type = $tbl_fields_type[$i]; + if ($type == 'date') { $the_class .= ' datefield'; } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') { $the_class .= ' datetimefield'; } - if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= ' ' . "\n"; - } - else{ - $str .= ' ' . "\n"; - } - }; - return $str; + if (isset($fields[$i]) && is_string($fields[$i])) { + $str .= '' . "\n"; + } else { + $str .= '' . "\n"; + } + } + return $str; } - /** * Return the where clause for query generation based on the inputs provided. * @@ -271,8 +275,8 @@ EOT; * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null){ - +function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag, $geom_func = null) +{ /** * @todo move this to a more apropriate place */ From 61335cdc2ed5839ac2914c83c9508cd9e4a6e5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:30:56 +0200 Subject: [PATCH 344/492] Improve coding style --- server_status.php | 92 ++++++++++++++++++++++++++++++----------------- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/server_status.php b/server_status.php index 6bd9fd6330..7c2f30a658 100644 --- a/server_status.php +++ b/server_status.php @@ -15,8 +15,9 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { define('PMA_NO_VARIABLES_IMPORT', true); } -if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $GLOBALS['is_header_sent'] = true; +} require_once './libraries/common.inc.php'; @@ -104,13 +105,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { * Also do some white list filtering on the names */ case 'servervar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $serverVars[] = $pName; + } break; case 'statusvar': - if (!preg_match('/[^a-zA-Z_]+/', $pName)) + if (!preg_match('/[^a-zA-Z_]+/', $pName)) { $statusVars[] = $pName; + } break; case 'proc': @@ -123,8 +126,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$cpuload) + if (!$cpuload) { $cpuload = $sysinfo->loadavg(); + } if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle']; @@ -139,8 +143,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if (!$memory) + if (!$memory) { $memory = $sysinfo->memory(); + } $ret[$chart_id][$node_id][$point_id]['value'] = $memory[$pName]; break; @@ -190,7 +195,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['log_data'])) { - if(PMA_MYSQL_INT_VERSION < 50106) exit('""'); + if (PMA_MYSQL_INT_VERSION < 50106) { + /* FIXME: why this? */ + exit('""'); + } $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); @@ -224,7 +232,9 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; } - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; $return['rows'][] = $row; } @@ -237,7 +247,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if($_REQUEST['type'] == 'general') { + if ($_REQUEST['type'] == 'general') { $limitTypes = (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) ? 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ' : ''; @@ -259,20 +269,23 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { preg_match('/^(\w+)\s/', $row['argument'], $match); $type = strtolower($match[1]); - if(!isset($return['sum'][$type])) $return['sum'][$type] = 0; + if (!isset($return['sum'][$type])) { + $return['sum'][$type] = 0; + } $return['sum'][$type] += $row['#']; switch($type) { case 'insert': // Group inserts if selected - if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { + if ($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) { $insertTables[$matches[2]]++; if ($insertTables[$matches[2]] > 1) { $return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]]; // Add a ... to the end of this query to indicate that there's been other queries - if($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') + if ($return['rows'][$insertTablesFirst]['argument'][strlen($return['rows'][$insertTablesFirst]['argument'])-1] != '.') { $return['rows'][$insertTablesFirst]['argument'] .= '
...'; + } // Group this value, thus do not add to the result list continue 2; @@ -285,7 +298,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'update': // Cut off big inserts and updates, but append byte count therefor - if(strlen($row['argument']) > 220) { + if (strlen($row['argument']) > 220) { $row['argument'] = substr($row['argument'], 0, 200) . '... [' . implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) @@ -310,12 +323,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['logging_vars'])) { - if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { + if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'" . $value . "'"; + if (!is_numeric($value)) { + $value="'" . $value . "'"; + } - if(! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) + if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName'])) { PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value); + } } @@ -323,14 +339,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($loggingVars)); } - if(isset($_REQUEST['query_analyzer'])) { + if (isset($_REQUEST['query_analyzer'])) { $return = array(); - if(strlen($_REQUEST['database'])) + if (strlen($_REQUEST['database'])) { PMA_DBI_select_db($_REQUEST['database']); + } - if ($profiling = PMA_profilingSupported()) + if ($profiling = PMA_profilingSupported()) { PMA_DBI_query('SET PROFILING=1;'); + } // Do not cache query $query = preg_replace('/^(\s*SELECT)/i', '\\1 SQL_NO_CACHE', $_REQUEST['query']); @@ -348,7 +366,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { PMA_DBI_free_result($result); - if($profiling) { + if ($profiling) { $return['profiling'] = array(); $result = PMA_DBI_try_query('SELECT seq,state,duration FROM INFORMATION_SCHEMA.PROFILING WHERE QUERY_ID=1 ORDER BY seq'); while ($row = PMA_DBI_fetch_assoc($result)) { @@ -360,7 +378,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if(isset($_REQUEST['advisor'])) { + if (isset($_REQUEST['advisor'])) { include('libraries/Advisor.class.php'); $advisor = new Advisor(); exit(json_encode($advisor->run())); @@ -610,7 +628,9 @@ foreach ($server_status as $name => $value) { foreach ($allocations as $filter => $section) { if (strpos($name, $filter) !== false) { $allocationMap[$name] = $section; - if ($section == 'com' && $value > 0) $used_queries[$name] = $value; + if ($section == 'com' && $value > 0) { + $used_queries[$name] = $value; + } break; // Only exits inner loop } } @@ -776,7 +796,9 @@ echo __('Runtime Information'); echo ' '; $i=0; foreach ($section_links as $link_name => $link_url) { - if ($i > 0) echo ', '; + if ($i > 0) { + echo ', '; + } if ('doc' == $link_name) { echo PMA_showMySQLDocu($link_url, $link_url); } else { @@ -898,9 +920,11 @@ function printQueryStatistics() $name = str_replace(array('Com_', '_'), array('', ' '), $name); // Group together values that make out less than 2% into "Other", but only if we have more than 6 fractions already - if ($value < $query_sum * 0.02 && count($chart_json)>6) + if ($value < $query_sum * 0.02 && count($chart_json)>6) { $other_sum += $value; - else $chart_json[$name] = $value; + } else { + $chart_json[$name] = $value; + } ?>
+ if (! PMA_DRIZZLE) { + ?> - +

$value) { if (is_numeric($value)) { - if ($i++ > 0) echo ", "; + if ($i++ > 0) { + echo ", "; + } echo "'" . $name . "'"; } } @@ -1652,10 +1679,11 @@ function refreshList($name, $defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, foreach ($refreshRates as $rate) { $selected = ($rate == $defaultRate)?' selected="selected"':''; - if ($rate<60) + if ($rate<60) { echo ''; - else + } else { echo ''; + } } ?> From d2df35108eb6fb98199cde72b4b9fbf00f9e1fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:33:13 +0200 Subject: [PATCH 345/492] Wrap some long lines --- libraries/core.lib.php | 3 ++- server_status.php | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index dcc5208bc6..909f5db66f 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -708,7 +708,8 @@ function PMA_includeJS($url) } /** - * Adds JS code snippets to be displayed by header.inc.php. Adds a newline to each snippet. + * Adds JS code snippets to be displayed by header.inc.php. Adds a + * newline to each snippet. * * @param string $str Js code to be added (e.g. "token=1234;") * diff --git a/server_status.php b/server_status.php index 7c2f30a658..4e215a445a 100644 --- a/server_status.php +++ b/server_status.php @@ -620,7 +620,8 @@ $links['innodb']['doc'] = 'innodb'; // Variable to contain all com_ variables $used_queries = array(); -// Variable to map variable names to their respective section name (used for js category filtering) +// Variable to map variable names to their respective section name +// (used for js category filtering) $allocationMap = array(); // sort vars into arrays @@ -637,10 +638,15 @@ foreach ($server_status as $name => $value) { } if(PMA_DRIZZLE) { - $used_queries = PMA_DBI_fetch_result('SELECT * FROM data_dictionary.global_statements', 0, 1); + $used_queries = PMA_DBI_fetch_result( + 'SELECT * FROM data_dictionary.global_statements', + 0, + 1 + ); unset($used_queries['admin_commands']); } else { - // admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions']) + // admin commands are not queries (e.g. they include COM_PING, + // which is excluded from $server_status['Questions']) unset($used_queries['Com_admin_commands']); } From 17f4b82821695fba5317cb98dc86a692ccc11015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:35:00 +0200 Subject: [PATCH 346/492] Factor out code escaping from echo --- libraries/js_escape.lib.php | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 656794f819..25fb5bfbc7 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -56,25 +56,42 @@ function PMA_escapeJsString($string) "\r" => '\r'))); } +/** + * Formats an javascript assignment with proper escaping of a value + * and support for assigning array of strings. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + * @return string Javascript code. + */ +function PMA_getJsValue($key, $value) +{ + $result = $key . ' = '; + if (is_array($value)) { + $result .= '['; + foreach ($value as $id => $val) { + $result .= "'" . PMA_escapeJsString($val) . "',"; + } + $result .= "];\n"; + } else { + $result .= "'" . PMA_escapeJsString($value) . "';\n"; + } + return $result; +} + /** * Prints an javascript assignment with proper escaping of a value * and support for assigning array of strings. * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings + * + * @return nothing */ function PMA_printJsValue($key, $value) { - echo $key . ' = '; - if (is_array($value)) { - echo '['; - foreach ($value as $id => $val) { - echo "'" . PMA_escapeJsString($val) . "',"; - } - echo "];\n"; - } else { - echo "'" . PMA_escapeJsString($value) . "';\n"; - } + echo PMA_getJsValue($key, $value); } ?> From 4b5ae952dd6486735ed066b69e22962af72f80c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:36:22 +0200 Subject: [PATCH 347/492] Function for setting variable --- libraries/core.lib.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 909f5db66f..a277f29629 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -714,8 +714,21 @@ function PMA_includeJS($url) * @param string $str Js code to be added (e.g. "token=1234;") * */ -function PMA_AddJSCode($str) { +function PMA_AddJSCode($str) +{ $GLOBALS['js_script'][] = $str; } +/** + * Adds JS code snippet for variable assignment to be displayed by header.inc.php. + * + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * + */ +function PMA_AddJSVar($key, $value) +{ + PMA_AddJsCode(PMA_getJsValue($key, $value)); +} + ?> From 1b45290d5551a5619dcd1e29cd8956e30aeb690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:38:51 +0200 Subject: [PATCH 348/492] Use PMA_AddJSVar --- server_status.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server_status.php b/server_status.php index 4e215a445a..30c3c5a850 100644 --- a/server_status.php +++ b/server_status.php @@ -673,14 +673,14 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" . - 'server_time_diff = new Date().getTime() - ' . (microtime(true) * 1000) . ";\n" . - 'server_os = \'' . PHP_OS . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" . - 'profiling_docu = \'' . PMA_showMySQLDocu('general-thread-states', 'general-thread-states') . "';\n" . - 'explain_docu = \'' . PMA_showMySQLDocu('explain-output', 'explain-output') . ";'\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); +PMA_AddJSVar('server_os', PHP_OS); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); +PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); +PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); +PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); /** * start output From 38e8365e5d502120534b8fa60a22d210eb8b1760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:39:45 +0200 Subject: [PATCH 349/492] Use PMA_AddJSVar --- server_variables.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server_variables.php b/server_variables.php index 4c2086ab89..af47f1fe83 100644 --- a/server_variables.php +++ b/server_variables.php @@ -16,9 +16,9 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_variables.js'; -PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" . - 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" . - 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n"); +PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); +PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); +PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); /** @@ -179,4 +179,4 @@ function formatVariable($name,$value) */ require './libraries/footer.inc.php'; -?> \ No newline at end of file +?> From fb1c4bd9ee35e3b873bf0cb28a11ca860a09384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:43:08 +0200 Subject: [PATCH 350/492] Handle more types in js variable formatting --- libraries/js_escape.lib.php | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 25fb5bfbc7..85b62e1e53 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -56,6 +56,27 @@ function PMA_escapeJsString($string) "\r" => '\r'))); } +/** + * Formats a value for javascript code. + * + * @param string $value String to be formatted. + * + * @retrun string formatted value. + */ +function PMA_formatJsVal($value) +{ + if (is_bool($value)) { + if ($value) { + return 'true'; + } else { + return 'false'; + } else if (is_int($value)) { + return int($value); + } else { + return '"' . PMA_escapeJsString($value) . '"'; + } +} + /** * Formats an javascript assignment with proper escaping of a value * and support for assigning array of strings. @@ -71,11 +92,11 @@ function PMA_getJsValue($key, $value) if (is_array($value)) { $result .= '['; foreach ($value as $id => $val) { - $result .= "'" . PMA_escapeJsString($val) . "',"; + $result .= PMA_formatJsVal($value) . ","; } $result .= "];\n"; } else { - $result .= "'" . PMA_escapeJsString($value) . "';\n"; + $result .= PMA_formatJsVal($value) . ";\n"; } return $result; } From e479f1c8431eb3a1b138d7812a1ab0f6d1020188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:47:45 +0200 Subject: [PATCH 351/492] Add test for js escaping --- test/libraries/js_escape_test.php | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/libraries/js_escape_test.php diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php new file mode 100644 index 0000000000..d29fcff743 --- /dev/null +++ b/test/libraries/js_escape_test.php @@ -0,0 +1,37 @@ +assertEquals($expected, PMA_getJsValue($key, $value)); + } + + public function variables() { + return array( + array('foo', true, "foo = true;\n"), + array('foo', false, "foo = false;\n"), + array('foo', 100, "foo = 100;\n"), + array('foo', 0, "foo = 0;\n"), + array('foo', 'text', "foo = \"text\";\n"), + array('foo', 'quote"', "foo = \"quote\\\"\";\n"), + array('foo', 'apostroph\'', "foo = \"apostroph\\'\";\n"), + ); + } +} +?> From c289045dcde84ccad43b6ce6641edf36b3fc6c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:49:58 +0200 Subject: [PATCH 352/492] Fix typo --- libraries/js_escape.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 85b62e1e53..0c795ec23c 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -70,7 +70,8 @@ function PMA_formatJsVal($value) return 'true'; } else { return 'false'; - } else if (is_int($value)) { + } + } elseif (is_int($value)) { return int($value); } else { return '"' . PMA_escapeJsString($value) . '"'; From 3ab9bdf5e371dd4b5f11545da64619da22701229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:52:09 +0200 Subject: [PATCH 353/492] Remove stray code --- test/libraries/js_escape_test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/libraries/js_escape_test.php b/test/libraries/js_escape_test.php index d29fcff743..41d96d3939 100644 --- a/test/libraries/js_escape_test.php +++ b/test/libraries/js_escape_test.php @@ -18,7 +18,6 @@ class PMA_File_test extends PHPUnit_Framework_TestCase */ public function testFormat($key, $value, $expected) { - $arr = new PMA_File($file); $this->assertEquals($expected, PMA_getJsValue($key, $value)); } From 381b593e5997899184e1fc7f3522f4d83bd5f025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:52:32 +0200 Subject: [PATCH 354/492] Fix typecasting --- libraries/js_escape.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 0c795ec23c..87d88552a6 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -72,7 +72,7 @@ function PMA_formatJsVal($value) return 'false'; } } elseif (is_int($value)) { - return int($value); + return (int)$value; } else { return '"' . PMA_escapeJsString($value) . '"'; } From b0afa4d8bc904393d7c9902c95c24dd46ae88d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 10:54:59 +0200 Subject: [PATCH 355/492] Wrap long lines --- server_status.php | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/server_status.php b/server_status.php index 30c3c5a850..1dd4852369 100644 --- a/server_status.php +++ b/server_status.php @@ -673,14 +673,38 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost' || $cfg['Server']['host'] == '127.0.0.1' || $cfg['Server']['host'] == '::1'; -PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']); -PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db))); -PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000)); -PMA_AddJSVar('server_os', PHP_OS); -PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false); -PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false); -PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states')); -PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output')); +PMA_AddJSVar( + 'pma_token', + $_SESSION[' PMA_token '] +); +PMA_AddJSVar( + 'url_query', + str_replace('&', '&', PMA_generate_common_url($db)) +); +PMA_AddJSVar( + 'server_time_diff', + 'new Date().getTime() - ' . (microtime(true) * 1000) +); +PMA_AddJSVar( + 'server_os', + PHP_OS +); +PMA_AddJSVar( + 'is_superuser', + PMA_isSuperuser() +); +PMA_AddJSVar( + 'server_db_isLocal', + $server_db_isLocal +); +PMA_AddJSVar( + 'profiling_docu', + PMA_showMySQLDocu('general-thread-states', 'general-thread-states') +); +PMA_AddJSVar( + 'explain_docu', + PMA_showMySQLDocu('explain-output', 'explain-output') +); /** * start output From a05eb3ebcde7b04d5f742b73b9a768b3f3a5d7d9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 14:27:25 +0530 Subject: [PATCH 356/492] Should return results when $propertiesIconic == true --- libraries/tbl_select.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index bcfe96caaa..d93ad56529 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -19,7 +19,7 @@ require_once 'url_generating.lib.php'; * * @return string $str Value of the Title */ -function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage) +function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) { if ($propertiesIconic == true) { $str = '\n" "Language-Team: slovenian \n" "Language: sl\n" @@ -936,6 +936,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Izberite \"GeomFromText\" iz stolpca \"Funkcija\" in prilepite spodnji niz v " +"polje \"Vrednost\"" #: import.php:57 #, php-format From 0b4929fdf23ebf0c168b5db429d3f0ec941bfee8 Mon Sep 17 00:00:00 2001 From: Domen Date: Fri, 19 Aug 2011 11:24:37 +0200 Subject: [PATCH 361/492] Translation update done using Pootle. --- po/sl.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index dbc84e2996..37a6ea53fc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 11:21+0200\n" +"PO-Revision-Date: 2011-08-19 11:24+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -1876,6 +1876,9 @@ msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." msgstr "" +"Tabela ne vsebuje unikatnega stolpca. Zmožnosti, povezane z urejanjem mreže, " +"potrditvenimi polji, povezavami Uredi, Kopiraj in Izbriši, po shranjevanju " +"morda ne bodo delovale." #: js/messages.php:318 msgid "" From 0f66f58a54e14e5a5b12bc66048fb15165d992d3 Mon Sep 17 00:00:00 2001 From: Domen Date: Fri, 19 Aug 2011 11:26:33 +0200 Subject: [PATCH 362/492] Translation update done using Pootle. --- po/sl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 37a6ea53fc..85dca7fa0e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 11:24+0200\n" +"PO-Revision-Date: 2011-08-19 11:26+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -9486,6 +9486,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"Svetovalni sistem lahko nudi priporočila o strežniških spremenljivkah tako, " +"da analizira spremenljivke stanja strežnika." #: server_status.php:810 msgid "" From e7d6cab2a25e5014c1c10ce927413481dc9ab074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 11:54:34 +0200 Subject: [PATCH 363/492] Missing escaping --- db_datadict.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index e67c096c3e..938ebf7a1a 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -65,7 +65,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { echo '

' . "\n"; - echo '

' . $table . '

' . "\n"; + echo '

' . htmlspecialchars($table) . '

' . "\n"; /** * Gets table informations From 599c9b5e1bacc01a9c9bb6621ec1ed3279c4104a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 11:56:38 +0200 Subject: [PATCH 364/492] More of missing escaping --- db_datadict.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index 938ebf7a1a..6981462972 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -249,9 +249,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
' . $field_name . ''; + echo '' . htmlspecialchars($field_name) . ''; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> ' . htmlspecialchars($field_name) . ''; + echo '' . $field_name . ''; } else { - echo htmlspecialchars($field_name); + echo $field_name; } ?> ' . $field_name . ''; + echo '' . htmlspecialchars($field_name) . ''; } else { - echo $field_name; + echo htmlspecialchars($field_name); } ?> ' . "\n"; - $user_form .= sprintf($link_edit, urlencode($current_user), + $user_form .= sprintf( + $link_edit, + urlencode($current_user), urlencode($current_host), urlencode(! isset($current['Db']) || $current['Db'] == '*' ? '' : $current['Db']), ''); From 7b54504cc0981821619ffd3f0759766448e6b879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:16:59 +0200 Subject: [PATCH 371/492] Fix handling of tables with something what gets urlencoded --- server_privileges.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index a1b7acb839..685b81726d 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1416,7 +1416,7 @@ if (isset($_REQUEST['flush_privileges'])) { /** * defines some standard links */ -$link_edit = ''; -$link_export = ' diff --git a/pmd_pdf.php b/pmd_pdf.php index adf5fac13d..2afe131a66 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -5,7 +5,7 @@ * @package phpMyAdmin-Designer */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; /** * If called directly from the designer, first save the positions diff --git a/pmd_relation_new.php b/pmd_relation_new.php index a104cc119c..fbd624631b 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 58c9135cce..7151cf7563 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); extract($_GET, EXTR_SKIP); $die_save_pos = 0; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index c487ddb1ce..1a071aff8c 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); From cd69e5bdf2081561e5d8891d72820d16a4d99266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:25:47 +0200 Subject: [PATCH 373/492] Include missing database tabs --- db_datadict.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/db_datadict.php b/db_datadict.php index fca38b70e2..89b2bc5590 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; if (! isset($selected_tbl)) { - require_once './libraries/header.inc.php'; + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; } From 98e71f8805faef9787731c861543f07ff5529bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:50:28 +0200 Subject: [PATCH 374/492] First attempt to integrate designer into rest For now works only in pmahomme and needs lot of cleanups and fixes --- pmd_general.php | 30 +- themes/pmahomme/css/theme_right.css.php | 541 ++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 19 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index d270cbdd6b..45b6955d30 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -8,6 +8,8 @@ * */ require_once './libraries/pmd_common.php'; +require './libraries/db_common.inc.php'; +require './libraries/db_info.inc.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); @@ -17,17 +19,6 @@ $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); $hidden = "hidden"; -?> - - - - - - - - Designer - $GLOBALS['lang']); if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; @@ -125,10 +116,6 @@ echo $script_tabs . $script_contr . $script_display_field; title="" /> -
- -
-
@@ -166,8 +153,8 @@ for ($i = 0; $i < $name_cnt; $i++) { echo 'checked="checked"'; } ?> />
');">
px; top: px; @@ -332,7 +324,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?> -
+
Load...
Date: Fri, 19 Aug 2011 12:55:19 +0200 Subject: [PATCH 375/492] Move PMD help to documentation --- Documentation.html | 8 ++++++++ pmd_general.php | 2 +- pmd_help.php | 27 --------------------------- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pmd_help.php diff --git a/Documentation.html b/Documentation.html index 758a2bc90f..d7c76e16a4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4409,6 +4409,14 @@ chmod o+rwx tmp +

+ 6.30 How do I create a relation in designer?

+ +

To select relation, click :

+ +

+

The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.

+

phpMyAdmin project

diff --git a/pmd_general.php b/pmd_general.php index 45b6955d30..3613f1f37d 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -79,7 +79,7 @@ echo $script_tabs . $script_contr . $script_display_field; /> - - - - -Designer - - - -' . __('To select relation, click :') . '
'; - echo '

'; - echo '

' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '

'; -?> - - From e443bdbd5a1618c3aad6040c6c71d9b365491ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 12:59:46 +0200 Subject: [PATCH 376/492] Remove explicit font definitions --- themes/pmahomme/css/theme_right.css.php | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fc04961034..0a4784553c 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3046,8 +3046,6 @@ canvas.pmd * { color: #000000; border-collapse: collapse; border: 1px solid #AAAAAA; - font-family: Tahoma, sans-serif; - font-size: 10px; z-index: 1; -moz-user-select: none; } @@ -3109,8 +3107,6 @@ canvas.pmd * { .pmd_Tabs { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; white-space: nowrap; text-decoration: none; @@ -3125,8 +3121,6 @@ canvas.pmd * { .pmd_Tabs2 { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; background: #FFEE99; text-indent: 3px; @@ -3138,10 +3132,7 @@ canvas.pmd * { } .owner { - font-family: Tahoma, sans-serif; - font-size: 9px; font-weight: normal; -/* background-color: #ffffff;*/ color: #888888; } @@ -3209,7 +3200,6 @@ canvas.pmd * { .butt { border: #4477aa solid 1px; - font-size: 11px; font-weight: bold; height: 19px; width: 70px; @@ -3219,7 +3209,6 @@ canvas.pmd * { } .L_butt2_1 { - font-size: 12px; padding: 1px; text-decoration: none; background-color: #ffffff; @@ -3229,7 +3218,6 @@ canvas.pmd * { } .L_butt2_2 { - font-size: 12px; padding: 0; border: #0099CC solid 1px; background: #FFEE99; @@ -3404,11 +3392,8 @@ a.trigger{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#fff; padding: 10px 40px 10px 15px; -font-weight: 700; background:#333333 url(images/plus.png) 85% 55% no-repeat; border:1px solid #444444; display: block; @@ -3418,11 +3403,8 @@ a.trigger:hover{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#080808; padding: 10px 40px 10px 15px; -font-weight: 700; background:#fff696 url(images/plus.png) 85% 55% no-repeat; border:1px solid #999; display: block; @@ -3442,7 +3424,6 @@ h2.tiger{ background-repeat: repeat-x; padding: 1px; font-weight: bold; - font-size:14px; padding: 50 20 50 20px; margin: 0 0 5px 0; width: 250px; @@ -3543,8 +3524,6 @@ h2.active { color:black; font-weight:bold; padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; text-align:left; } From 19dd8f292885ca6adc284b6c0977cb3ccfff20d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:04:08 +0200 Subject: [PATCH 377/492] Make canvas aligned with tables --- pmd_general.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 3613f1f37d..bfb98187bf 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -117,6 +117,9 @@ echo $script_tabs . $script_contr . $script_display_field;
+
+ +
-
- -
Date: Fri, 19 Aug 2011 13:10:33 +0200 Subject: [PATCH 378/492] Fix js to match changes --- js/pmd/move.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index eb2b246476..f5456a5bbc 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -159,8 +159,8 @@ function MouseMove(e) } if (ON_relation || ON_display_field) { - document.getElementById('hint').style.left = (Glob_X + 20) + 'px'; - document.getElementById('hint').style.top = (Glob_Y + 20) + 'px'; + document.getElementById('pmd_hint').style.left = (Glob_X + 20) + 'px'; + document.getElementById('pmd_hint').style.top = (Glob_Y + 20) + 'px'; } if (layer_menu_cur_click) { @@ -225,7 +225,7 @@ function Main() Canvas_pos(); Small_tab_refresh(); Re_load(); - id_hint = document.getElementById('hint'); + id_hint = document.getElementById('pmd_hint'); if (isIE) { General_scroll(); } @@ -535,12 +535,12 @@ function Start_relation() if (!ON_relation) { document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; - document.getElementById('hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -561,7 +561,7 @@ function Click_field(T, f, PK) // table field } click_field = 1; link_relation = "T1=" + T + "&F1=" + f; - document.getElementById('hint').innerHTML = PMA_messages['strSelectForeignKey']; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectForeignKey']; } else { Start_relation(); // hidden hint... if (j_tabs[db + '.' + T] != '1' || !PK) { @@ -596,8 +596,8 @@ function Click_field(T, f, PK) // table field display_field[T] = f; } ON_display_field = 0; - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -955,16 +955,16 @@ function Start_display_field() } if (!ON_display_field) { ON_display_field = 1; - document.getElementById('hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE document.getElementById('display_field_button').className = 'M_butt_Selected_down_IE'; } } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1136,8 +1136,8 @@ function add_object() var init = history_array.length; if (rel.value != '--') { if (document.getElementById('Query').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('Query'); @@ -1168,8 +1168,8 @@ function add_object() } if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('having'); @@ -1186,8 +1186,8 @@ function add_object() document.getElementById('orderby').checked = false; //make orderby } - document.getElementById('hint').innerHTML = sum + "object created" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = sum + "object created" ; + document.getElementById('pmd_hint').style.visibility = "visible"; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); From 12237ed84ff6549c6dbc1bc4640b320fd6184304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:10:49 +0200 Subject: [PATCH 379/492] Remove no longer used Help funciton --- js/pmd/move.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index f5456a5bbc..6f302936f0 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -868,11 +868,6 @@ function No_have_constr(id_this) } } -function Help() -{ - var WinHelp = window.open("pmd_help.php", "wind1", "top=200,left=400,width=300,height=200,resizable=yes,scrollbars=yes,menubar=no"); -} - function PDF_save() { // var WinPDF = From 9a0593ab2b76889665ceefa75214b37fc506bf8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:18:05 +0200 Subject: [PATCH 380/492] Fix expanding logic --- pmd_general.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pmd_general.php b/pmd_general.php index bfb98187bf..3cf33df50f 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -238,7 +238,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {

> + > Date: Fri, 19 Aug 2011 13:18:51 +0200 Subject: [PATCH 381/492] Fix typo --- pmd_general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd_general.php b/pmd_general.php index 3cf33df50f..89a6d5c73c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -239,7 +239,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { > Date: Fri, 19 Aug 2011 13:22:10 +0200 Subject: [PATCH 382/492] Get rid of useless variable --- pmd_general.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 89a6d5c73c..cf440941fe 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -17,7 +17,6 @@ $script_contr = get_script_contr(); $tab_pos = get_tab_pos(); $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); -$hidden = "hidden"; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { @@ -120,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field;
-
@@ -432,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -554,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -602,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -678,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- @@ -732,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
- From fd13e7ad67215df22983942163cfff80712637a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:25:08 +0200 Subject: [PATCH 383/492] Use display = none instead of visibility to avoid off screen invisible elements --- js/pmd/move.js | 30 +++++++++++++++--------------- pmd_general.php | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 6f302936f0..e41b107360 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -113,7 +113,7 @@ function MouseDown(e) dx = offsetx - parseInt(cur_click.style.left); dy = offsety - parseInt(cur_click.style.top); //alert(" dx = " + dx + " dy = " +dy); - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; /* var left = parseInt(cur_click.style.left); var top = parseInt(cur_click.style.top); @@ -173,7 +173,7 @@ function MouseMove(e) function MouseUp(e) { if (cur_click != null) { - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'inline-block'; Re_load(); cur_click.style.zIndex = 1; cur_click = null; @@ -605,7 +605,7 @@ function Click_field(T, f, PK) // table field function New_relation() { - document.getElementById('layer_new_relation').style.visibility = 'hidden'; + document.getElementById('layer_new_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; link_relation += Get_url_pos(); @@ -776,14 +776,14 @@ function Canvas_click(id) document.getElementById('layer_upd_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10; document.getElementById('layer_upd_relation').style.top = top + 'px'; - document.getElementById('layer_upd_relation').style.visibility = 'visible'; + document.getElementById('layer_upd_relation').style.display = 'block'; link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key; } } function Upd_relation() { - document.getElementById('layer_upd_relation').style.visibility = 'hidden'; + document.getElementById('layer_upd_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += Get_url_pos(); makeRequest('pmd_relation_upd.php', link_relation); @@ -792,9 +792,9 @@ function Upd_relation() function VisibleTab(id, t_n) { if (id.checked) { - document.getElementById(t_n).style.visibility = 'visible'; + document.getElementById(t_n).style.display = 'block'; } else { - document.getElementById(t_n).style.visibility = 'hidden'; + document.getElementById(t_n).style.display = 'none'; } Re_load(); } @@ -813,10 +813,10 @@ function Hide_tab_all(id_this) // max/min all tables if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') { if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -859,10 +859,10 @@ function No_have_constr(id_this) if (!in_array_k(E.elements[i].value, a)) if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -879,7 +879,7 @@ function General_scroll() { /* if (!document.getElementById('show_relation_olways').checked) { - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; clearTimeout(timeoutID); timeoutID = setTimeout(General_scroll_end, 500); } @@ -908,7 +908,7 @@ function General_scroll_end() document.getElementById('layer_menu').style.left = document.body.scrollLeft; document.getElementById('layer_menu').style.top = document.body.scrollTop + document.getElementById('top_menu').offsetHeight; } - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'block'; } */ @@ -916,7 +916,7 @@ function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; - document.getElementById("layer_menu").style.visibility = 'visible'; + document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; if (isIE) { @@ -924,7 +924,7 @@ function Show_left_menu(id_this) // max/min all tables } } else { document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll - document.getElementById("layer_menu").style.visibility = 'hidden'; + document.getElementById("layer_menu").style.display = 'none'; id_this.alt = "v"; id_this.src = "pmd/images/downarrow2_m.png"; } diff --git a/pmd_general.php b/pmd_general.php index cf440941fe..cf8d842d69 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -119,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field;
-
 @@ -380,7 +380,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="New_relation()" /> + onclick="document.getElementById('layer_new_relation').style.display = 'none';" /> @@ -396,7 +396,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -417,7 +417,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { onclick="Upd_relation()" value="" /> + onclick="document.getElementById('layer_upd_relation').style.display = 'none'; Re_load();" />
@@ -431,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -553,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -585,7 +585,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Rename')" /> + onclick="document.getElementById('query_rename_to').style.display = 'none';" /> @@ -601,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -661,7 +661,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Having')" /> + onclick="document.getElementById('query_having').style.display = 'none';" /> @@ -677,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -715,7 +715,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Aggregate')" /> + onclick="document.getElementById('query_Aggregate').style.display = 'none';" /> @@ -731,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { - @@ -778,7 +778,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="" onclick="edit('Where')" /> + onclick="document.getElementById('query_where').style.display = 'none';" /> From 1fa197752bea2661a25431c9d2d3eccaa72aedef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:35:13 +0200 Subject: [PATCH 384/492] Fixed displaying of table menu --- js/pmd/move.js | 5 ++++- themes/pmahomme/css/theme_right.css.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index e41b107360..49be35c3be 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -915,7 +915,10 @@ function General_scroll_end() function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { - document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; + var pos = $("#top_menu").offset(); + var height = $("#top_menu").height(); + document.getElementById("layer_menu").style.top = (pos.top + height) + 'px'; + document.getElementById("layer_menu").style.left = pos.left + 'px'; document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 0a4784553c..ae1867711a 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3325,9 +3325,9 @@ a.M_butt:hover { } #layer_menu { - clear: both; - float: left; z-index: 1000; + position: absolute; + left: 0; background-color: #EAEEF0; border: #999999 solid 1px; } From d77ee8191650ab47e5ddeffd4c81e51969da0aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:41:44 +0200 Subject: [PATCH 385/492] Fix syntax errors --- themes/pmahomme/css/theme_right.css.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ae1867711a..16b73db467 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3520,7 +3520,7 @@ h2.active { left-padding:8px; margin:0; border-bottom:4px solid #3CF; - background-color: #D0DCE0; //#09c; + background-color: #D0DCE0; color:black; font-weight:bold; padding-left: 2px; @@ -3528,7 +3528,7 @@ h2.active { } #tblfooter { - background-color: D3DCE3; + background-color: #D3DCE3; float: right; padding-top:10px; color: black; From aaf92da021e9ce68d91d023e407aa85a2378be96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:42:24 +0200 Subject: [PATCH 386/492] Fix indentation --- themes/pmahomme/css/theme_right.css.php | 62 ++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 16b73db467..646a4e0f35 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3375,49 +3375,49 @@ a.M_butt:hover { } .panel { -position: fixed; -top: 50px; -right: 0; -display: none; -background: #FFF; -border:1px solid #F5F5F5; -width: 350 px; -height: auto; -padding: 30px 170px 30px 30px; -color:#FFF; -z-index:99; + position: fixed; + top: 50px; + right: 0; + display: none; + background: #FFF; + border:1px solid #F5F5F5; + width: 350 px; + height: auto; + padding: 30px 170px 30px 30px; + color:#FFF; + z-index:99; } a.trigger{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -color:#fff; -padding: 10px 40px 10px 15px; -background:#333333 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #444444; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#fff; + padding: 10px 40px 10px 15px; + background:#333333 url(images/plus.png) 85% 55% no-repeat; + border:1px solid #444444; + display: block; } a.trigger:hover{ -position: fixed; -text-decoration: none; -top: 60px; right: 0; -color:#080808; -padding: 10px 40px 10px 15px; -background:#fff696 url(images/plus.png) 85% 55% no-repeat; -border:1px solid #999; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#080808; + padding: 10px 40px 10px 15px; + background:#fff696 url(images/plus.png) 85% 55% no-repeat; + border:1px solid #999; + display: block; } a.active.trigger { -background:#222222 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#222222 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } a.active.trigger:hover { -background:#fff696 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#fff696 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } h2.tiger{ From 8214176078993523ff967538d9a4130fc68b637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:42:33 +0200 Subject: [PATCH 387/492] Remove tabs --- themes/pmahomme/css/theme_right.css.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 646a4e0f35..6109d89129 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1462,7 +1462,7 @@ div#queryAnalyzerDialog div.CodeMirror-scroll { } div#queryAnalyzerDialog div#queryProfiling { - height: 250px; + height: 250px; } div#queryAnalyzerDialog td.explain { @@ -1470,9 +1470,9 @@ div#queryAnalyzerDialog td.explain { } div#queryAnalyzerDialog table.queryNums { - display: none; - border:0; - text-align:left; + display: none; + border:0; + text-align:left; } .smallIndent { From 86dad703868c01089cfdceaaf3cc0a7e0bbdf10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:45:02 +0200 Subject: [PATCH 388/492] Fix some display issues --- js/pmd/move.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 49be35c3be..6c3f56e832 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -536,11 +536,11 @@ function Start_relation() document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -551,7 +551,7 @@ function Click_field(T, f, PK) // table field { if (ON_relation) { if (!click_field) { - //.style.display=='none' .style.visibility = "hidden" + //.style.display=='none' .style.display = 'none' if (!PK) { alert(PMA_messages['strPleaseSelectPrimaryOrUniqueKey']); return;// 0; @@ -571,7 +571,7 @@ function Click_field(T, f, PK) // table field document.getElementById('layer_new_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight + 40; document.getElementById('layer_new_relation').style.top = top + 'px'; - document.getElementById('layer_new_relation').style.visibility = "visible"; + document.getElementById('layer_new_relation').style.display = 'block'; link_relation += '&T2=' + T + '&F2=' + f; } } @@ -597,7 +597,7 @@ function Click_field(T, f, PK) // table field } ON_display_field = 0; document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -954,7 +954,7 @@ function Start_display_field() if (!ON_display_field) { ON_display_field = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE @@ -962,7 +962,7 @@ function Start_display_field() } } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1019,7 +1019,7 @@ function Click_option(id_this,column_name,table_name) document.getElementById(id_this).style.left = left + 'px'; // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10; document.getElementById(id_this).style.top = (screen.height / 4) + 'px'; - document.getElementById(id_this).style.visibility = "visible"; + document.getElementById(id_this).style.display = 'block'; document.getElementById('option_col_name').innerHTML = '' + PMA_messages['strAddOption'] +'"' +column_name+ '"'; col_name = column_name; tab_name = table_name; @@ -1027,7 +1027,7 @@ function Click_option(id_this,column_name,table_name) function Close_option() { - document.getElementById('pmd_optionse').style.visibility = "hidden"; + document.getElementById('pmd_optionse').style.display = 'none'; } function Select_all(id_this,owner) @@ -1135,7 +1135,7 @@ function add_object() if (rel.value != '--') { if (document.getElementById('Query').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('Query'); @@ -1167,7 +1167,7 @@ function add_object() if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('having'); @@ -1185,7 +1185,7 @@ function add_object() //make orderby } document.getElementById('pmd_hint').innerHTML = sum + "object created" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); From d7e400416eda7ea663631ab19d8b1b59fbb1cd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 19 Aug 2011 13:49:05 +0200 Subject: [PATCH 389/492] Fix displaying of hint --- themes/pmahomme/css/theme_right.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 6109d89129..4fc6f43cba 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3096,7 +3096,7 @@ canvas.pmd * { top: 50px; z-index: 3; border: #00CC66 solid 1px; - visibility: hidden; + display: none; } .scroll_tab { From 3442030281b7dd05fbfda2eceef1e508e5dccbce Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 14:31:23 +0200 Subject: [PATCH 390/492] Translation update done using Pootle. --- po/tr.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 40c0dd229a..2346fe7aeb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-18 10:40+0200\n" +"PO-Revision-Date: 2011-08-19 14:31+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12145,6 +12145,13 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" +"{query_cache_limit} değiştirmek (genelde artarak) etkiyi arttırabilir. Bu " +"değişken en fazla boyutu belirler sorgu sonucu sorgu önbelleği içine " +"eklenebilmek zorundadır. Eğer 1 MiB'ın üstünde iyi önbelleklenebilir (çok " +"okuma, az yazma) birçok sorgu sonucu varsa sonrasında {query_cache_limit} " +"arttırmak etkiyi arttıracaktır. Halbuki çoğu sonucun iyi önbelleklenemeyen 1 " +"MiB'ın üzerinde olması durumunda {query_cache_limit} arttırmak etkiyi " +"azaltacaktır." #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" From f84c49a357b78861b17ddb03301bfcff9632c648 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 14:32:16 +0200 Subject: [PATCH 391/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 2346fe7aeb..288e9a4378 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 14:31+0200\n" +"PO-Revision-Date: 2011-08-19 14:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -3075,7 +3075,7 @@ msgstr "Sıfırla" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "Ekran yenilemenin etkinliğini geliştirir" +msgstr "Ekran yenileme etkinliğini geliştirir" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" From 659d23791ef165b96c55797108522b5fc59d52a1 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 14:35:10 +0200 Subject: [PATCH 392/492] Translation update done using Pootle. --- po/tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 288e9a4378..1f98a90d9b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 14:32+0200\n" +"PO-Revision-Date: 2011-08-19 14:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12145,13 +12145,13 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" -"{query_cache_limit} değiştirmek (genelde artarak) etkiyi arttırabilir. Bu " +"{query_cache_limit} değiştirmek (genelde artarak) verimi arttırabilir. Bu " "değişken en fazla boyutu belirler sorgu sonucu sorgu önbelleği içine " "eklenebilmek zorundadır. Eğer 1 MiB'ın üstünde iyi önbelleklenebilir (çok " "okuma, az yazma) birçok sorgu sonucu varsa sonrasında {query_cache_limit} " -"arttırmak etkiyi arttıracaktır. Halbuki çoğu sonucun iyi önbelleklenemeyen 1 " -"MiB'ın üzerinde olması durumunda {query_cache_limit} arttırmak etkiyi " -"azaltacaktır." +"arttırmak etkiyi arttıracaktır. Halbuki çoğu sonucun iyi önbelleklenemeyen " +"(tablo güncellemelerinden dolayı sıkça geçersiz kılınan) 1 MiB'ın üzerinde " +"olması durumunda {query_cache_limit} arttırmak verimi azaltacaktır." #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" From 27d03753f356fe0a0e47ab5171f0d2b517e47f17 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 14:36:46 +0200 Subject: [PATCH 393/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1f98a90d9b..ceb5a10c01 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 14:35+0200\n" +"PO-Revision-Date: 2011-08-19 14:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12537,7 +12537,7 @@ msgstr "İşlem önbelleği tavan oranı %%" #: po/advisory_rules.php:206 msgid "Thread cache is not efficient." -msgstr "İşlem önbelleği etkin değil." +msgstr "İşlem önbelleği verimli değil." #: po/advisory_rules.php:207 msgid "Increase {thread_cache_size}." From 2f90286c53ba8f1afbb25be230c584e7dfcd500e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:12:11 +0200 Subject: [PATCH 394/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index ceb5a10c01..726e7c19bd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 14:36+0200\n" +"PO-Revision-Date: 2011-08-19 16:12+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -10245,7 +10245,7 @@ msgid "" msgstr "" "Yapılması zorunlu sıralama algoritması birleştirme geçişi sayısıdır. Eğer bu " "değer büyükse, sort_buffer_size sistem değişkeninin değerini arttırmayı " -"dikkate almalısınız." +"düşünmelisiniz." #: server_status.php:1290 msgid "The number of sorts that were done with ranges." From 3b724f4554dcc04139a7be9525a1a5c2d0423e23 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:13:34 +0200 Subject: [PATCH 395/492] Translation update done using Pootle. --- po/tr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/tr.po b/po/tr.po index 726e7c19bd..ac04594293 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 16:12+0200\n" +"PO-Revision-Date: 2011-08-19 16:13+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -11976,9 +11976,10 @@ msgid "" "cache, especially if you have multiple slaves." msgstr "" "Oldukça yüksek trafikli veritabanı ile MySQL Sorgu önbelleği " -"kullanıyorsunuz. MySQL Sorgu önbelleği yerine memcached kullanmayı hesaba " -"katmak değebilir özelliklede çoklu slave'lere sahipseniz." +"kullanıyorsunuz. MySQL Sorgu önbelleği yerine memcached kullanmayı düşünmek değebilir özelliklede " +"çoklu slave'lere sahipseniz." #: po/advisory_rules.php:73 #, php-format From 53b8a9178559b60982b0f88820c3bdc9aa478f6b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:15:31 +0200 Subject: [PATCH 396/492] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index ac04594293..4758ab84af 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 16:13+0200\n" +"PO-Revision-Date: 2011-08-19 16:15+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12171,6 +12171,8 @@ msgid "" "Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending " "on your system memory limits" msgstr "" +"Dikkate değer sort_buffer_size ve/veya read_rnd_buffer_size artışı, sistem " +"bellek sınırlarınıza bağlıdır." #: po/advisory_rules.php:108 #, php-format From 7fb17b57e8fec6333884f41df1baeca8a9274da3 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:15:55 +0200 Subject: [PATCH 397/492] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 4758ab84af..ccac61dad2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12000,7 +12000,7 @@ msgstr "Sorgu önbelleği verimli çalışmıyor, düşük tavan oranına sahip. #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." -msgstr "Dikkate değer artış {query_cache_limit}." +msgstr "Dikkate değer {query_cache_limit} artışı." #: po/advisory_rules.php:78 #, php-format From 61e757766b0043db866d1c36ee227a46ce39f504 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:17:39 +0200 Subject: [PATCH 398/492] Translation update done using Pootle. --- po/tr.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index ccac61dad2..6238e441a3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 16:15+0200\n" +"PO-Revision-Date: 2011-08-19 16:17+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12180,6 +12180,8 @@ msgid "" "%s%% of all sorts cause temporary tables, this value should be lower than " "10%%." msgstr "" +"Tüm sıralamaların %%%s'i geçici tablolara sebep olur, bu değer %%10'dan " +"düşük olmalıdır." #: po/advisory_rules.php:110 msgid "Rate of sorts that cause temporary tables" From 6d7b2710bc079b14f628ec8a6919fdb8b8c68819 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 16:19:56 +0200 Subject: [PATCH 399/492] Translation update done using Pootle. --- po/tr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 6238e441a3..eb4cc230fe 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 16:17+0200\n" +"PO-Revision-Date: 2011-08-19 16:19+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12192,6 +12192,7 @@ msgstr "Geçici tablolara sebep olan sıralamaların oranı" msgid "" "Temporary tables average: %s, this value should be less than 1 per hour." msgstr "" +"Geçici tabloların ortalaması: %s, bu değer saat başına 1'den az olmalıdır." #: po/advisory_rules.php:115 msgid "Sort rows" From 21510a093a91e6ed2748d46bb8d54b248e9cf082 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 19:54:25 +0530 Subject: [PATCH 400/492] Fix some doc blocks --- libraries/zip_extension.lib.php | 37 ++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 7bfa84875f..0edf40dccf 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -7,13 +7,14 @@ */ /** - * Gets zip file contents - * - * @param string $specific_entry regular expression to match a file - * @return array ($error_message, $file_data); $error_message - * is empty if no error - */ - + * Gets zip file contents + * + * @param string $file zip file + * @param string $specific_entry regular expression to match a file + * + * @return array ($error_message, $file_data); $error_message + * is empty if no error + */ function PMA_getZipContents($file, $specific_entry = null) { $error_message = ''; @@ -77,6 +78,8 @@ function PMA_getZipContents($file, $specific_entry = null) * * @param string $file_regexp regular expression for the file name to match * @param string $file zip archive + * + * @return string the file name of the first file that matches the given regexp */ function PMA_findFileFromZipArchive ($file_regexp, $file) { @@ -100,7 +103,9 @@ function PMA_findFileFromZipArchive ($file_regexp, $file) /** * Returns the number of files in the zip archive. * - * @param string $file + * @param string $file zip archive + * + * @return int the number of files in the zip archive */ function PMA_getNoOfFilesInZip($file) { @@ -121,11 +126,14 @@ function PMA_getNoOfFilesInZip($file) /** * Extracts a set of files from the given zip archive to a given destinations. * - * @param string $zip_path - * @param string $destination - * @param array $entries + * @param string $zip_path path to the zip archive + * @param string $destination destination to extract files + * @param array $entries files in archive that should be extracted + * + * @return bool true on sucess, false otherwise */ -function PMA_zipExtract($zip_path, $destination, $entries) { +function PMA_zipExtract($zip_path, $destination, $entries) +{ $zip = new ZipArchive; if ($zip->open($zip_path) === true) { $zip->extractTo($destination, $entries); @@ -138,8 +146,9 @@ function PMA_zipExtract($zip_path, $destination, $entries) { /** * Gets zip error message * - * @param integer error code - * @return string error message + * @param integer $code error code + * + * @return string error message */ function PMA_getZipError($code) { From 878e78866c39b2b1229984861e094eccf9e59ae7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 19:55:43 +0530 Subject: [PATCH 401/492] proper indentation for switch-case statements --- libraries/zip_extension.lib.php | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php index 0edf40dccf..9aa2758df9 100644 --- a/libraries/zip_extension.lib.php +++ b/libraries/zip_extension.lib.php @@ -154,23 +154,23 @@ function PMA_getZipError($code) { // I don't think this needs translation switch ($code) { - case ZIPARCHIVE::ER_MULTIDISK: - $message = 'Multi-disk zip archives not supported'; - break; - case ZIPARCHIVE::ER_READ: - $message = 'Read error'; - break; - case ZIPARCHIVE::ER_CRC: - $message = 'CRC error'; - break; - case ZIPARCHIVE::ER_NOZIP: - $message = 'Not a zip archive'; - break; - case ZIPARCHIVE::ER_INCONS: - $message = 'Zip archive inconsistent'; - break; - default: - $message = $code; + case ZIPARCHIVE::ER_MULTIDISK: + $message = 'Multi-disk zip archives not supported'; + break; + case ZIPARCHIVE::ER_READ: + $message = 'Read error'; + break; + case ZIPARCHIVE::ER_CRC: + $message = 'CRC error'; + break; + case ZIPARCHIVE::ER_NOZIP: + $message = 'Not a zip archive'; + break; + case ZIPARCHIVE::ER_INCONS: + $message = 'Zip archive inconsistent'; + break; + default: + $message = $code; } return $message; } From ca16dfb46f98776555e0bcca8bcf17b8fafd49fc Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 20:05:48 +0530 Subject: [PATCH 402/492] Coding style improvements --- libraries/zip.lib.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libraries/zip.lib.php b/libraries/zip.lib.php index 9208e93726..f8b58782f4 100644 --- a/libraries/zip.lib.php +++ b/libraries/zip.lib.php @@ -62,8 +62,11 @@ class zipfile * "echo $zipfile;" command * * @access public + * + * @return nothing */ - function setDoWrite() { + function setDoWrite() + { $this -> doWrite = true; } // end of the 'setDoWrite()' method @@ -71,13 +74,14 @@ class zipfile * Converts an Unix timestamp to a four byte DOS date and time format (date * in high two bytes, time in low two bytes allowing magnitude comparison). * - * @param integer the current Unix timestamp + * @param integer $unixtime the current Unix timestamp * - * @return integer the current date in a four byte DOS format + * @return integer the current date in a four byte DOS format * * @access private */ - function unix2DosTime($unixtime = 0) { + function unix2DosTime($unixtime = 0) + { $timearray = ($unixtime == 0) ? getdate() : getdate($unixtime); if ($timearray['year'] < 1980) { @@ -97,17 +101,19 @@ class zipfile /** * Adds "file" to archive * - * @param string file contents - * @param string name of the file in the archive (may contains the path) - * @param integer the current timestamp + * @param string $data file contents + * @param string $name name of the file in the archive (may contains the path) + * @param integer $time the current timestamp * * @access public + * + * @return nothing */ function addFile($data, $name, $time = 0) { $name = str_replace('\\', '/', $name); - $dtime = substr( "00000000" . dechex($this->unix2DosTime($time)), -8); + $dtime = substr("00000000" . dechex($this->unix2DosTime($time)), -8); $hexdtime = '\x' . $dtime[6] . $dtime[7] . '\x' . $dtime[4] . $dtime[5] . '\x' . $dtime[2] . $dtime[3] From 388dfb0e5d46961a4f987991bc76451a2052e96e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 20:29:47 +0530 Subject: [PATCH 403/492] Coding style improvements --- libraries/user_preferences.lib.php | 40 ++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 2246a4df8f..84ca5c4fd8 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -16,9 +16,12 @@ function PMA_userprefs_pageinit() $cf = ConfigFile::getInstance(); $cf->resetConfigData(); // start with a clean instance $cf->setAllowedKeys($forms_all_keys); - $cf->setCfgUpdateReadMapping(array( - 'Server/hide_db' => 'Servers/1/hide_db', - 'Server/only_db' => 'Servers/1/only_db')); + $cf->setCfgUpdateReadMapping( + array( + 'Server/hide_db' => 'Servers/1/hide_db', + 'Server/only_db' => 'Servers/1/only_db' + ) + ); $cf->updateWithGlobalConfig($GLOBALS['cfg']); } @@ -64,7 +67,8 @@ function PMA_load_userprefs() /** * Saves user preferences * - * @param array $config_data + * @param array $config_array configuration array + * * @return true|PMA_Message */ function PMA_save_userprefs(array $config_array) @@ -80,7 +84,7 @@ function PMA_save_userprefs(array $config_array) 'db' => $config_array, 'ts' => time()); if (isset($_SESSION['cache'][$cache_key]['userprefs'])) { - unset($_SESSION['cache'][$cache_key]['userprefs']); + unset($_SESSION['cache'][$cache_key]['userprefs']); } return true; } @@ -122,6 +126,7 @@ function PMA_save_userprefs(array $config_array) * (blacklist) and keys from user preferences form (whitelist) * * @param array $config_data path => value pairs + * * @return array */ function PMA_apply_userprefs(array $config_data) @@ -155,6 +160,7 @@ function PMA_apply_userprefs(array $config_data) * Reads user preferences field names * * @param array|null $forms + * * @return array */ function PMA_read_userprefs_fieldnames(array $forms = null) @@ -185,8 +191,10 @@ function PMA_read_userprefs_fieldnames(array $forms = null) * * No validation is done! * - * @param string $cfg_name - * @param mixed $value + * @param string $path configuration + * @param mixed $value value + * @param mixed $default_value default value + * * @return void */ function PMA_persist_option($path, $value, $default_value) @@ -222,12 +230,16 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $ ? $old_settings['config_data'] : array(); $new_settings = ConfigFile::getInstance()->getConfigArray(); - $diff_keys = array_keys(array_diff_assoc($old_settings, $new_settings) - + array_diff_assoc($new_settings, $old_settings)); + $diff_keys = array_keys( + array_diff_assoc($old_settings, $new_settings) + + array_diff_assoc($new_settings, $old_settings) + ); $check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase', 'Server/hide_db', 'Server/only_db'); - $check_keys = array_merge($check_keys, $forms['Left_frame']['Left_frame'], - $forms['Left_frame']['Left_databases']); + $check_keys = array_merge( + $check_keys, $forms['Left_frame']['Left_frame'], + $forms['Left_frame']['Left_databases'] + ); $diff = array_intersect($check_keys, $diff_keys); $reload_left_frame = !empty($diff); } @@ -242,8 +254,10 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $ if ($hash) { $hash = '#' . urlencode($hash); } - PMA_sendHeaderLocation($GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name - . PMA_generate_common_url($url_params, '&') . $hash); + PMA_sendHeaderLocation( + $GLOBALS['cfg']['PmaAbsoluteUri'] . $file_name + . PMA_generate_common_url($url_params, '&') . $hash + ); } /** From 88db32fafd2b8a6e3b4f3c04af4b1a34fdac7b3c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 20:31:44 +0530 Subject: [PATCH 404/492] More coding style improvements --- libraries/user_preferences.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 1b042171cf..8295100e30 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -27,9 +27,12 @@ $tabs_icons = array( 'Import' => 'ic_b_import', 'Export' => 'ic_b_export'); echo '
    '; -echo PMA_generate_html_tab(array( - 'link' => 'prefs_manage.php', - 'text' => __('Manage your settings'))) . "\n"; +echo PMA_generate_html_tab( + array( + 'link' => 'prefs_manage.php', + 'text' => __('Manage your settings') + ) +) . "\n"; echo '
  •    
    • ' . "\n"; $script_name = basename($GLOBALS['PMA_PHP_SELF']); foreach (array_keys($forms) as $formset) { From 7b054e9b7d677306ab93ea3812b5b5fc2ee6e2f2 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 20:48:27 +0530 Subject: [PATCH 405/492] Fix doc blocks, multi line if statements, switch-case statements --- libraries/url_generating.lib.php | 82 +++++++++++++++++--------------- 1 file changed, 44 insertions(+), 38 deletions(-) diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php index e3cc02a215..388412520a 100644 --- a/libraries/url_generating.lib.php +++ b/libraries/url_generating.lib.php @@ -9,13 +9,14 @@ /** * Generates text with hidden inputs. * - * @see PMA_generate_common_url() - * @param string optional database name - * (can also be an array of parameters) - * @param string optional table name - * @param int indenting level - * @param string do not generate a hidden field for this parameter - * (can be an array of strings) + * @param string $db optional database name + * (can also be an array of parameters) + * @param string $table optional table name + * @param int $indent indenting level + * @param string $skip do not generate a hidden field for this parameter + * (can be an array of strings) + * + * @see PMA_generate_common_url() * * @return string string with input fields * @@ -27,7 +28,6 @@ * @global boolean whether recoding is allowed or not * * @access public - * */ function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $skip = array()) { @@ -48,15 +48,16 @@ function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $ } if (! empty($GLOBALS['server']) - && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault']) { + && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault'] + ) { $params['server'] = $GLOBALS['server']; } - if (empty($_COOKIE['pma_lang']) - && ! empty($GLOBALS['lang'])) { + if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) { $params['lang'] = $GLOBALS['lang']; } if (empty($_COOKIE['pma_collation_connection']) - && ! empty($GLOBALS['collation_connection'])) { + && ! empty($GLOBALS['collation_connection']) + ) { $params['collation_connection'] = $GLOBALS['collation_connection']; } @@ -102,8 +103,9 @@ function PMA_generate_common_hidden_inputs($db = '', $table = '', $indent = 0, $ * * * - * @param array $values - * @param string $pre + * @param array $values hidden values + * @param string $pre prefix + * * @return string form fields of type hidden */ function PMA_getHiddenFields($values, $pre = '') @@ -160,19 +162,20 @@ function PMA_getHiddenFields($values, $pre = '') * // script.php?server=1&lang=en * * - * @param mixed assoc. array with url params or optional string with database name - * if first param is an array there is also an ? prefixed to the url + * @param mixed assoc. array with url params or optional string with database name + * if first param is an array there is also an ? prefixed to the url * - * @param string - if first param is array: 'html' to use htmlspecialchars() - * on the resulting URL (for a normal URL displayed in HTML) - * or something else to avoid using htmlspecialchars() (for - * a URL sent via a header); if not set,'html' is assumed - * - if first param is not array: optional table name + * @param string - if first param is array: 'html' to use htmlspecialchars() + * on the resulting URL (for a normal URL displayed in HTML) + * or something else to avoid using htmlspecialchars() (for + * a URL sent via a header); if not set,'html' is assumed + * - if first param is not array: optional table name + * + * @param string - if first param is array: optional character to + * use instead of '?' + * - if first param is not array: optional character to use + * instead of '&' for dividing URL parameters * - * @param string - if first param is array: optional character to - * use instead of '?' - * - if first param is not array: optional character to use - * instead of '&' for dividing URL parameters * @return string string with URL parameters * @access public */ @@ -219,17 +222,18 @@ function PMA_generate_common_url() if (isset($GLOBALS['server']) && $GLOBALS['server'] != $GLOBALS['cfg']['ServerDefault'] - // avoid overwriting when creating navi panel links to servers - && ! isset($params['server'])) { + // avoid overwriting when creating navi panel links to servers + && ! isset($params['server']) + ) { $params['server'] = $GLOBALS['server']; } - if (empty($_COOKIE['pma_lang']) - && ! empty($GLOBALS['lang'])) { + if (empty($_COOKIE['pma_lang']) && ! empty($GLOBALS['lang'])) { $params['lang'] = $GLOBALS['lang']; } if (empty($_COOKIE['pma_collation_connection']) - && ! empty($GLOBALS['collation_connection'])) { + && ! empty($GLOBALS['collation_connection']) + ) { $params['collation_connection'] = $GLOBALS['collation_connection']; } @@ -256,7 +260,9 @@ function PMA_generate_common_url() * extracted from arg_separator.input as set in php.ini * we do not use arg_separator.output to avoid problems with & and & * - * @param string whether to encode separator or not, currently 'none' or 'html' + * @param string $encode whether to encode separator or not, + * currently 'none' or 'html' + * * @return string character used for separating url parts usally ; or & * @access public */ @@ -278,13 +284,13 @@ function PMA_get_arg_separator($encode = 'none') } switch ($encode) { - case 'html': - return htmlentities($separator); - break; - case 'text' : - case 'none' : - default : - return $separator; + case 'html': + return htmlentities($separator); + break; + case 'text' : + case 'none' : + default : + return $separator; } } From d5489c4432e09f5eb026223c4878db6e7261e0ff Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 21:43:07 +0530 Subject: [PATCH 406/492] Fix doc blocks and multi line if statements --- libraries/transformations.lib.php | 47 ++++++++++++++++++------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php index a5460ab165..51da6ce993 100644 --- a/libraries/transformations.lib.php +++ b/libraries/transformations.lib.php @@ -19,23 +19,26 @@ * // } * * - * @param string $option_string comma separated options - * @return array options + * @param string $option_string comma separated options + * + * @return array options */ function PMA_transformation_getOptions($option_string) { $result = array(); if (! strlen($option_string) - || ! $transform_options = preg_split('/,/', $option_string)) { + || ! $transform_options = preg_split('/,/', $option_string) + ) { return $result; } while (($option = array_shift($transform_options)) !== null) { $trimmed = trim($option); if (strlen($trimmed) > 1 - && $trimmed[0] == "'" - && $trimmed[strlen($trimmed) - 1] == "'") { + && $trimmed[0] == "'" + && $trimmed[strlen($trimmed) - 1] == "'" + ) { // '...' $option = substr($trimmed, 1, -1); } elseif (isset($trimmed[0]) && $trimmed[0] == "'") { @@ -117,11 +120,13 @@ function PMA_getAvailableMIMEtypes() /** * Gets the mimetypes for all columns of a table * + * @param string $db the name of the db to check for + * @param string $table the name of the table to check for + * @param string $strict whether to include only results having a mimetype set + * * @access public - * @param string $db the name of the db to check for - * @param string $table the name of the table to check for - * @param string $strict whether to include only results having a mimetype set - * @return array [field_name][field_key] = field_value + * + * @return array [field_name][field_key] = field_value */ function PMA_getMIME($db, $table, $strict = false) { @@ -136,7 +141,7 @@ function PMA_getMIME($db, $table, $strict = false) `mimetype`, `transformation`, `transformation_options` - FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' + FROM ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' WHERE `db_name` = \'' . PMA_sqlAddSlashes($db) . '\' AND `table_name` = \'' . PMA_sqlAddSlashes($table) . '\' AND ( `mimetype` != \'\'' . (!$strict ? ' @@ -148,14 +153,17 @@ function PMA_getMIME($db, $table, $strict = false) /** * Set a single mimetype to a certain value. * + * @param string $db the name of the db + * @param string $table the name of the table + * @param string $key the name of the column + * @param string $mimetype the mimetype of the column + * @param string $transformation the transformation of the column + * @param string $transformation_options the transformation options of the column + * @param string $forcedelete force delete, will erase any existing + * comments for this column + * * @access public - * @param string $db the name of the db - * @param string $table the name of the table - * @param string $key the name of the column - * @param string $mimetype the mimetype of the column - * @param string $transformation the transformation of the column - * @param string $transformation_options the transformation options of the column - * @param string $forcedelete force delete, will erase any existing comments for this column + * * @return boolean true, if comment-query was made. */ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, @@ -181,8 +189,9 @@ function PMA_setMIME($db, $table, $key, $mimetype, $transformation, PMA_DBI_free_result($test_rs); if (! $forcedelete - && (strlen($mimetype) || strlen($transformation) - || strlen($transformation_options) || strlen($row['comment']))) { + && (strlen($mimetype) || strlen($transformation) + || strlen($transformation_options) || strlen($row['comment'])) + ) { $upd_query = ' UPDATE ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . ' SET `mimetype` = \'' . PMA_sqlAddSlashes($mimetype) . '\', From c1f20fefd4c848f3b0e2ec952f60702b4237e341 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Fri, 19 Aug 2011 18:16:14 +0200 Subject: [PATCH 407/492] Make Advisor evaluation code easier to understand --- libraries/Advisor.class.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index 61592863c0..b681155ac6 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -174,6 +174,22 @@ class Advisor $this->runResult[$type][] = $rule; } + private function ruleExprEvaluate_var1($matches) + { + // '/fired\s*\(\s*(\'|")(.*)\1\s*\)/Uie' + return '1'; //isset($this->runResult[\'fired\'] + } + + private function ruleExprEvaluate_var2($matches) + { + // '/\b(\w+)\b/e' + return isset($this->variables[$matches[1]]) + ? (is_numeric($this->variables[$matches[1]]) + ? $this->variables[$matches[1]] + : '"'.$this->variables[$matches[1]].'"') + : $matches[1]; + } + // Runs a code expression, replacing variable names with their respective values // ignoreUntil: if > 0, it doesn't replace any variables until that string position, but still evaluates the whole expr function ruleExprEvaluate($expr, $ignoreUntil = 0) @@ -182,13 +198,14 @@ class Advisor $exprIgnore = substr($expr,0,$ignoreUntil); $expr = substr($expr,$ignoreUntil); } - $expr = preg_replace('/fired\s*\(\s*(\'|")(.*)\1\s*\)/Uie','1',$expr); //isset($this->runResult[\'fired\'] - $expr = preg_replace('/\b(\w+)\b/e','isset($this->variables[\'\1\']) ? (!is_numeric($this->variables[\'\1\']) ? \'"\'.$this->variables[\'\1\'].\'"\' : $this->variables[\'\1\']) : \'\1\'', $expr); + $expr = preg_replace_callback('/fired\s*\(\s*(\'|")(.*)\1\s*\)/Ui', array($this, 'ruleExprEvaluate_var1'), $expr); + $expr = preg_replace_callback('/\b(\w+)\b/', array($this, 'ruleExprEvaluate_var2'), $expr); if ($ignoreUntil > 0) { $expr = $exprIgnore . $expr; } $value = 0; $err = 0; + ob_start(); eval('$value = '.$expr.';'); $err = ob_get_contents(); From 941c186d27b3bf6a708ce182399cea4ab6f17474 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Fri, 19 Aug 2011 18:17:56 +0200 Subject: [PATCH 408/492] Advisor: properly detect 64-bit builds of MySQL on Windows --- libraries/advisory_rules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index f13f838890..b2aa21df38 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -111,7 +111,7 @@ rule 'Distribution' rule 'MySQL Architecture' system_memory - value > 3072*1024 && !preg_match('/64/',version_compile_machine) + value > 3072*1024 && !preg_match('/64/',version_compile_machine) && !preg_match('/64/',version_compile_os) MySQL is not compiled as a 64-bit package. Your memory capacity is above 3 GiB (assuming the Server is on localhost), so MySQL might not be able to access all of your memory. You might want to consider installing the 64-bit version of MySQL. Available memory on this host: %s | implode(' ',PMA_formatByteDown(value*1024, 2, 2)) From 6b0fb6c20678e490b72f768ec66ded5028187ec1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 21:51:32 +0530 Subject: [PATCH 409/492] Code style improvements --- libraries/Tracker.class.php | 184 ++++++++++++++++++------------------ 1 file changed, 91 insertions(+), 93 deletions(-) diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php index de216ab9c5..e71b7d601e 100644 --- a/libraries/Tracker.class.php +++ b/libraries/Tracker.class.php @@ -71,6 +71,7 @@ class PMA_Tracker * * @static * + * @return nothing */ static public function init() { @@ -86,15 +87,15 @@ class PMA_Tracker self::$default_tracking_set = $GLOBALS['cfg']['Server']['tracking_default_statements']; self::$version_auto_create = $GLOBALS['cfg']['Server']['tracking_version_auto_create']; - } /** - * Actually enables tracking. This needs to be done after all + * Actually enables tracking. This needs to be done after all * underlaying code is initialized. * * @static * + * @return nothing */ static public function enable() { @@ -133,9 +134,9 @@ class PMA_Tracker /** * Parses the name of a table from a SQL statement substring. * - * @static + * @param string $string part of SQL statement * - * @param string $string part of SQL statement + * @static * * @return string the name of table */ @@ -144,8 +145,7 @@ class PMA_Tracker if (strstr($string, '.')) { $temp = explode('.', $string); $tablename = $temp[1]; - } - else { + } else { $tablename = $string; } @@ -163,10 +163,10 @@ class PMA_Tracker /** * Gets the tracking status of a table, is it active or deactive ? * - * @static + * @param string $dbname name of database + * @param string $tablename name of table * - * @param string $dbname name of database - * @param string $tablename name of table + * @static * * @return boolean true or false */ @@ -184,8 +184,7 @@ class PMA_Tracker return false; } - $sql_query = - " SELECT tracking_active FROM " . self::$pma_table . + $sql_query = " SELECT tracking_active FROM " . self::$pma_table . " WHERE db_name = '" . PMA_sqlAddSlashes($dbname) . "' " . " AND table_name = '" . PMA_sqlAddSlashes($tablename) . "' " . " ORDER BY version DESC"; @@ -215,14 +214,14 @@ class PMA_Tracker * Creates tracking version of a table / view * (in other words: create a job to track future changes on the table). * - * @static - * * @param string $dbname name of database * @param string $tablename name of table * @param string $version version * @param string $tracking_set set of tracking statements * @param bool $is_view if table is a view * + * @static + * * @return int result of version insertion */ static public function createVersion($dbname, $tablename, $version, $tracking_set = '', $is_view = false) @@ -233,7 +232,7 @@ class PMA_Tracker $tracking_set = self::$default_tracking_set; } - require_once './libraries/export/sql.php'; + include_once './libraries/export/sql.php'; $sql_backquotes = true; @@ -256,7 +255,7 @@ class PMA_Tracker $indexes = array(); - while($row = PMA_DBI_fetch_assoc($sql_result)) { + while ($row = PMA_DBI_fetch_assoc($sql_result)) { $indexes[] = $row; } @@ -284,8 +283,7 @@ class PMA_Tracker // Save version - $sql_query = - "/*NOTRACK*/\n" . + $sql_query = "/*NOTRACK*/\n" . "INSERT INTO" . self::$pma_table . " (" . "db_name, " . "table_name, " . @@ -320,19 +318,18 @@ class PMA_Tracker /** - * Removes all tracking data for a table + * Removes all tracking data for a table + * + * @param string $dbname name of database + * @param string $tablename name of table * * @static * - * @param string $dbname name of database - * @param string $tablename name of table - * * @return int result of version insertion */ static public function deleteTracking($dbname, $tablename) { - $sql_query = - "/*NOTRACK*/\n" . + $sql_query = "/*NOTRACK*/\n" . "DELETE FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "'"; $result = PMA_query_as_controluser($sql_query); @@ -343,13 +340,13 @@ class PMA_Tracker * Creates tracking version of a database * (in other words: create a job to track future changes on the database). * - * @static - * * @param string $dbname name of database * @param string $version version * @param string $query query * @param string $tracking_set set of tracking statements * + * @static + * * @return int result of version insertion */ static public function createDatabaseVersion($dbname, $version, $query, $tracking_set = 'CREATE DATABASE,ALTER DATABASE,DROP DATABASE') @@ -360,7 +357,7 @@ class PMA_Tracker $tracking_set = self::$default_tracking_set; } - require_once './libraries/export/sql.php'; + include_once './libraries/export/sql.php'; $create_sql = ""; @@ -372,8 +369,7 @@ class PMA_Tracker $create_sql .= self::getLogComment() . $query; // Save version - $sql_query = - "/*NOTRACK*/\n" . + $sql_query = "/*NOTRACK*/\n" . "INSERT INTO" . self::$pma_table . " (" . "db_name, " . "table_name, " . @@ -406,19 +402,18 @@ class PMA_Tracker /** * Changes tracking of a table. * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param integer $new_state the new state of tracking * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param integer $new_state the new state of tracking + * @static * * @return int result of SQL query */ - static private function changeTracking($dbname, $tablename, $version, $new_state) + static private function _changeTracking($dbname, $tablename, $version, $new_state) { - $sql_query = - " UPDATE " . self::$pma_table . + $sql_query = " UPDATE " . self::$pma_table . " SET `tracking_active` = '" . $new_state . "' " . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " . @@ -432,38 +427,38 @@ class PMA_Tracker /** * Changes tracking data of a table. * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version + * @param string $type type of data(DDL || DML) + * @param string|array $new_data the new tracking data * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version - * @param string $type type of data(DDL || DML) - * @param string|array $new_data the new tracking data + * @static * * @return bool result of change */ static public function changeTrackingData($dbname, $tablename, $version, $type, $new_data) { - if ($type == 'DDL') + if ($type == 'DDL') { $save_to = 'schema_sql'; - elseif ($type == 'DML') + } elseif ($type == 'DML') { $save_to = 'data_sql'; - else + } else { return false; - + } $date = date('Y-m-d H:i:s'); $new_data_processed = ''; if (is_array($new_data)) { foreach ($new_data as $data) { - $new_data_processed .= '# log ' . $date . ' ' . $data['username'] . PMA_sqlAddSlashes($data['statement']) . "\n"; + $new_data_processed .= '# log ' . $date . ' ' . $data['username'] + . PMA_sqlAddSlashes($data['statement']) . "\n"; } } else { $new_data_processed = $new_data; } - $sql_query = - " UPDATE " . self::$pma_table . + $sql_query = " UPDATE " . self::$pma_table . " SET `" . $save_to . "` = '" . $new_data_processed . "' " . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' " . @@ -477,34 +472,34 @@ class PMA_Tracker /** * Activates tracking of a table. * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @static * * @return int result of SQL query */ static public function activateTracking($dbname, $tablename, $version) { - return self::changeTracking($dbname, $tablename, $version, 1); + return self::_changeTracking($dbname, $tablename, $version, 1); } /** * Deactivates tracking of a table. * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version + * @static * * @return int result of SQL query */ static public function deactivateTracking($dbname, $tablename, $version) { - return self::changeTracking($dbname, $tablename, $version, 0); + return self::_changeTracking($dbname, $tablename, $version, 0); } @@ -512,18 +507,17 @@ class PMA_Tracker * Gets the newest version of a tracking job * (in other words: gets the HEAD version). * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $statement tracked statement * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $statement tracked statement + * @static * * @return int (-1 if no version exists | > 0 if a version exists) */ static public function getVersion($dbname, $tablename, $statement = null) { - $sql_query = - " SELECT MAX(version) FROM " . self::$pma_table . + $sql_query = " SELECT MAX(version) FROM " . self::$pma_table . " WHERE `db_name` = '" . PMA_sqlAddSlashes($dbname) . "' " . " AND `table_name` = '" . PMA_sqlAddSlashes($tablename) . "' "; @@ -540,11 +534,11 @@ class PMA_Tracker /** * Gets the record of a tracking job. * - * @static + * @param string $dbname name of database + * @param string $tablename name of table + * @param string $version version number * - * @param string $dbname name of database - * @param string $tablename name of table - * @param string $version version number + * @static * * @return mixed record DDM log, DDL log, structure snapshot, tracked statements. */ @@ -644,12 +638,12 @@ class PMA_Tracker * - type of statement, is it part of DDL or DML ? * - tablename * + * @param string $query query + * * @static * @todo: using PMA SQL Parser when possible * @todo: support multi-table/view drops * - * @param string $query - * * @return mixed Array containing identifier, type and tablename. * */ @@ -684,9 +678,10 @@ class PMA_Tracker $result['type'] = 'DDL'; // Parse CREATE VIEW statement - if (in_array('CREATE', $tokens) == true && - in_array('VIEW', $tokens) == true && - in_array('AS', $tokens) == true) { + if (in_array('CREATE', $tokens) == true + && in_array('VIEW', $tokens) == true + && in_array('AS', $tokens) == true + ) { $result['identifier'] = 'CREATE VIEW'; $index = array_search('VIEW', $tokens); @@ -695,10 +690,11 @@ class PMA_Tracker } // Parse ALTER VIEW statement - if (in_array('ALTER', $tokens) == true && - in_array('VIEW', $tokens) == true && - in_array('AS', $tokens) == true && - ! isset($result['identifier'])) { + if (in_array('ALTER', $tokens) == true + && in_array('VIEW', $tokens) == true + && in_array('AS', $tokens) == true + && ! isset($result['identifier']) + ) { $result['identifier'] = 'ALTER VIEW'; $index = array_search('VIEW', $tokens); @@ -778,11 +774,10 @@ class PMA_Tracker } // Parse CREATE INDEX statement - if (! isset($result['identifier']) && - ( substr($query, 0, 12) == 'CREATE INDEX' || - substr($query, 0, 19) == 'CREATE UNIQUE INDEX' || - substr($query, 0, 20) == 'CREATE SPATIAL INDEX' - ) + if (! isset($result['identifier']) + && (substr($query, 0, 12) == 'CREATE INDEX' + || substr($query, 0, 19) == 'CREATE UNIQUE INDEX' + || substr($query, 0, 20) == 'CREATE SPATIAL INDEX') ) { $result['identifier'] = 'CREATE INDEX'; $prefix = explode('ON ', $query); @@ -822,7 +817,7 @@ class PMA_Tracker } // Parse INSERT INTO statement - if (! isset($result['identifier']) && substr($query, 0, 11 ) == 'INSERT INTO') { + if (! isset($result['identifier']) && substr($query, 0, 11) == 'INSERT INTO') { $result['identifier'] = 'INSERT'; $prefix = explode('INSERT INTO', $query); $suffix = explode('(', $prefix[1]); @@ -830,7 +825,7 @@ class PMA_Tracker } // Parse DELETE statement - if (! isset($result['identifier']) && substr($query, 0, 6 ) == 'DELETE') { + if (! isset($result['identifier']) && substr($query, 0, 6) == 'DELETE') { $result['identifier'] = 'DELETE'; $prefix = explode('FROM ', $query); $suffix = explode(' ', $prefix[1]); @@ -838,7 +833,7 @@ class PMA_Tracker } // Parse TRUNCATE statement - if (! isset($result['identifier']) && substr($query, 0, 8 ) == 'TRUNCATE') { + if (! isset($result['identifier']) && substr($query, 0, 8) == 'TRUNCATE') { $result['identifier'] = 'TRUNCATE'; $prefix = explode('TRUNCATE', $query); $result['tablename'] = self::getTableName($prefix[1]); @@ -851,8 +846,11 @@ class PMA_Tracker /** * Analyzes a given SQL statement and saves tracking data. * - * @static * @param string $query a SQL query + * + * @static + * + * @return nothing */ static public function handleQuery($query) { @@ -881,8 +879,9 @@ class PMA_Tracker // If version not exists and auto-creation is enabled if (self::$version_auto_create == true - && self::isTracked($dbname, $result['tablename']) == false - && $version == -1) { + && self::isTracked($dbname, $result['tablename']) == false + && $version == -1 + ) { // Create the version switch ($result['identifier']) { @@ -916,11 +915,10 @@ class PMA_Tracker $query = self::getLogComment() . $query ; // Mark it as untouchable - $sql_query = - " /*NOTRACK*/\n" . + $sql_query = " /*NOTRACK*/\n" . " UPDATE " . self::$pma_table . - " SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" . PMA_sqlAddSlashes($query) . "') ," . - " `date_updated` = '" . $date . "' "; + " SET " . PMA_backquote($save_to) ." = CONCAT( " . PMA_backquote($save_to) . ",'\n" + . PMA_sqlAddSlashes($query) . "') ," . " `date_updated` = '" . $date . "' "; // If table was renamed we have to change the tablename attribute in pma_tracking too if ($result['identifier'] == 'RENAME TABLE') { From 5e860f187467162b2995c48feaff6689ba1accd2 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Fri, 19 Aug 2011 18:24:04 +0200 Subject: [PATCH 410/492] Fix usage of PMA_DBI_get_columns in tbl_change.php --- tbl_change.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_change.php b/tbl_change.php index bf0704a899..e7011ebbf1 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -165,7 +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_get_columns($db, $table); +$table_fields = array_values(PMA_DBI_get_columns($db, $table)); $rows = array(); if (isset($where_clause)) { // when in edit mode load all selected rows from table From c62db3076f695fb33f39e46db437d963882fc3b9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 18:47:08 +0200 Subject: [PATCH 411/492] Translation update done using Pootle. --- po/tr.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index eb4cc230fe..7d7a24923e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 16:19+0200\n" +"PO-Revision-Date: 2011-08-19 18:47+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12209,6 +12209,10 @@ msgid "" "indexed fields in the ORDER BY clause, as this will result in much faster " "sorting" msgstr "" +"Satır sıralamanın yüksek miktarıyla hiçbir sorun yokken, ORDER BY ibaresinde " +"indekslenmiş alanları kullanan çok fazla sıralama gerektiren sorgulardan " +"emin olmak isteyebilirsiniz, ki bu çok daha hızlı sıralamayla " +"sonuçlanacaktır." #: po/advisory_rules.php:118 #, php-format From 68d12478a0fdf15f52ee0cc177e66482f0c3b37d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 18:47:39 +0200 Subject: [PATCH 412/492] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 7d7a24923e..97e49c7a33 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12217,7 +12217,7 @@ msgstr "" #: po/advisory_rules.php:118 #, php-format msgid "Sorted rows average: %s" -msgstr "" +msgstr "Sıralanmış satır ortalaması: %s" #: po/advisory_rules.php:120 msgid "Rate of joins without indexes" From 8aff77dc732aaf6b76a528c37bd79dca27420efb Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 18:56:37 +0200 Subject: [PATCH 413/492] Translation update done using Pootle. --- po/tr.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 97e49c7a33..c8e49a17eb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 18:47+0200\n" +"PO-Revision-Date: 2011-08-19 18:56+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12232,6 +12232,9 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "fields being used in the join conditions will greatly speed up table joins" msgstr "" +"Bu, katılımlar tam tablo taraması yapıyor anlamına gelir. Katılım " +"şartlarında kullanılan alanlar için indekslerin eklenmesi tablo " +"katılımlarını fazlasıyla hızlandıracaktır." #: po/advisory_rules.php:123 #, php-format From 01541e05d09431f0248d04fe98eb6f05ce017759 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 18:57:27 +0200 Subject: [PATCH 414/492] Translation update done using Pootle. --- po/tr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index c8e49a17eb..3ebc91b4e8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 18:56+0200\n" +"PO-Revision-Date: 2011-08-19 18:57+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12240,6 +12240,7 @@ msgstr "" #, php-format msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" +"Tablo katılımları ortalaması: %s, bu değer saat başına 1'den az olmalıdır." #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" From 5e6a11a2f3b81795f4b51baac169fbcdfc667fa2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 19:45:55 +0200 Subject: [PATCH 415/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 3ebc91b4e8..12455c5652 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 18:57+0200\n" +"PO-Revision-Date: 2011-08-19 19:45+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12244,7 +12244,7 @@ msgstr "" #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" -msgstr "" +msgstr "Okunan ilk indeks girişi oranı" #: po/advisory_rules.php:126 msgid "The rate of reading the first index entry is high." From 7ed84cd94ea52b5e8fc50e655661c1b80f8e3e5d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 19:46:16 +0200 Subject: [PATCH 416/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 12455c5652..4a8ffeeb3e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 19:45+0200\n" +"PO-Revision-Date: 2011-08-19 19:46+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12248,7 +12248,7 @@ msgstr "Okunan ilk indeks girişi oranı" #: po/advisory_rules.php:126 msgid "The rate of reading the first index entry is high." -msgstr "" +msgstr "Okunan ilk indeks girişi oranı yüksek." #: po/advisory_rules.php:127 msgid "" From f37463652c39fc753f7e1a6d73c2c7b8f156d939 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 19:49:20 +0200 Subject: [PATCH 417/492] Translation update done using Pootle. --- po/tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 4a8ffeeb3e..aa86811700 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 19:46+0200\n" +"PO-Revision-Date: 2011-08-19 19:49+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -817,7 +817,8 @@ msgstr "Çıktı" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "\"Genişlik/Değerler\" alanına katılan değerleri kopyala ve yapıştır" +msgstr "" +"\"Genişlik/Değerler\" alanında birleştirilen değerleri kopyala ve yapıştır" #: export.php:77 msgid "Selected export type has to be saved in file!" From c28c33c4713be676847386abb0c9694b5ce981b7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 23:38:42 +0530 Subject: [PATCH 418/492] Coding style improvements --- libraries/Table.class.php | 423 +++++++++++++++++++++++--------------- 1 file changed, 258 insertions(+), 165 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index cdc3224ad9..46ebb91171 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -63,8 +63,8 @@ class PMA_Table /** * Constructor * - * @param string $table_name table name - * @param string $db_name database name + * @param string $table_name table name + * @param string $db_name database name */ function __construct($table_name, $db_name) { @@ -83,11 +83,21 @@ class PMA_Table return $this->getName(); } + /** + * return the last error + * + * @return the last error + */ function getLastError() { return end($this->errors); } + /** + * return the last message + * + * @return the last message + */ function getLastMessage() { return end($this->messages); @@ -96,7 +106,9 @@ class PMA_Table /** * sets table name * - * @param string $table_name new table name + * @param string $table_name new table name + * + * @return nothing */ function setName($table_name) { @@ -107,6 +119,7 @@ class PMA_Table * returns table name * * @param boolean $backquoted whether to quote name with backticks `` + * * @return string table name */ function getName($backquoted = false) @@ -120,7 +133,9 @@ class PMA_Table /** * sets database name for this table * - * @param string $db_name + * @param string $db_name database name + * + * @return nothing */ function setDbName($db_name) { @@ -131,6 +146,7 @@ class PMA_Table * returns database name for this table * * @param boolean $backquoted whether to quote name with backticks `` + * * @return string database name for this table */ function getDbName($backquoted = false) @@ -145,6 +161,7 @@ class PMA_Table * returns full name for table, including database name * * @param boolean $backquoted whether to quote name with backticks `` + * * @return string */ function getFullName($backquoted = false) @@ -152,6 +169,14 @@ class PMA_Table return $this->getDbName($backquoted) . '.' . $this->getName($backquoted); } + /** + * returns whether the table is actually a view + * + * @param string $db database + * @param string $table table + * + * @return whether the given is a view + */ static public function isView($db = null, $table = null) { if (strlen($db) && strlen($table)) { @@ -166,6 +191,8 @@ class PMA_Table * * @param string $param name * @param mixed $value value + * + * @return nothing */ function set($param, $value) { @@ -176,6 +203,7 @@ class PMA_Table * returns value for given setting/param * * @param string $param name for value to return + * * @return mixed value for $param */ function get($param) @@ -204,8 +232,10 @@ class PMA_Table $this->settings = $table_info; if ($this->get('TABLE_ROWS') === null) { - $this->set('TABLE_ROWS', PMA_Table::countRecords($this->getDbName(), - $this->getName(), true)); + $this->set( + 'TABLE_ROWS', + PMA_Table::countRecords($this->getDbName(), $this->getName(), true) + ); } $create_options = explode(' ', $this->get('TABLE_ROWS')); @@ -224,10 +254,12 @@ class PMA_Table /** * Checks if this "table" is a view * + * @param string $db the database name + * @param string $table the table name + * * @deprecated * @todo see what we could do with the possible existence of $table_is_view - * @param string $db the database name - * @param string $table the table name + * * @return boolean whether this is a view */ static protected function _isView($db, $table) @@ -237,7 +269,8 @@ class PMA_Table return true; } - // Since phpMyAdmin 3.2 the field TABLE_TYPE is properly filled by PMA_DBI_get_tables_full() + // Since phpMyAdmin 3.2 the field TABLE_TYPE is properly filled by + // PMA_DBI_get_tables_full() $type = PMA_Table::sGetStatusInfo($db, $table, 'TABLE_TYPE'); return $type == 'VIEW'; } @@ -245,10 +278,12 @@ class PMA_Table /** * Checks if this is a merge table * - * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), this is a merge table. + * If the ENGINE of the table is MERGE or MRG_MYISAM (alias), + * this is a merge table. + * + * @param string $db the database name + * @param string $table the table name * - * @param string $db the database name - * @param string $table the table name * @return boolean true if it is a merge table */ static public function isMerge($db = null, $table = null) @@ -270,15 +305,17 @@ class PMA_Table /** * Returns full table status info, or specific if $info provided - * * this info is collected from information_schema * - * @todo PMA_DBI_get_tables_full needs to be merged somehow into this class or at least better documented - * @param string $db - * @param string $table - * @param string $info - * @param boolean $force_read + * @param string $db database name + * @param string $table table name + * @param string $info + * @param boolean $force_read read new rather than serving from cache * @param boolean $disable_error if true, disables error message + * + * @todo PMA_DBI_get_tables_full needs to be merged somehow into this class + * or at least better documented + * * @return mixed */ static public function sGetStatusInfo($db, $table, $info = null, $force_read = false, $disable_error = false) @@ -311,21 +348,24 @@ class PMA_Table /** * generates column specification for ALTER or CREATE TABLE syntax * + * @param string $name name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute attribute + * @param string $collation collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, + * NULL, NONE, USER_DEFINED + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index + * * @todo move into class PMA_Column - * @todo on the interface, some js to clear the default value when the default current_timestamp is checked - * @param string $name name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, - * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index + * @todo on the interface, some js to clear the default value when the default + * current_timestamp is checked + * * @return string field specification */ static function generateFieldSpec($name, $type, $length = '', $attribute = '', @@ -339,8 +379,9 @@ class PMA_Table $query = PMA_backquote($name) . ' ' . $type; if ($length != '' - && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT' - . '|SERIAL|BOOLEAN)$@i', $type)) { + && ! preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|' + . 'MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|SERIAL|BOOLEAN)$@i', $type) + ) { $query .= '(' . $length . ')'; } @@ -348,8 +389,9 @@ class PMA_Table $query .= ' ' . $attribute; } - if (!empty($collation) && $collation != 'NULL' - && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR|ENUM|SET)$@i', $type)) { + if (! empty($collation) && $collation != 'NULL' + && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR|ENUM|SET)$@i', $type) + ) { $query .= PMA_generateCharsetQueryPart($collation); } @@ -400,9 +442,9 @@ class PMA_Table $query .= ' PRIMARY KEY'; unset($field_primary[$j]); } - // but the PK could contain other columns so do not append - // a PRIMARY KEY clause, just add a member to $field_primary } else { + // but the PK could contain other columns so do not append + // a PRIMARY KEY clause, just add a member to $field_primary $found_in_pk = false; for ($j = 0; $j < $primary_cnt; $j++) { if ($field_primary[$j] == $index) { @@ -428,13 +470,13 @@ class PMA_Table * Revision 13 July 2001: Patch for limiting dump size from * vinay@sanisoft.com & girish@sanisoft.com * - * @param string $db the current database name - * @param string $table the current table name - * @param bool $force_exact whether to force an exact count - * @param bool $is_view + * @param string $db the current database name + * @param string $table the current table name + * @param bool $force_exact whether to force an exact count + * @param bool $is_view whether the table is a view * - * @return mixed the number of records if "retain" param is true, - * otherwise true + * @return mixed the number of records if "retain" param is true, + * otherwise true */ static public function countRecords($db, $table, $force_exact = false, $is_view = null) { @@ -466,7 +508,8 @@ class PMA_Table if (! $is_view) { $row_count = PMA_DBI_fetch_value( 'SELECT COUNT(*) FROM ' . PMA_backquote($db) . '.' - . PMA_backquote($table)); + . PMA_backquote($table) + ); } else { // For complex views, even trying to get a partial record // count could bring down a server, so we offer an @@ -482,9 +525,11 @@ class PMA_Table // based on a table that no longer exists) $result = PMA_DBI_try_query( 'SELECT 1 FROM ' . PMA_backquote($db) . '.' - . PMA_backquote($table) . ' LIMIT ' - . $GLOBALS['cfg']['MaxExactCountViews'], - null, PMA_DBI_QUERY_STORE); + . PMA_backquote($table) . ' LIMIT ' + . $GLOBALS['cfg']['MaxExactCountViews'], + null, + PMA_DBI_QUERY_STORE + ); if (!PMA_DBI_getError()) { $row_count = PMA_DBI_num_rows($result); PMA_DBI_free_result($result); @@ -501,22 +546,24 @@ class PMA_Table /** * Generates column specification for ALTER syntax * + * @param string $oldcol old column name + * @param string $newcol new column name + * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) + * @param string $length length ('2', '5,2', '', ...) + * @param string $attribute attribute + * @param string $collation collation + * @param bool|string $null with 'NULL' or 'NOT NULL' + * @param string $default_type whether default is CURRENT_TIMESTAMP, + * NULL, NONE, USER_DEFINED + * @param string $default_value default value for USER_DEFINED default type + * @param string $extra 'AUTO_INCREMENT' + * @param string $comment field comment + * @param array &$field_primary list of fields for PRIMARY KEY + * @param string $index + * @param mixed $default_orig + * * @see PMA_Table::generateFieldSpec() - * @param string $oldcol old column name - * @param string $newcol new column name - * @param string $type type ('INT', 'VARCHAR', 'BIT', ...) - * @param string $length length ('2', '5,2', '', ...) - * @param string $attribute - * @param string $collation - * @param bool|string $null with 'NULL' or 'NOT NULL' - * @param string $default_type whether default is CURRENT_TIMESTAMP, - * NULL, NONE, USER_DEFINED - * @param string $default_value default value for USER_DEFINED default type - * @param string $extra 'AUTO_INCREMENT' - * @param string $comment field comment - * @param array &$field_primary list of fields for PRIMARY KEY - * @param string $index - * @param mixed $default_orig + * * @return string field specification */ static public function generateAlter($oldcol, $newcol, $type, $length, @@ -524,26 +571,32 @@ class PMA_Table $extra, $comment = '', &$field_primary, $index, $default_orig) { return PMA_backquote($oldcol) . ' ' - . PMA_Table::generateFieldSpec($newcol, $type, $length, $attribute, + . PMA_Table::generateFieldSpec( + $newcol, $type, $length, $attribute, $collation, $null, $default_type, $default_value, $extra, - $comment, $field_primary, $index, $default_orig); + $comment, $field_primary, $index, $default_orig + ); } // end function /** * Inserts existing entries in a PMA_* table by reading a value from an old entry * + * @param string $work The array index, which Relation feature to check + * ('relwork', 'commwork', ...) + * @param string $pma_table The array index, which PMA-table to update + * ('bookmark', 'relation', ...) + * @param array $get_fields Which fields will be SELECT'ed from the old entry + * @param array $where_fields Which fields will be used for the WHERE query + * (array('FIELDNAME' => 'FIELDVALUE')) + * @param array $new_fields Which fields will be used as new VALUES. These are + * the important keys which differ from the old entry + * (array('FIELDNAME' => 'NEW FIELDVALUE')) + * * @global relation variable - * @param string $work The array index, which Relation feature to check ('relwork', 'commwork', ...) - * @param string $pma_table The array index, which PMA-table to update ('bookmark', 'relation', ...) - * @param array $get_fields Which fields will be SELECT'ed from the old entry - * @param array $where_fields Which fields will be used for the WHERE query (array('FIELDNAME' => 'FIELDVALUE')) - * @param array $new_fields Which fields will be used as new VALUES. These are the important - * keys which differ from the old entry. - * (array('FIELDNAME' => 'NEW FIELDVALUE')) + * * @return int|true */ - static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields, - $new_fields) + static public function duplicateInfo($work, $pma_table, $get_fields, $where_fields, $new_fields) { $last_id = -1; @@ -576,8 +629,9 @@ class PMA_Table // must use PMA_DBI_QUERY_STORE here, since we execute another // query inside the loop - $table_copy_rs = PMA_query_as_controluser($table_copy_query, true, - PMA_DBI_QUERY_STORE); + $table_copy_rs = PMA_query_as_controluser( + $table_copy_query, true, PMA_DBI_QUERY_STORE + ); while ($table_copy_row = @PMA_DBI_fetch_assoc($table_copy_rs)) { $value_parts = array(); @@ -587,9 +641,9 @@ class PMA_Table } } - $new_table_query = ' - INSERT IGNORE INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) - . '.' . PMA_backquote($GLOBALS['cfgRelation'][$pma_table]) . ' + $new_table_query = 'INSERT IGNORE INTO ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) + . '.' . PMA_backquote($GLOBALS['cfgRelation'][$pma_table]) . ' (' . implode(', ', $select_parts) . ', ' . implode(', ', $new_parts) . ') VALUES @@ -612,14 +666,15 @@ class PMA_Table /** * Copies or renames table * - * @param $source_db - * @param $source_table - * @param $target_db - * @param $target_table - * @param $what - * @param $move - * @param $mode - * @return bool + * @param string $source_db source database + * @param string $source_table source table + * @param string $target_db target database + * @param string $target_table target table + * @param string $what what to be moved or copied (data, dataonly) + * @param bool $move whether to move + * @param string $mode mode + * + * @return bool true if success, false otherwise */ static public function moveCopy($source_db, $source_table, $target_db, $target_table, $what, $move, $mode) { @@ -628,7 +683,10 @@ class PMA_Table /* Try moving table directly */ if ($move && $what == 'data') { $tbl = new PMA_Table($source_table, $source_db); - $result = $tbl->rename($target_table, $target_db, PMA_Table::isView($source_db, $source_table)); + $result = $tbl->rename( + $target_table, $target_db, + PMA_Table::isView($source_db, $source_table) + ); if ($result) { $GLOBALS['message'] = $tbl->getLastMessage(); return true; @@ -642,12 +700,14 @@ class PMA_Table // Ensure the target is valid if (! $GLOBALS['pma']->databases->exists($source_db, $target_db)) { if (! $GLOBALS['pma']->databases->exists($source_db)) { - $GLOBALS['message'] = PMA_Message::rawError('source database `' - . htmlspecialchars($source_db) . '` not found'); + $GLOBALS['message'] = PMA_Message::rawError( + 'source database `' . htmlspecialchars($source_db) . '` not found' + ); } if (! $GLOBALS['pma']->databases->exists($target_db)) { - $GLOBALS['message'] = PMA_Message::rawError('target database `' - . htmlspecialchars($target_db) . '` not found'); + $GLOBALS['message'] = PMA_Message::rawError( + 'target database `' . htmlspecialchars($target_db) . '` not found' + ); } return false; } @@ -665,21 +725,25 @@ class PMA_Table // do not create the table if dataonly if ($what != 'dataonly') { - require_once './libraries/export/sql.php'; + include_once './libraries/export/sql.php'; $no_constraints_comments = true; $GLOBALS['sql_constraints_query'] = ''; - $sql_structure = PMA_getTableDef($source_db, $source_table, "\n", $err_url, false, false); + $sql_structure = PMA_getTableDef( + $source_db, $source_table, "\n", $err_url, false, false + ); unset($no_constraints_comments); $parsed_sql = PMA_SQP_parse($sql_structure); $analyzed_sql = PMA_SQP_analyze($parsed_sql); $i = 0; if (empty($analyzed_sql[0]['create_table_fields'])) { - // this is not a CREATE TABLE, so find the first VIEW + // this is not a CREATE TABLE, so find the first VIEW $target_for_view = PMA_backquote($target_db); while (true) { - if ($parsed_sql[$i]['type'] == 'alpha_reservedWord' && $parsed_sql[$i]['data'] == 'VIEW') { + if ($parsed_sql[$i]['type'] == 'alpha_reservedWord' + && $parsed_sql[$i]['data'] == 'VIEW' + ) { break; } $i++; @@ -713,8 +777,10 @@ class PMA_Table $last = $parsed_sql['len'] - 1; $backquoted_source_db = PMA_backquote($source_db); for (++$i; $i <= $last; $i++) { - if ($parsed_sql[$i]['type'] == $table_delimiter && $parsed_sql[$i]['data'] == $backquoted_source_db) { - $parsed_sql[$i]['data'] = $target_for_view; + if ($parsed_sql[$i]['type'] == $table_delimiter + && $parsed_sql[$i]['data'] == $backquoted_source_db + ) { + $parsed_sql[$i]['data'] = $target_for_view; } } unset($last,$backquoted_source_db); @@ -727,8 +793,9 @@ class PMA_Table // If table exists, and 'add drop table' is selected: Drop it! $drop_query = ''; if (isset($GLOBALS['drop_if_exists']) - && $GLOBALS['drop_if_exists'] == 'true') { - if (PMA_Table::_isView($target_db,$target_table)) { + && $GLOBALS['drop_if_exists'] == 'true' + ) { + if (PMA_Table::_isView($target_db, $target_table)) { $drop_query = 'DROP VIEW'; } else { $drop_query = 'DROP TABLE'; @@ -749,7 +816,8 @@ class PMA_Table $GLOBALS['sql_query'] .= "\n" . $sql_structure . ';'; if (($move || isset($GLOBALS['add_constraints'])) - && !empty($GLOBALS['sql_constraints_query'])) { + && !empty($GLOBALS['sql_constraints_query']) + ) { $parsed_sql = PMA_SQP_parse($GLOBALS['sql_constraints_query']); $i = 0; @@ -772,7 +840,8 @@ class PMA_Table for ($j = $i; $j < $cnt; $j++) { if ($parsed_sql[$j]['type'] == 'alpha_reservedWord' - && strtoupper($parsed_sql[$j]['data']) == 'CONSTRAINT') { + && strtoupper($parsed_sql[$j]['data']) == 'CONSTRAINT' + ) { if ($parsed_sql[$j+1]['type'] == $table_delimiter) { $parsed_sql[$j+1]['data'] = ''; } @@ -780,8 +849,9 @@ class PMA_Table } // Generate query back - $GLOBALS['sql_constraints_query'] = PMA_SQP_formatHtml($parsed_sql, - 'query_only'); + $GLOBALS['sql_constraints_query'] = PMA_SQP_formatHtml( + $parsed_sql, 'query_only' + ); if ($mode == 'one_table') { PMA_DBI_query($GLOBALS['sql_constraints_query']); } @@ -795,9 +865,10 @@ class PMA_Table } // Copy the data unless this is a VIEW - if (($what == 'data' || $what == 'dataonly') && ! PMA_Table::_isView($target_db,$target_table)) { - $sql_insert_data = - 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; + if (($what == 'data' || $what == 'dataonly') + && ! PMA_Table::_isView($target_db, $target_table) + ) { + $sql_insert_data = 'INSERT INTO ' . $target . ' SELECT * FROM ' . $source; PMA_DBI_query($sql_insert_data); $GLOBALS['sql_query'] .= "\n\n" . $sql_insert_data . ';'; } @@ -811,7 +882,7 @@ class PMA_Table // moving table from replicated one to not replicated one PMA_DBI_select_db($source_db); - if (PMA_Table::_isView($source_db,$source_table)) { + if (PMA_Table::_isView($source_db, $source_table)) { $sql_drop_query = 'DROP VIEW'; } else { $sql_drop_query = 'DROP TABLE'; @@ -906,7 +977,7 @@ class PMA_Table } $GLOBALS['sql_query'] .= "\n\n" . $sql_drop_query . ';'; - // end if ($move) + // end if ($move) } else { // we are copying // Create new entries as duplicates from old PMA DBs @@ -997,9 +1068,11 @@ class PMA_Table * checks if given name is a valid table name, * currently if not empty, trailing spaces, '.', '/' and '\' * - * @todo add check for valid chars in filename on current system/os - * @see http://dev.mysql.com/doc/refman/5.0/en/legal-names.html - * @param string $table_name name to check + * @param string $table_name name to check + * + * @todo add check for valid chars in filename on current system/os + * @see http://dev.mysql.com/doc/refman/5.0/en/legal-names.html + * * @return boolean whether the string is valid or not */ function isValidName($table_name) @@ -1025,10 +1098,11 @@ class PMA_Table /** * renames table * - * @param string $new_name new table name - * @param string $new_db new database name - * @param bool $is_view is this for a VIEW rename? - * @return bool success + * @param string $new_name new table name + * @param string $new_db new database name + * @param bool $is_view is this for a VIEW rename? + * + * @return bool success */ function rename($new_name, $new_db = null, $is_view = false) { @@ -1064,7 +1138,11 @@ class PMA_Table } // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { - $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName()); + $this->errors[] = sprintf( + __('Error renaming table %1$s to %2$s'), + $this->getFullName(), + $new_table->getFullName() + ); return false; } @@ -1147,8 +1225,11 @@ class PMA_Table unset($table_query); } - $this->messages[] = sprintf(__('Table %s has been renamed to %s'), - htmlspecialchars($old_name), htmlspecialchars($new_name)); + $this->messages[] = sprintf( + __('Table %s has been renamed to %s'), + htmlspecialchars($old_name), + htmlspecialchars($new_name) + ); return true; } @@ -1164,8 +1245,8 @@ class PMA_Table * - PRIMARY(fk_id1, fk_id2) // NONE * - UNIQUE(x,y) // NONE * + * @param bool $backquoted whether to quote name with backticks `` * - * @param bool $backquoted whether to quote name with backticks `` * @return array */ public function getUniqueColumns($backquoted = true) @@ -1178,7 +1259,8 @@ class PMA_Table if (count($index) > 1) { continue; } - $return[] = $this->getFullName($backquoted) . '.' . ($backquoted ? PMA_backquote($index[0]) : $index[0]); + $return[] = $this->getFullName($backquoted) . '.' + . ($backquoted ? PMA_backquote($index[0]) : $index[0]); } return $return; @@ -1192,7 +1274,8 @@ class PMA_Table * * e.g. index(col1, col2) would only return col1 * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` + * * @return array */ public function getIndexedColumns($backquoted = true) @@ -1202,7 +1285,8 @@ class PMA_Table $return = array(); foreach ($indexed as $column) { - $return[] = $this->getFullName($backquoted) . '.' . ($backquoted ? PMA_backquote($column) : $column); + $return[] = $this->getFullName($backquoted) . '.' + . ($backquoted ? PMA_backquote($column) : $column); } return $return; @@ -1213,7 +1297,8 @@ class PMA_Table * * returns an array with all columns * - * @param bool $backquoted whether to quote name with backticks `` + * @param bool $backquoted whether to quote name with backticks `` + * * @return array */ public function getColumns($backquoted = true) @@ -1223,7 +1308,8 @@ class PMA_Table $return = array(); foreach ($indexed as $column) { - $return[] = $this->getFullName($backquoted) . '.' . ($backquoted ? PMA_backquote($column) : $column); + $return[] = $this->getFullName($backquoted) . '.' + . ($backquoted ? PMA_backquote($column) : $column); } return $return; @@ -1232,7 +1318,6 @@ class PMA_Table /** * Return UI preferences for this table from phpMyAdmin database. * - * * @return array */ protected function getUiPrefsFromDb() @@ -1241,11 +1326,10 @@ class PMA_Table PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']); // Read from phpMyAdmin database - $sql_query = - " SELECT `prefs` FROM " . $pma_table . - " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'" . - " AND `db_name` = '" . PMA_sqlAddSlashes($this->db_name) . "'" . - " AND `table_name` = '" . PMA_sqlAddSlashes($this->name) . "'"; + $sql_query = " SELECT `prefs` FROM " . $pma_table + . " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'" + . " AND `db_name` = '" . PMA_sqlAddSlashes($this->db_name) . "'" + . " AND `table_name` = '" . PMA_sqlAddSlashes($this->name) . "'"; $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); if (isset($row[0])) { @@ -1262,22 +1346,23 @@ class PMA_Table */ protected function saveUiPrefsToDb() { - $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".". - PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']); + $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." + . PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']); $username = $GLOBALS['cfg']['Server']['user']; - $sql_query = - " REPLACE INTO " . $pma_table . - " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes($this->db_name) . "', '" . - PMA_sqlAddSlashes($this->name) . "', '" . - PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "', NULL)"; + $sql_query = " REPLACE INTO " . $pma_table + . " VALUES ('" . $username . "', '" . PMA_sqlAddSlashes($this->db_name) + . "', '" . PMA_sqlAddSlashes($this->name) . "', '" + . PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "', NULL)"; $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); if (!$success) { $message = PMA_Message::error(__('Could not save table UI preferences')); $message->addMessage('

    '); - $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink']))); + $message->addMessage( + PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])) + ); return $message; } @@ -1294,13 +1379,15 @@ class PMA_Table $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); if (!$success) { - $message = PMA_Message::error(sprintf( - __('Failed to cleanup table UI preferences (see $cfg[\'Servers\'][$i][\'MaxTableUiprefs\'] %s)'), - PMA_showDocu('cfg_Servers_MaxTableUiprefs') - )); + $message = PMA_Message::error( + sprintf( + __('Failed to cleanup table UI preferences (see $cfg[\'Servers\'][$i][\'MaxTableUiprefs\'] %s)'), + PMA_showDocu('cfg_Servers_MaxTableUiprefs') + ) + ); $message->addMessage('

    '); $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink']))); - print_r($message); + print_r($message); return $message; } } @@ -1313,6 +1400,7 @@ class PMA_Table * If pmadb and table_uiprefs is set, it will load the UI preferences from * phpMyAdmin database. * + * @return nothing */ protected function loadUiPrefs() { @@ -1320,10 +1408,11 @@ class PMA_Table // set session variable if it's still undefined if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name])) { $_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name] = - // check whether we can get from pmadb - (strlen($GLOBALS['cfg']['Server']['pmadb']) - && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) ? - $this->getUiPrefsFromDb() : array(); + // check whether we can get from pmadb + (strlen($GLOBALS['cfg']['Server']['pmadb']) + && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) + ? $this->getUiPrefsFromDb() + : array(); } $this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$server_id][$this->db_name][$this->name]; } @@ -1336,8 +1425,8 @@ class PMA_Table * - PROP_COLUMN_ORDER * - PROP_COLUMN_VISIB * + * @param string $property property * - * @param string $property * @return mixed */ public function getUiProp($property) @@ -1354,8 +1443,7 @@ class PMA_Table $avail_columns = $this->getColumns(); foreach ($avail_columns as $each_col) { // check if $each_col ends with $colname - if (substr_compare($each_col, $colname, - strlen($each_col) - strlen($colname)) === 0) { + if (substr_compare($each_col, $colname, strlen($each_col) - strlen($colname)) === 0) { return $this->uiprefs[$property]; } } @@ -1365,12 +1453,12 @@ class PMA_Table } else { return false; } - } else if ($property == self::PROP_COLUMN_ORDER || - $property == self::PROP_COLUMN_VISIB) { + } elseif ($property == self::PROP_COLUMN_ORDER + || $property == self::PROP_COLUMN_VISIB + ) { if (! PMA_Table::isView($this->db_name, $this->name) && isset($this->uiprefs[$property])) { // check if the table has not been modified - if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == - $this->uiprefs['CREATE_TIME']) { + if (self::sGetStatusInfo($this->db_name, $this->name, 'Create_time') == $this->uiprefs['CREATE_TIME']) { return $this->uiprefs[$property]; } else { // remove the property, since the table has been modified @@ -1394,9 +1482,10 @@ class PMA_Table * - PROP_COLUMN_ORDER * - PROP_COLUMN_VISIB * - * @param string $property - * @param mixed $value + * @param string $property Property + * @param mixed $value Value for the property * @param string $table_create_time Needed for PROP_COLUMN_ORDER and PROP_COLUMN_VISIB + * * @return boolean|PMA_Message */ public function setUiProp($property, $value, $table_create_time = null) @@ -1405,12 +1494,13 @@ class PMA_Table $this->loadUiPrefs(); } // we want to save the create time if the property is PROP_COLUMN_ORDER - if (! PMA_Table::isView($this->db_name, $this->name) && ($property == self::PROP_COLUMN_ORDER || - $property == self::PROP_COLUMN_VISIB)) { - + if (! PMA_Table::isView($this->db_name, $this->name) + && ($property == self::PROP_COLUMN_ORDER || $property == self::PROP_COLUMN_VISIB) + ) { $curr_create_time = self::sGetStatusInfo($this->db_name, $this->name, 'CREATE_TIME'); - if (isset($table_create_time) && - $table_create_time == $curr_create_time) { + if (isset($table_create_time) + && $table_create_time == $curr_create_time + ) { $this->uiprefs['CREATE_TIME'] = $curr_create_time; } else { // there is no $table_create_time, or @@ -1423,7 +1513,8 @@ class PMA_Table $this->uiprefs[$property] = $value; // check if pmadb is set if (strlen($GLOBALS['cfg']['Server']['pmadb']) - && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) { + && strlen($GLOBALS['cfg']['Server']['table_uiprefs']) + ) { return $this->saveUiprefsToDb(); } return true; @@ -1432,7 +1523,8 @@ class PMA_Table /** * Remove a property from UI preferences. * - * @param string $property + * @param string $property the property + * * @return true|PMA_Message */ public function removeUiProp($property) @@ -1444,7 +1536,8 @@ class PMA_Table unset($this->uiprefs[$property]); // check if pmadb is set if (strlen($GLOBALS['cfg']['Server']['pmadb']) - && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) { + && strlen($GLOBALS['cfg']['Server']['table_uiprefs']) + ) { return $this->saveUiprefsToDb(); } } From 1fc28a0ffcdb8ec1f1df5ded3af78da1b03ae1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:09:15 +0200 Subject: [PATCH 419/492] Translation update done using Pootle. --- po/es.po | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index f14f230476..35a133fa4e 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 01:20+0200\n" +"PO-Revision-Date: 2011-08-19 21:09+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12347,6 +12347,15 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" +"Cambiar «query_cache_limit» (normalmente aumentarlo) puede aumentar la " +"eficiencia. Esta variable determina el tamaño máximo que puede tener el " +"resultado de una consulta para ser agregada al caché de consultas. Si hay " +"muchos resultados de consultas mayores a 1 MiB que son útiles al caché " +"(muchas lecturas, pocas escrituras) entonces aumentar «query_cache_limit» " +"aumentará la eficiencia. Sin embargo, en el caso que muchos resultados de " +"consultas mayores a 1 MiB que no sean útiles al caché (invalidados " +"frecuentemente por actualizaciones a la tabla) aumentar «query_cache_limit» " +"podría reducir la eficiencia." #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" From 268917b4c8c11de25385d1765c3416ce18920afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:13:20 +0200 Subject: [PATCH 420/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 35a133fa4e..f8f490fcdb 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:09+0200\n" +"PO-Revision-Date: 2011-08-19 21:13+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12359,7 +12359,7 @@ msgstr "" #: po/advisory_rules.php:103 msgid "query_cache_limit is set to 1 MiB" -msgstr "" +msgstr "«query_cache_limit» está definido a 1 MiB" #: po/advisory_rules.php:105 #, fuzzy From 143148c04a94208cb3e20012a3e66b1583fefb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:13:40 +0200 Subject: [PATCH 421/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index f8f490fcdb..2a1639743d 100644 --- a/po/es.po +++ b/po/es.po @@ -12362,10 +12362,9 @@ msgid "query_cache_limit is set to 1 MiB" msgstr "«query_cache_limit» está definido a 1 MiB" #: po/advisory_rules.php:105 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Percentage of sorts that cause temporary tables" -msgstr "Permite la creación de tablas temporales." +msgstr "Porcentaje de ordenaciones que causan tablas temporales" #: po/advisory_rules.php:106 po/advisory_rules.php:111 #, fuzzy From a17e3f3bc2f824c7f8a1963956e10c9598436ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:13:52 +0200 Subject: [PATCH 422/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 2a1639743d..3bef8ad7d4 100644 --- a/po/es.po +++ b/po/es.po @@ -12367,10 +12367,9 @@ msgid "Percentage of sorts that cause temporary tables" msgstr "Porcentaje de ordenaciones que causan tablas temporales" #: po/advisory_rules.php:106 po/advisory_rules.php:111 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Too many sorts are causing temporary tables." -msgstr "Permite la creación de tablas temporales." +msgstr "Demasiadas ordenaciones causan tablas temporales." #: po/advisory_rules.php:107 po/advisory_rules.php:112 msgid "" From aa65f120c279231738a1d5f7c234b17d77606191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:14:19 +0200 Subject: [PATCH 423/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 3bef8ad7d4..bbebc017ea 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:13+0200\n" +"PO-Revision-Date: 2011-08-19 21:14+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12376,6 +12376,8 @@ msgid "" "Consider increasing sort_buffer_size and/or read_rnd_buffer_size, depending " "on your system memory limits" msgstr "" +"Considere aumentar «sort_buffer_size» y/o «read_rnd_buffer_size» dependiendo " +"de los límites de memoria del sistema" #: po/advisory_rules.php:108 #, php-format From 7dec73b325075a94fcd8697dfd966f023effb645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:14:39 +0200 Subject: [PATCH 424/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index bbebc017ea..84fe8de009 100644 --- a/po/es.po +++ b/po/es.po @@ -12385,6 +12385,8 @@ msgid "" "%s%% of all sorts cause temporary tables, this value should be lower than " "10%%." msgstr "" +"%s%% de todas las ordenaciones causan tablas temporales, este valor debería " +"de ser menor a 10%%." #: po/advisory_rules.php:110 #, fuzzy From 7bf0aa856aff7020d81eecfdaf745d739c119037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:14:52 +0200 Subject: [PATCH 425/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 84fe8de009..de72868363 100644 --- a/po/es.po +++ b/po/es.po @@ -12389,10 +12389,9 @@ msgstr "" "de ser menor a 10%%." #: po/advisory_rules.php:110 -#, fuzzy #| msgid "Allows creating temporary tables." msgid "Rate of sorts that cause temporary tables" -msgstr "Permite la creación de tablas temporales." +msgstr "Tasa de ordenaciones que causan tablas temporales" #: po/advisory_rules.php:113 #, php-format From 6664e01a19910da2a5c6aa89c21604f5f57801f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:15:07 +0200 Subject: [PATCH 426/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index de72868363..f4e8019864 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:14+0200\n" +"PO-Revision-Date: 2011-08-19 21:15+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12398,6 +12398,8 @@ msgstr "Tasa de ordenaciones que causan tablas temporales" msgid "" "Temporary tables average: %s, this value should be less than 1 per hour." msgstr "" +"Promedio de tablas temporales: %s, este valor debería de ser menor a 1 por " +"hora." #: po/advisory_rules.php:115 #, fuzzy From f6ffd5d25d8ab0fb6ea9e9ed6848576657c00c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:15:15 +0200 Subject: [PATCH 427/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index f4e8019864..e8e737466a 100644 --- a/po/es.po +++ b/po/es.po @@ -12402,10 +12402,9 @@ msgstr "" "hora." #: po/advisory_rules.php:115 -#, fuzzy #| msgid "Start row" msgid "Sort rows" -msgstr "Fila de inicio" +msgstr "Filas ordenadas" #: po/advisory_rules.php:116 msgid "There are lots of rows being sorted." From e8d321c6f33fed189fd32b106980a63d4912b712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:15:24 +0200 Subject: [PATCH 428/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index e8e737466a..b2992241c5 100644 --- a/po/es.po +++ b/po/es.po @@ -12408,7 +12408,7 @@ msgstr "Filas ordenadas" #: po/advisory_rules.php:116 msgid "There are lots of rows being sorted." -msgstr "" +msgstr "Hay demasiadas filas siendo ordenadas." #: po/advisory_rules.php:117 msgid "" From 66b044bdc08c47dbcf510276e271f5be49537543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:16:57 +0200 Subject: [PATCH 429/492] Translation update done using Pootle. --- po/es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index b2992241c5..857314f739 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:15+0200\n" +"PO-Revision-Date: 2011-08-19 21:16+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12417,6 +12417,10 @@ msgid "" "indexed fields in the ORDER BY clause, as this will result in much faster " "sorting" msgstr "" +"Si bien no hay nada de malo en ordenar una gran cantidad de filas, podría " +"llegar a desea asegurarse que las consultas que requieren gran cantidad de " +"ordenación utilicen campos indexados en la cláusula «ORDER BY», lo que " +"resultará en una ordenación más rápida" #: po/advisory_rules.php:118 #, php-format From 3fb893b4ac0f4164d609b2643a671092de4ba0a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:17:08 +0200 Subject: [PATCH 430/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 857314f739..00a8348a56 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:16+0200\n" +"PO-Revision-Date: 2011-08-19 21:17+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12425,7 +12425,7 @@ msgstr "" #: po/advisory_rules.php:118 #, php-format msgid "Sorted rows average: %s" -msgstr "" +msgstr "Promedio de filas ordenadas: %s" #: po/advisory_rules.php:120 #, fuzzy From 5d37878ad503c60c948502691a3420f2d77cfbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:17:23 +0200 Subject: [PATCH 431/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 00a8348a56..79f3d014df 100644 --- a/po/es.po +++ b/po/es.po @@ -12428,10 +12428,9 @@ msgid "Sorted rows average: %s" msgstr "Promedio de filas ordenadas: %s" #: po/advisory_rules.php:120 -#, fuzzy #| msgid "There are no routines to display." msgid "Rate of joins without indexes" -msgstr "No hay rutinas para mostrar." +msgstr "Tasa de uniones («JOIN») sin índices" #: po/advisory_rules.php:121 #, fuzzy From 8eefd3cc7d9882c6e36dcb419da45c5718aa1fe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:17:38 +0200 Subject: [PATCH 432/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 79f3d014df..1f91084353 100644 --- a/po/es.po +++ b/po/es.po @@ -12433,10 +12433,9 @@ msgid "Rate of joins without indexes" msgstr "Tasa de uniones («JOIN») sin índices" #: po/advisory_rules.php:121 -#, fuzzy #| msgid "There are no routines to display." msgid "There are too many joins without indexes." -msgstr "No hay rutinas para mostrar." +msgstr "Hay demasiadas uniones («JOIN») sin índices." #: po/advisory_rules.php:122 msgid "" From 5349197ab53e4126cd775b8915ea6c518ef81513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:19:07 +0200 Subject: [PATCH 433/492] Translation update done using Pootle. --- po/es.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 1f91084353..8962af5ee6 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:17+0200\n" +"PO-Revision-Date: 2011-08-19 21:19+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12442,6 +12442,9 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "fields being used in the join conditions will greatly speed up table joins" msgstr "" +"Esto significa que las uniones («JOIN») están realizando escrutinios " +"completos sobre tablas. Agregar índices a los campos siendo utilizandos en " +"las condiciones de la unión las acelerarán en gran medida" #: po/advisory_rules.php:123 #, php-format From 511e3e4092b75f02bbdcab038978819ac04d156d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:19:29 +0200 Subject: [PATCH 434/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index 8962af5ee6..001c564a30 100644 --- a/po/es.po +++ b/po/es.po @@ -12450,6 +12450,8 @@ msgstr "" #, php-format msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" +"Promedio de uniones («JOIN») de tablas: %s, este promedio debería ser menor " +"a 1 por hora" #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" From ac883ad06fd6b016b2120b3df48bc6d0f1875a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:20:26 +0200 Subject: [PATCH 435/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 001c564a30..61f9e87000 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:19+0200\n" +"PO-Revision-Date: 2011-08-19 21:20+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12455,7 +12455,7 @@ msgstr "" #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" -msgstr "" +msgstr "Tasa de lectura del primer índice" #: po/advisory_rules.php:126 msgid "The rate of reading the first index entry is high." From 550e09a54d02a3d4d7d9779b96f54e6f61eef29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:20:38 +0200 Subject: [PATCH 436/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 61f9e87000..a2b01e60b2 100644 --- a/po/es.po +++ b/po/es.po @@ -12459,7 +12459,7 @@ msgstr "Tasa de lectura del primer índice" #: po/advisory_rules.php:126 msgid "The rate of reading the first index entry is high." -msgstr "" +msgstr "La tasa de lectura del primer índice es alta." #: po/advisory_rules.php:127 msgid "" From 68fd7cb08ad3e39dca5bde28d0973a89f8b1fe1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:22:53 +0200 Subject: [PATCH 437/492] Translation update done using Pootle. --- po/es.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index a2b01e60b2..7e414e1163 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:20+0200\n" +"PO-Revision-Date: 2011-08-19 21:22+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12470,6 +12470,13 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" +"Esto normalmente indica escruitinios completos de índices. Éstos son más " +"rápidos que escrutinios de tablas pero requieren gran cantidad de clicos de " +"CPU en tablas grandes. Si dichas tablas tienen o han tenido una gran " +"cantidad de actualizaciones («UPDATE» o «DELETE»), ejecutar «OPTIMIZE TABLE» " +"podría reducir dicha cantidad y/o acelerar los escrutinios completos de " +"índices. De otra forma, la cantidad de escrutinios completos de índices sólo " +"puede ser reducida re-escribiendo las consultas." #: po/advisory_rules.php:128 #, php-format From 987c9d90839fa765fc9c930d4ddf3a835d5e8849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:23:12 +0200 Subject: [PATCH 438/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 7e414e1163..4c75da01ec 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:22+0200\n" +"PO-Revision-Date: 2011-08-19 21:23+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12482,6 +12482,8 @@ msgstr "" #, php-format msgid "Index scans average: %s, this value should be less than 1 per hour" msgstr "" +"Promedio de escrutinios de índices: %s, este valor debería de ser menor a 1 " +"por hora" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" From 1a3589404e587463047101c205a90a4a49170744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:23:19 +0200 Subject: [PATCH 439/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 4c75da01ec..042b3f5657 100644 --- a/po/es.po +++ b/po/es.po @@ -12487,7 +12487,7 @@ msgstr "" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" -msgstr "" +msgstr "Tasa de lectura de una posición fija" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." From 84f90c22f2e0292805652ceac8bdb2907803d0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:23:36 +0200 Subject: [PATCH 440/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 042b3f5657..685bdb95fe 100644 --- a/po/es.po +++ b/po/es.po @@ -12491,7 +12491,7 @@ msgstr "Tasa de lectura de una posición fija" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." -msgstr "" +msgstr "La tasa de lecutura de datos de una posición fija es alta." #: po/advisory_rules.php:132 msgid "" From 3331e998493ca1e865b434b481a6ef28bf379c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:24:17 +0200 Subject: [PATCH 441/492] Translation update done using Pootle. --- po/es.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 685bdb95fe..bcda9a7a54 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:23+0200\n" +"PO-Revision-Date: 2011-08-19 21:24+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12499,6 +12499,9 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"Esto indica que muchas consultas necesitan ordenar resultados y/o realizar " +"un escrutinio completo de tablas, incluyendo consultas con uniones («JOIN») " +"que no utilizan índices. Agregue índices donde sea aplicable." #: po/advisory_rules.php:133 #, php-format From 58159494a1435a968038af0486bb42b2423be855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:24:40 +0200 Subject: [PATCH 442/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index bcda9a7a54..606dadfc49 100644 --- a/po/es.po +++ b/po/es.po @@ -12509,6 +12509,8 @@ msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" msgstr "" +"Tasa de lectura de una posición fija: %s, este valor debería de ser menor a " +"1 por hora" #: po/advisory_rules.php:135 #, fuzzy From 1b2db1d6014c3d9a86ad931344167300ad65bf12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:24:52 +0200 Subject: [PATCH 443/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 606dadfc49..a4e0427035 100644 --- a/po/es.po +++ b/po/es.po @@ -12513,10 +12513,9 @@ msgstr "" "1 por hora" #: po/advisory_rules.php:135 -#, fuzzy #| msgid "Where to show the table row links" msgid "Rate of reading next table row" -msgstr "Donde mostrar los enlaces de filas de tabla" +msgstr "Tasa de lectura de la siguiente fila de una tabla" #: po/advisory_rules.php:136 #, fuzzy From fa0992322fe357623aa53eec7b45478e71079ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:25:03 +0200 Subject: [PATCH 444/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index a4e0427035..a0118fe370 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:24+0200\n" +"PO-Revision-Date: 2011-08-19 21:25+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12518,10 +12518,9 @@ msgid "Rate of reading next table row" msgstr "Tasa de lectura de la siguiente fila de una tabla" #: po/advisory_rules.php:136 -#, fuzzy #| msgid "Where to show the table row links" msgid "The rate of reading the next table row is high." -msgstr "Donde mostrar los enlaces de filas de tabla" +msgstr "La tasa de lecutra de la siguiente fila de una tabla es alta." #: po/advisory_rules.php:137 msgid "" From 08c9958781e1b1797ce774b533755c4b8e34ba09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:25:25 +0200 Subject: [PATCH 445/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index a0118fe370..ae8f5ff438 100644 --- a/po/es.po +++ b/po/es.po @@ -12527,6 +12527,8 @@ msgid "" "This indicates that many queries are doing full table scans. Add indexes " "where applicable." msgstr "" +"Esto indica que muchas consultas están realizando escrutinios completos de " +"tablas. Agregue índices donde sea aplicable." #: po/advisory_rules.php:138 #, php-format From ede8c2ee9e7669cf3b34194247aabc0bd4e8b370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:25:41 +0200 Subject: [PATCH 446/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index ae8f5ff438..4c473aeab1 100644 --- a/po/es.po +++ b/po/es.po @@ -12535,6 +12535,8 @@ msgstr "" msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" msgstr "" +"Tasa de lectura de la siguiente fila de una tabla: %s, este valor debería de " +"ser menor a 1 por hora" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" From ceda0e68e89d5ddf5da2c9eb495cc87720029149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:25:57 +0200 Subject: [PATCH 447/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 4c473aeab1..15fad06499 100644 --- a/po/es.po +++ b/po/es.po @@ -12540,7 +12540,7 @@ msgstr "" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" -msgstr "" +msgstr "«tmp_table_size» vs. «max_heap_table_size»" #: po/advisory_rules.php:141 msgid "tmp_table_size and max_heap_table_size are not the same." From c0883ba03695ebd8d4df8cd5d17489dd6d265b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:26:09 +0200 Subject: [PATCH 448/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 15fad06499..6d70f88c66 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:25+0200\n" +"PO-Revision-Date: 2011-08-19 21:26+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12544,7 +12544,7 @@ msgstr "«tmp_table_size» vs. «max_heap_table_size»" #: po/advisory_rules.php:141 msgid "tmp_table_size and max_heap_table_size are not the same." -msgstr "" +msgstr "«tmp_table_size» y «max_heap_table_size» no son iguales." #: po/advisory_rules.php:142 msgid "" From 19df360db5d6de930ab377894bcb2381c64470b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:27:08 +0200 Subject: [PATCH 449/492] Translation update done using Pootle. --- po/es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 6d70f88c66..960c562947 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:26+0200\n" +"PO-Revision-Date: 2011-08-19 21:27+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12553,6 +12553,10 @@ msgid "" "wish to increase the in-memory table limit you will have to increase the " "other value as well." msgstr "" +"Si ha modificado alguno de ellos deliberadamente: el servidor utiliza el " +"valor menor de ellos para determinar el tamaño máximo de tablas en memoria. " +"Si desea aumentar el límite de tamaño de tablas en memoria deberá también " +"aumentar el otro valor." #: po/advisory_rules.php:143 #, php-format From f724f60382ccdf848dfa01b0398616c64ab2841c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:27:35 +0200 Subject: [PATCH 450/492] Translation update done using Pootle. --- po/es.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/es.po b/po/es.po index 960c562947..57a4e70945 100644 --- a/po/es.po +++ b/po/es.po @@ -12562,6 +12562,7 @@ msgstr "" #, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" msgstr "" +"Los valores actuales son «tmp_table_size»: %s, «max_heap_table_size»: %s" #: po/advisory_rules.php:145 #, fuzzy From 422cbbc22c78ab5d8203bf0a436a6ffdc8ed6f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:27:45 +0200 Subject: [PATCH 451/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 57a4e70945..a80a7fa520 100644 --- a/po/es.po +++ b/po/es.po @@ -12565,10 +12565,9 @@ msgstr "" "Los valores actuales son «tmp_table_size»: %s, «max_heap_table_size»: %s" #: po/advisory_rules.php:145 -#, fuzzy #| msgid "Where to show the table row links" msgid "Percentage of temp tables on disk" -msgstr "Donde mostrar los enlaces de filas de tabla" +msgstr "Porcentaje de tablas temporales en disco" #: po/advisory_rules.php:146 po/advisory_rules.php:151 msgid "" From f091a1e4f76ecb8f738330321e8fb80ae9c1fe45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:28:02 +0200 Subject: [PATCH 452/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index a80a7fa520..d25e828bce 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:27+0200\n" +"PO-Revision-Date: 2011-08-19 21:28+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12574,6 +12574,8 @@ msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." msgstr "" +"Muchas tablas temporales están siendo escritas la disco en lugar de ser " +"mantenidas en memoria." #: po/advisory_rules.php:147 msgid "" From e1e7bcc071cc902edfed63048afedccfaef06084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:30:53 +0200 Subject: [PATCH 453/492] Translation update done using Pootle. --- po/es.po | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index d25e828bce..8db579a4fa 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:28+0200\n" +"PO-Revision-Date: 2011-08-19 21:30+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12587,6 +12587,14 @@ msgid "" "mentioned in the beginning of an Article by the Pythian Group" msgstr "" +"Aumentar «max_heap_table_size» y «tmp_table_size» podría ayudar. Sin " +"embargo, algunas tablas temporales son siempre escritas a disco " +"independientemente del valor de estas variables. Para eliminarlas deberá re-" +"escribir las consultas para evitar estas condiciones (en una tabla temporal: " +"la presencia de una columna «BLOB» o «TEXT», o la presencia de una columna " +"mayor a 512 bytes) como se menciona al comienzo del artículo de Pythian " +"Group" #: po/advisory_rules.php:148 #, php-format From c0330c4617e088b4001d574fa5e87d974f499bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:31:29 +0200 Subject: [PATCH 454/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 8db579a4fa..bec26bff08 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:30+0200\n" +"PO-Revision-Date: 2011-08-19 21:31+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12602,6 +12602,8 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"%s%% de todas las tablas temporales son escritas al disco, este valor " +"debería de ser menor a 25%%" # singular: tabla # plural: tablas From 37c801e807d335c2772f1abb03c3f7a48d1a9247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:32:16 +0200 Subject: [PATCH 455/492] Translation update done using Pootle. --- po/es.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/po/es.po b/po/es.po index bec26bff08..abcdb2bedc 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:31+0200\n" +"PO-Revision-Date: 2011-08-19 21:32+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12605,14 +12605,11 @@ msgstr "" "%s%% de todas las tablas temporales son escritas al disco, este valor " "debería de ser menor a 25%%" -# singular: tabla -# plural: tablas #: po/advisory_rules.php:150 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Temp disk rate" -msgstr "%s tabla" +msgstr "Tasa de tablas temporales en el disco" #: po/advisory_rules.php:152 msgid "" From 39a05332952c23ad2c10fc800c08bc243eeff69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:33:04 +0200 Subject: [PATCH 456/492] Translation update done using Pootle. --- po/es.po | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index abcdb2bedc..46f41e1d5b 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:32+0200\n" +"PO-Revision-Date: 2011-08-19 21:33+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12621,6 +12621,14 @@ msgid "" "mentioned in in the MySQL Documentation" msgstr "" +"Aumentar «max_heap_table_size» y «tmp_table_size» podría ayudar. Sin " +"embargo, algunas tablas temporales son siempre escritas a disco " +"independientemente del valor de estas variables. Para eliminarlas deberá re-" +"escribir las consultas para evitar estas condiciones (en una tabla temporal: " +"la presencia de una columna «BLOB» o «TEXT», o la presencia de una columna " +"mayor a 512 bytes) como se menciona en la documentación de MySQL" #: po/advisory_rules.php:153 #, php-format From 1954e6394f52059783aa2eb884142a36070c8eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:33:24 +0200 Subject: [PATCH 457/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index 46f41e1d5b..e4b2a0d52c 100644 --- a/po/es.po +++ b/po/es.po @@ -12636,6 +12636,8 @@ msgid "" "Rate of temporay tables being written to disk: %s, this value should be less " "than 1 per hour" msgstr "" +"La tasa de tablas temporales escritas al disco: %s, este valor debería ser " +"menor a 1 por hora" #: po/advisory_rules.php:155 #, fuzzy From f557b7ce4aa92559b768ae0889a8820ef22cd39d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:34:56 +0200 Subject: [PATCH 458/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index e4b2a0d52c..07a7cf3048 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:33+0200\n" +"PO-Revision-Date: 2011-08-19 21:34+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12640,10 +12640,9 @@ msgstr "" "menor a 1 por hora" #: po/advisory_rules.php:155 -#, fuzzy #| msgid "Sort buffer size" msgid "MyISAM key buffer size" -msgstr "Organizar el tamaño del búfer de memoria" +msgstr "Tamaño de búfer de claves MyISAM" #: po/advisory_rules.php:156 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." From 7bc595b39cbe154037dea71f4ecfbea4ac4d9dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:35:29 +0200 Subject: [PATCH 459/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 07a7cf3048..075b794097 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:34+0200\n" +"PO-Revision-Date: 2011-08-19 21:35+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12647,6 +12647,8 @@ msgstr "Tamaño de búfer de claves MyISAM" #: po/advisory_rules.php:156 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." msgstr "" +"El búfe de claves no fue inicializado. No se utilizará un caché de claves " +"MyISAM." #: po/advisory_rules.php:157 msgid "" From 58a2751818307b9fc08bc192483acec7e559a119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:35:53 +0200 Subject: [PATCH 460/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index 075b794097..29b2e65343 100644 --- a/po/es.po +++ b/po/es.po @@ -12655,6 +12655,8 @@ msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"Defina «key_buffer_size» dependiendo del tamaño de los índices MyISAM. 64M " +"es un buen comienzo." #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" From 9158ba6b3b926f7dad13350073f074ac7e60a7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:35:56 +0200 Subject: [PATCH 461/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 29b2e65343..bea636fde0 100644 --- a/po/es.po +++ b/po/es.po @@ -12647,7 +12647,7 @@ msgstr "Tamaño de búfer de claves MyISAM" #: po/advisory_rules.php:156 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." msgstr "" -"El búfe de claves no fue inicializado. No se utilizará un caché de claves " +"El búfer de claves no fue inicializado. No se utilizará un caché de claves " "MyISAM." #: po/advisory_rules.php:157 From 5663a6f91b9e2d3ca9ae0579ab826a5f1379fd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:36:06 +0200 Subject: [PATCH 462/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index bea636fde0..c407d27eb9 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:35+0200\n" +"PO-Revision-Date: 2011-08-19 21:36+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12660,7 +12660,7 @@ msgstr "" #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" -msgstr "" +msgstr "«key_buffer_size» es 0" #: po/advisory_rules.php:160 #, fuzzy, php-format From a400b17322e57f4e708d60db678d2e5a69132e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:36:37 +0200 Subject: [PATCH 463/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index c407d27eb9..d7755e2ed9 100644 --- a/po/es.po +++ b/po/es.po @@ -12663,10 +12663,10 @@ msgid "key_buffer_size is 0" msgstr "«key_buffer_size» es 0" #: po/advisory_rules.php:160 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "Max %% MyISAM key buffer ever used" -msgstr "Organizar el tamaño del búfer de memoria" +msgstr "Porcentaje máximo del búfer de claves MyISAM usado en algún momento" #: po/advisory_rules.php:161 po/advisory_rules.php:166 #, fuzzy, php-format From 749cf70f09bba9f0035f5b0529f33a01e3a36e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:37:09 +0200 Subject: [PATCH 464/492] Translation update done using Pootle. --- po/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index d7755e2ed9..01d7cb4539 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:36+0200\n" +"PO-Revision-Date: 2011-08-19 21:37+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12669,10 +12669,10 @@ msgid "Max %% MyISAM key buffer ever used" msgstr "Porcentaje máximo del búfer de claves MyISAM usado en algún momento" #: po/advisory_rules.php:161 po/advisory_rules.php:166 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Organizar el tamaño del búfer de memoria" +msgstr "El porcentaje del búfer de claves MyISAM (caché de índices) es bajo." #: po/advisory_rules.php:162 po/advisory_rules.php:167 msgid "" From d2d69cc49377ddce28c3ccb13b2d2834c6479694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:38:01 +0200 Subject: [PATCH 465/492] Translation update done using Pootle. --- po/es.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 01d7cb4539..f21c7ba189 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:37+0200\n" +"PO-Revision-Date: 2011-08-19 21:38+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12680,6 +12680,9 @@ msgid "" "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." msgstr "" +"Podría necesitar aumentar el valor de «key_buffer_size», examine sus tablas " +"nuevamente para ver si se han eliminado índices o sus consultas y las " +"expectativas de uso de los índices." #: po/advisory_rules.php:163 #, php-format From 8b4c027765c28ba2790a51560d26bd5f3dc62df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:38:47 +0200 Subject: [PATCH 466/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index f21c7ba189..9de0d1f3fa 100644 --- a/po/es.po +++ b/po/es.po @@ -12688,6 +12688,8 @@ msgstr "" #, php-format msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" msgstr "" +"Maxímo porcentaje de búfer de claves MyISAM utilizado en algún momento: %s, " +"este valor debería ser mayor a 95%%" #: po/advisory_rules.php:165 #, fuzzy From a01fe6dd3095f2fd1b2c76c16e0043df8111ec84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:39:10 +0200 Subject: [PATCH 467/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 9de0d1f3fa..f007347a41 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:38+0200\n" +"PO-Revision-Date: 2011-08-19 21:39+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12692,10 +12692,9 @@ msgstr "" "este valor debería ser mayor a 95%%" #: po/advisory_rules.php:165 -#, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "Organizar el tamaño del búfer de memoria" +msgstr "Porcentaje de búfer de claves MyISAM utilizado" #: po/advisory_rules.php:168 #, php-format From 8ad3ee20ad1568f8d27185ec4d818b33f648d821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:39:42 +0200 Subject: [PATCH 468/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index f007347a41..89b87dc5e7 100644 --- a/po/es.po +++ b/po/es.po @@ -12700,6 +12700,8 @@ msgstr "Porcentaje de búfer de claves MyISAM utilizado" #, php-format msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" msgstr "" +"Porcentaje de búfer de claves MyISAM utilizado: %s, este valor debería ser " +"mayor a 95%%" #: po/advisory_rules.php:170 msgid "Percentage of index reads from memory" From aed4b98833b3f310b8aa59444cb00e8350e11cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:39:53 +0200 Subject: [PATCH 469/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 89b87dc5e7..13dff1cebd 100644 --- a/po/es.po +++ b/po/es.po @@ -12705,7 +12705,7 @@ msgstr "" #: po/advisory_rules.php:170 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Porcentaje de índices leídos desde memoria" #: po/advisory_rules.php:171 #, php-format From e9687899c3fd13b46efd7b704365c388f1013560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:40:13 +0200 Subject: [PATCH 470/492] Translation update done using Pootle. --- po/es.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 13dff1cebd..48040d4b76 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:39+0200\n" +"PO-Revision-Date: 2011-08-19 21:40+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12711,6 +12711,7 @@ msgstr "Porcentaje de índices leídos desde memoria" #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." msgstr "" +"El porcentaje de índices que utilizan el búfer de claves MyISAM es bajo." #: po/advisory_rules.php:172 msgid "You may need to increase {key_buffer_size}." From 37d0723f92c92f10364804b20a3270b33434d8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:41:06 +0200 Subject: [PATCH 471/492] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 48040d4b76..1dc992a111 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:40+0200\n" +"PO-Revision-Date: 2011-08-19 21:41+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12715,7 +12715,7 @@ msgstr "" #: po/advisory_rules.php:172 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "Podría necesitar aumentar «key_buffer_size»." #: po/advisory_rules.php:173 #, php-format From ccd16f2d12fdca5a4e8fd1396c51b90344a28f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:41:38 +0200 Subject: [PATCH 472/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 1dc992a111..48ea8fa823 100644 --- a/po/es.po +++ b/po/es.po @@ -12720,7 +12720,7 @@ msgstr "Podría necesitar aumentar «key_buffer_size»." #: po/advisory_rules.php:173 #, php-format msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Índices leídos desde memoria: %s%%, este valor debería ser mayor a 95%%" #: po/advisory_rules.php:175 #, fuzzy From 353c8d40a2b0300138fb05288e366e750c6d11da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:41:45 +0200 Subject: [PATCH 473/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 48ea8fa823..25805521b4 100644 --- a/po/es.po +++ b/po/es.po @@ -12723,10 +12723,9 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "Índices leídos desde memoria: %s%%, este valor debería ser mayor a 95%%" #: po/advisory_rules.php:175 -#, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "Crear tabla" +msgstr "Tasa de tablas abiertas" #: po/advisory_rules.php:176 #, fuzzy From 8d870ed4988539644e6b68c1441370b4e8532ca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:41:58 +0200 Subject: [PATCH 474/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 25805521b4..751e7baf35 100644 --- a/po/es.po +++ b/po/es.po @@ -12725,7 +12725,7 @@ msgstr "Índices leídos desde memoria: %s%%, este valor debería ser mayor a 95 #: po/advisory_rules.php:175 #| msgid "Create table" msgid "Rate of table open" -msgstr "Tasa de tablas abiertas" +msgstr "Tasa de apertura de tablas" #: po/advisory_rules.php:176 #, fuzzy From 01bf7883a5f99f09bb5db5b8d0dc765b033e7ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:42:08 +0200 Subject: [PATCH 475/492] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 751e7baf35..5bed2ee3ae 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:41+0200\n" +"PO-Revision-Date: 2011-08-19 21:42+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12728,10 +12728,9 @@ msgid "Rate of table open" msgstr "Tasa de apertura de tablas" #: po/advisory_rules.php:176 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "El número actual de escrituras pendientess." +msgstr "La tasa de apertura de tablas es alta." #: po/advisory_rules.php:177 msgid "" From 71532c53e5914d417d6cb35339af5b0a7380801b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:42:38 +0200 Subject: [PATCH 476/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index 5bed2ee3ae..94599d70d8 100644 --- a/po/es.po +++ b/po/es.po @@ -12737,6 +12737,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"Abrir tablas necesita de E/S en disco, lo cual es costoso. Aumentar " +"«table_open_cache» podría evitarlo." #: po/advisory_rules.php:178 #, php-format From 6174384780db10cd6fe5ba373f2dafaf7fb19bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:42:46 +0200 Subject: [PATCH 477/492] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 94599d70d8..aa3fe45007 100644 --- a/po/es.po +++ b/po/es.po @@ -12737,7 +12737,7 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" -"Abrir tablas necesita de E/S en disco, lo cual es costoso. Aumentar " +"Abrir tablas necesita E/S en disco, lo cual es costoso. Aumentar " "«table_open_cache» podría evitarlo." #: po/advisory_rules.php:178 From 2621fbd32185b882f4583371220c3f08495a3f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:43:05 +0200 Subject: [PATCH 478/492] Translation update done using Pootle. --- po/es.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index aa3fe45007..d4552488fa 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:42+0200\n" +"PO-Revision-Date: 2011-08-19 21:43+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12744,6 +12744,7 @@ msgstr "" #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" msgstr "" +"Tasa de apertura de tablas: %s, este valor debería ser menor a 10 por hora" #: po/advisory_rules.php:180 #, fuzzy From 89436f17d63578af320f8a22ca20bfdfa76d4ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:43:28 +0200 Subject: [PATCH 479/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index d4552488fa..c746d609d9 100644 --- a/po/es.po +++ b/po/es.po @@ -12747,10 +12747,9 @@ msgstr "" "Tasa de apertura de tablas: %s, este valor debería ser menor a 10 por hora" #: po/advisory_rules.php:180 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of used open files limit" -msgstr "Formato del archivo importado" +msgstr "Porcentaje de uso del límite de archivos de abiertos" #: po/advisory_rules.php:181 msgid "" From bb9e62e9d59d3a0ed4d0cff987cb7909654a13d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:44:31 +0200 Subject: [PATCH 480/492] Translation update done using Pootle. --- po/es.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index c746d609d9..74e41adc74 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:43+0200\n" +"PO-Revision-Date: 2011-08-19 21:44+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12751,11 +12751,14 @@ msgstr "" msgid "Percentage of used open files limit" msgstr "Porcentaje de uso del límite de archivos de abiertos" +# El mensaje de error llegará de PHP o MySQL por lo que no me parece correcto traducirlo #: po/advisory_rules.php:181 msgid "" "The number of open files is approaching the max number of open files. You " "may get a \\\"Too many open files\\\" error." msgstr "" +"La cantidad de archivos abiertos se acerca al máximo permitido. Podría " +"llegar a obtener un error al respecto («Too many open files»)." #: po/advisory_rules.php:182 po/advisory_rules.php:187 msgid "" From 1ee0777964ed4a1ad155ef1d021510e2191474f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:45:03 +0200 Subject: [PATCH 481/492] Translation update done using Pootle. --- po/es.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 74e41adc74..678b5778f2 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@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:44+0200\n" +"PO-Revision-Date: 2011-08-19 21:45+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12765,6 +12765,8 @@ msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing open_files_limit." msgstr "" +"Considere aumentar «open_files_limit», y revise el registro de errores al " +"reiniciar luego de cambiar esta variable." #: po/advisory_rules.php:183 #, php-format From cba0062deed8b400e3f8c344140f112935d76d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:45:24 +0200 Subject: [PATCH 482/492] Translation update done using Pootle. --- po/es.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/es.po b/po/es.po index 678b5778f2..63b8a1829c 100644 --- a/po/es.po +++ b/po/es.po @@ -12773,6 +12773,8 @@ msgstr "" msgid "" "The number of opened files is at %s%% of the limit. It should be below 85%%" msgstr "" +"La cantidad de archivos abiertos es %s%% del límite. Debería ser menor a 85%" +"%" #: po/advisory_rules.php:185 #, fuzzy From 03fe2a63e80679eacd76decfeb2020e893c3e0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Fri, 19 Aug 2011 21:45:33 +0200 Subject: [PATCH 483/492] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 63b8a1829c..6bc927ea29 100644 --- a/po/es.po +++ b/po/es.po @@ -12777,10 +12777,9 @@ msgstr "" "%" #: po/advisory_rules.php:185 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "Formato del archivo importado" +msgstr "Tasa de apertura de archivos" #: po/advisory_rules.php:186 #, fuzzy From add8a7d125c46f4fafcb5d705a9b372751ab199e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:46:51 +0200 Subject: [PATCH 484/492] Translation update done using Pootle. --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index aa86811700..8624473127 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 19:49+0200\n" +"PO-Revision-Date: 2011-08-19 21:46+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -9783,8 +9783,8 @@ msgstr "" "Sabitlenmiş konumda satır tabanlı okumak için istek sayısıdır. Eğer " "sonuçları sıralamayı gerektiren çok fazla sorgu yapıyorsanız, bu değer " "yüksek olur. Muhtemelen bütün tabloları taramak için MySQL gerektiren çok " -"fazla sorgulamanız vardır veya düzgün bir şekilde anahtarları " -"kullanmamaktasınız." +"fazla sorgulamalara sahipsiniz ya da anahtarları düzgün kullanılmayan " +"birleştirmelere sahipsiniz." #: server_status.php:1209 msgid "" From 12f16bcb6bed2e40dc1b690993ba34eed2ac9912 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:47:47 +0200 Subject: [PATCH 485/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8624473127..40b34daeaa 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:46+0200\n" +"PO-Revision-Date: 2011-08-19 21:47+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12222,7 +12222,7 @@ msgstr "Sıralanmış satır ortalaması: %s" #: po/advisory_rules.php:120 msgid "Rate of joins without indexes" -msgstr "İndeksler olmaksızın katılım oranı" +msgstr "İndeksler olmaksızın birleştirme oranı" #: po/advisory_rules.php:121 msgid "There are too many joins without indexes." From f8fbfa25fcc872fa8ac5c73bcfaf96e4ff18ae09 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:48:04 +0200 Subject: [PATCH 486/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 40b34daeaa..b60fd76c3d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:47+0200\n" +"PO-Revision-Date: 2011-08-19 21:48+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12226,7 +12226,7 @@ msgstr "İndeksler olmaksızın birleştirme oranı" #: po/advisory_rules.php:121 msgid "There are too many joins without indexes." -msgstr "İndeksler olmaksızın çok fazla katılım var." +msgstr "İndeksler olmaksızın çok fazla birleştirme var." #: po/advisory_rules.php:122 msgid "" From 3be747477115fc857b3096938cf0d8b40cb26c5a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:48:58 +0200 Subject: [PATCH 487/492] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index b60fd76c3d..897caf6859 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12233,9 +12233,9 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "fields being used in the join conditions will greatly speed up table joins" msgstr "" -"Bu, katılımlar tam tablo taraması yapıyor anlamına gelir. Katılım " +"Bu, birleştirmeler tam tablo taraması yapıyor anlamına gelir. Birleştirme " "şartlarında kullanılan alanlar için indekslerin eklenmesi tablo " -"katılımlarını fazlasıyla hızlandıracaktır." +"birleştirmelerini fazlasıyla hızlandıracaktır." #: po/advisory_rules.php:123 #, php-format From 9ba1338926b5c14a55a41ba3ee49c4383cecfd8f Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:49:10 +0200 Subject: [PATCH 488/492] Translation update done using Pootle. --- po/tr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 897caf6859..758eb37b98 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-19 21:48+0200\n" +"PO-Revision-Date: 2011-08-19 21:49+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12241,7 +12241,8 @@ msgstr "" #, php-format msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" -"Tablo katılımları ortalaması: %s, bu değer saat başına 1'den az olmalıdır." +"Tablo birleştirmeleri ortalaması: %s, bu değer saat başına 1'den az " +"olmalıdır." #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" From 29b694c2256c90b3d8413b071e11bf992d6afddb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 19 Aug 2011 16:16:51 -0400 Subject: [PATCH 489/492] bug #3392920 [edit] BLOB emptied after editing another column --- ChangeLog | 1 + libraries/tbl_replace_fields.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 366edaf07d..97b7ef350a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - [core] Remove library PHPExcel, due to license issues - [export] Remove native Excel export modules (xls and xlsx formats) - [import] Remove native Excel import modules (xls and xlsx formats) +- bug #3392920 [edit] BLOB emptied after editing another column 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index e1d98c895b..8ebade8899 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -110,7 +110,7 @@ if (false !== $possibly_uploaded_val) { } // The Null checkbox was unchecked for this field - if (empty($val) && isset($me_fields_null_prev[$key]) && ! isset($me_fields_null[$key])) { + if (empty($val) && ! empty($me_fields_null_prev[$key]) && ! isset($me_fields_null[$key])) { $val = "''"; } } // end else (field value in the form) From 80daf344942c5b60b0c244771b7c18c309edf06d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sat, 20 Aug 2011 00:43:51 +0200 Subject: [PATCH 490/492] Advisor: properly handle concurrent_insert on MySQL 5.5.3 --- libraries/advisory_rules.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index b2aa21df38..97f4454c2b 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -74,9 +74,9 @@ rule 'Slow query logging' # # versions -rule 'Release Series' +rule 'Release Series' [!PMA_DRIZZLE] version - !PMA_DRIZZLE && substr(value,0,1) <= 5 && substr(value,2,1) < 1 + substr(value,0,1) <= 5 && substr(value,2,1) < 1 The MySQL server version less then 5.1. You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 even more so. Current version: %s | value @@ -428,9 +428,9 @@ rule 'InnoDB buffer pool size' [system_memory > 0] # other rule 'MyISAM concurrent inserts' concurrent_insert - value == 0 + value === 0 || value === 'NEVER' Enable concurrent_insert by setting it to 1 - Setting {concurrent_insert} to 1 reduces contention between readers and writers for a given table. See also MySQL Documentation + Setting {concurrent_insert} to 1 reduces contention between readers and writers for a given table. See also MySQL Documentation concurrent_insert is set to 0 # INSERT DELAYED USAGE From 9be1bad63ca9eb61ed8dcc249b45079f018f73ad Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sat, 20 Aug 2011 00:56:06 +0200 Subject: [PATCH 491/492] Advisor: link to MySQL 5.5 documentation, it's better and more complete --- libraries/advisory_rules.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index 97f4454c2b..7745157436 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -131,7 +131,7 @@ rule 'Query cache usage' [!fired('Query cache disabled')] Questions / Uptime value > 100 Suboptimal caching method. - You are using the MySQL Query cache with a fairly high traffic database. It might be worth considering to use memcached instead of the MySQL Query cache, especially if you have multiple slaves. + You are using the MySQL Query cache with a fairly high traffic database. It might be worth considering to use memcached instead of the MySQL Query cache, especially if you have multiple slaves. The query cache is enabled and the server receives %d queries per second. This rule fires if there is more than 100 queries per second. | round(value,1) rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query cache disabled')] @@ -247,19 +247,19 @@ rule 'Temp disk rate' Created_tmp_disk_tables / Uptime value * 60 * 60 > 1 Many temporary tables are being written to disk instead of being kept in memory. - Increasing {max_heap_table_size} and {tmp_table_size} might help. However some temporary tables are always being written to disk, independent of the value of these variables. To eliminate these you will have to rewrite your queries to avoid those conditions (Within a temprorary table: Presence of a BLOB or TEXT column or presence of a column bigger than 512 bytes) as mentioned in in the MySQL Documentation + Increasing {max_heap_table_size} and {tmp_table_size} might help. However some temporary tables are always being written to disk, independent of the value of these variables. To eliminate these you will have to rewrite your queries to avoid those conditions (Within a temprorary table: Presence of a BLOB or TEXT column or presence of a column bigger than 512 bytes) as mentioned in in the MySQL Documentation Rate of temporay tables being written to disk: %s, this value should be less than 1 per hour | PMA_bytime(value,2) # I couldn't find any source on the internet that suggests a direct relation between high counts of temporary tables and any of these variables. # Several independent Blog entries suggest (http://ronaldbradford.com/blog/more-on-understanding-sort_buffer_size-2010-05-10/ and http://www.xaprb.com/blog/2010/05/09/how-to-tune-mysqls-sort_buffer_size/) # that sort_buffer_size should be left as it is. And increasing read_buffer_size is only suggested when there are a lot of -# table scans (http://dev.mysql.com/doc/refman/5.1/en/server-system-variables.html#sysvar_read_buffer_size and other sources) though +# table scans (http://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html#sysvar_read_buffer_size and other sources) though # setting it too high is bad too (http://www.mysqlperformanceblog.com/2007/09/17/mysql-what-read_buffer_size-value-is-optimal/). #rule 'Temp table rate' # Created_tmp_tables / Uptime # value * 60 * 60 > 1 # Many intermediate temporary tables are being created. -# This may be caused by queries under certain conditions as mentioned in the MySQL Documentation. Consider increasing {sort_buffer_size} (sorting), {read_rnd_buffer_size} (random read buffer, ie, post-sort), {read_buffer_size} (sequential scan). +# This may be caused by queries under certain conditions as mentioned in the MySQL Documentation. Consider increasing {sort_buffer_size} (sorting), {read_rnd_buffer_size} (random read buffer, ie, post-sort), {read_buffer_size} (sequential scan). # # MyISAM index cache From 9b2570b0cfa73860fd150d741535991308b5b199 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sat, 20 Aug 2011 00:59:11 +0200 Subject: [PATCH 492/492] Advisor: mark that 'Rate of reading fixed position' may be wrong, requires further investigation --- libraries/advisory_rules.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index 7745157436..c3445e09fe 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -214,6 +214,7 @@ rule 'Rate of reading first index entry' This usually indicates frequent full index scans. Full index scans are faster than table scans but require lots of CPU cycles in big tables, if those tables that have or had high volumes of UPDATEs and DELETEs, running 'OPTIMIZE TABLE' might reduce the amount of and/or speed up full index scans. Other than that full index scans can only be reduced by rewriting queries. Index scans average: %s, this value should be less than 1 per hour | PMA_bytime(value,2) +# This rule may be applicable to MyISAM-only workloads, but completely wrong for InnoDB - http://www.mysqlperformanceblog.com/2010/06/15/what-does-handler_read_rnd-mean/ rule 'Rate of reading fixed position' Handler_read_rnd / Uptime value * 60 * 60 > 1