From ed98d7ead90a73e64602ee20621d54f0b33f39dc Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Mon, 15 Aug 2011 17:18:07 +0530 Subject: [PATCH 001/971] Added: Mousewheel zoom and panning feature --- js/{ => jquery}/date.js | 0 js/tbl_zoom_plot.js | 86 ++++++++++++++++++++++++++++++++++++++--- tbl_zoom_select.php | 4 +- 3 files changed, 83 insertions(+), 7 deletions(-) rename js/{ => jquery}/date.js (100%) diff --git a/js/date.js b/js/jquery/date.js similarity index 100% rename from js/date.js rename to js/jquery/date.js diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index b9c0d75364..92f3775d4c 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -63,7 +63,7 @@ function getDate(val,type) { return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) } else if(type.toString().search(/time/i) != -1) { - return Highcharts.dateFormat('%H:%M:%S', val + 19800000) + return Highcharts.dateFormat('%H:%M:%S', val) } else if (type.toString().search(/date/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e', val) @@ -121,6 +121,50 @@ function scrollToChart() { $('html,body').animate({scrollTop: x}, 500); } +/** + ** Handlers for panning feature + **/ +function includePan(currentChart) { + var mouseDown; + var lastX; + var lastY; + $('#querychart').mousedown(function() { + mouseDown = 1; + }); + + $('#querychart').mouseup(function() { + mouseDown = 0; + }); + + $('#querychart').mousemove(function(e) { + if (mouseDown == 1) { + if (e.pageX > lastX) { + var diff = e.pageX - lastX; + var xExtremes = currentChart.xAxis[0].getExtremes(); + currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); + } + else if (e.pageX < lastX) { + var diff = lastX - e.pageX; + var xExtremes = currentChart.xAxis[0].getExtremes(); + currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); + } + + if (e.pageY > lastY) { + var ydiff = 1 * (e.pageY - lastY); + var yExtremes = currentChart.yAxis[0].getExtremes(); + currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); + } + else if (e.pageY < lastY) { + var ydiff = 1 * (lastY - e.pageY); + var yExtremes = currentChart.yAxis[0].getExtremes(); + currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); + } + } + lastX = e.pageX; + lastY = e.pageY; + }); +} + $(document).ready(function() { /** @@ -139,6 +183,10 @@ $(document).ready(function() { var xType = $('#types_0').val(); var yType = $('#types_1').val(); var dataLabel = $('#dataLabel').val(); + var lastX; + var lastY; + var zoomRatio = 1; + // Get query result var data = jQuery.parseJSON($('#querydata').html()); @@ -371,22 +419,23 @@ $(document).ready(function() { .text(PMA_messages['strShowSearchCriteria']) $('#togglesearchformdiv').show(); var selectedRow; - var columnNames = new Array(); var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; var series = new Array(); var xCord = new Array(); var yCord = new Array(); - var xCat = new Array(); - var yCat = new Array(); var tempX, tempY; var it = 0; + var xMax; // xAxis extreme max + var xMin; // xAxis extreme min + var yMax; // yAxis extreme max + var yMin; // yAxis extreme min // Set the basic plot settings var currentSettings = { chart: { renderTo: 'querychart', type: 'scatter', - zoomType: 'xy', + //zoomType: 'xy', width:$('#resizer').width() -3, height:$('#resizer').height()-20 }, @@ -600,6 +649,33 @@ $(document).ready(function() { currentSettings.series = series; currentChart = PMA_createChart(currentSettings); + xMin = currentChart.xAxis[0].getExtremes().min; + xMax = currentChart.xAxis[0].getExtremes().max; + yMin = currentChart.yAxis[0].getExtremes().min; + yMax = currentChart.yAxis[0].getExtremes().max; + includePan(currentChart); + var setZoom = function() { + var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; + var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; + var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; + var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; + currentChart.xAxis[0].setExtremes(newxm,newxM); + currentChart.yAxis[0].setExtremes(newym,newyM); + }; + $("#querychart").mousewheel(function(objEvent, intDelta) { + if (intDelta > 0) { + if (zoomRatio > 0.1) { + zoomRatio = zoomRatio - 0.1; + + setZoom(); + } + } + else if (intDelta < 0) { + zoomRatio = zoomRatio + 0.1; + setZoom(); + } + }); scrollToChart(); + } }); diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index cdb784d00b..9dd86f9e2a 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -20,12 +20,12 @@ $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tbl_zoom_plot.js'; -$GLOBALS['js_include'][] = 'date.js'; +$GLOBALS['js_include'][] = 'jquery/date.js'; +$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; /* Files required for chart exporting */ $GLOBALS['js_include'][] = 'highcharts/exporting.js'; $GLOBALS['js_include'][] = 'canvg/canvg.js'; -$GLOBALS['js_include'][] = 'canvg/rgbcolor.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; From de98961029477e1680805bb82d5d375d87420ebc Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 13:16:03 +0300 Subject: [PATCH 002/971] 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 003/971] 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 004/971] 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 005/971] 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 006/971] 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 ba21b5f3a24c893506debeb2acffe472c92547ea Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Thu, 18 Aug 2011 19:11:00 +0300 Subject: [PATCH 007/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] - 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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/971] 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 7a821c8a367c78116b3cfc649ca1c4c8e10cd861 Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Fri, 19 Aug 2011 09:03:55 +0530 Subject: [PATCH 122/971] Improved the panning feature --- js/{jquery => }/date.js | 0 js/tbl_zoom_plot.js | 662 +++++++++++++++++++--------------------- tbl_zoom_select.php | 2 +- 3 files changed, 318 insertions(+), 346 deletions(-) rename js/{jquery => }/date.js (100%) diff --git a/js/jquery/date.js b/js/date.js similarity index 100% rename from js/jquery/date.js rename to js/date.js diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 026d305934..cb40e11584 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -35,7 +35,7 @@ Array.min = function (array) { /** ** Checks if a string contains only numeric value - ** @param n: String (to be checked) + ** @param n: String (to be checked) **/ function isNumeric(n) { return !isNaN(parseFloat(n)) && isFinite(n); @@ -43,7 +43,7 @@ function isNumeric(n) { /** ** Checks if an object is empty - ** @param n: Object (to be checked) + ** @param n: Object (to be checked) **/ function isEmpty(obj) { var name; @@ -59,24 +59,15 @@ function isEmpty(obj) { ** @param type String Field type(datetime/timestamp/time/date) **/ function getDate(val,type) { -<<<<<<< HEAD if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) } else if(type.toString().search(/time/i) != -1) { return Highcharts.dateFormat('%H:%M:%S', val) } -======= - if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } - else if (type.toString().search(/time/i) != -1) { - return Highcharts.dateFormat('%H:%M:%S', val + 19800000) - } ->>>>>>> phpmyadmin/master else if (type.toString().search(/date/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e', val) - } + } } /** @@ -85,30 +76,30 @@ function getDate(val,type) { ** @param type Sring Field type(datetime/timestamp/time/date) **/ function getTimeStamp(val,type) { - if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } - else if (type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } + if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { + return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) + } + else if(type.toString().search(/time/i) != -1) { + return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val,'yyyy-MM-dd') + } } /** ** Classifies the field type into numeric,timeseries or text ** @param field: field type (as in database structure) - **/ + **/ function getType(field) { - if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) - return 'numeric'; - else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) - return 'time'; - else - return 'text'; + if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + return 'numeric'; + else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + return 'time'; + else + return 'text'; } -/** +/** ** Converts a categorical array into numeric array ** @param array categorical values array **/ @@ -137,6 +128,8 @@ function includePan(currentChart) { var mouseDown; var lastX; var lastY; + var chartWidth = $('#resizer').width() - 3; + var chartHeight = $('#resizer').height() - 20; $('#querychart').mousedown(function() { mouseDown = 1; }); @@ -144,28 +137,27 @@ function includePan(currentChart) { $('#querychart').mouseup(function() { mouseDown = 0; }); - $('#querychart').mousemove(function(e) { if (mouseDown == 1) { if (e.pageX > lastX) { - var diff = e.pageX - lastX; - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); + var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); } else if (e.pageX < lastX) { - var diff = lastX - e.pageX; - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); + var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); } if (e.pageY > lastY) { - var ydiff = 1 * (e.pageY - lastY); - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); + var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); } else if (e.pageY < lastY) { - var ydiff = 1 * (lastY - e.pageY); - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); + var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight; currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); } } @@ -184,7 +176,7 @@ $(document).ready(function() { cache: 'false' }); - var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; + var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer'; var currentChart = null; var currentData = null; var xLabel = $('#tableid_0').val(); @@ -197,7 +189,7 @@ $(document).ready(function() { var zoomRatio = 1; - // Get query result + // Get query result var data = jQuery.parseJSON($('#querydata').html()); /** @@ -221,16 +213,16 @@ $(document).ready(function() { /** * Input form validation - **/ + **/ $('#inputFormSubmitId').click(function() { - if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + else if (xLabel == yLabel) PMA_ajaxShowMessage(PMA_messages['strSameInputs']); }); /** - ** Prepare a div containing a link, otherwise it's incorrectly displayed + ** Prepare a div containing a link, otherwise it's incorrectly displayed ** after a couple of clicks **/ $('
') @@ -248,177 +240,177 @@ $(document).ready(function() { } else { $link.text(PMA_messages['strHideSearchCriteria']); } - // avoid default click action - return false; - }); - - /** + // avoid default click action + return false; + }); + + /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 }); /* - * Handle submit of zoom_display_form + * Handle submit of zoom_display_form */ - + $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if (key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if (key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; - } - } - } - it++ - }//End data update - - //Update the chart series and replot + for (key in selectedRow) { + if (key != 'where_clause'){ + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal){ + selectedRow[key] = newVal; + newValues[key] = newVal; + if(key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } + else if(key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } + } + it++ + }//End data update + + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary - if (xChange) { - xCord[currentData] = selectedRow[xLabel]; - if (xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + if(xChange) { + xCord[currentData] = selectedRow[xLabel]; + if(xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); } - else if (xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; + else if(xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; - $.each(data,function(key,value) { - if (yType != 'text') - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + $.each(data,function(key,value) { + if(yType != 'text') + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if (tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } + } - } - if (yChange) { + } + if(yChange) { - yCord[currentData] = selectedRow[yLabel]; - if (yType == 'numeric') { - currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); - currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); + yCord[currentData] = selectedRow[yLabel]; + if(yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); } - else if (yType =='time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; + else if(yType =='time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; - $.each(data,function(key,value) { - if (xType != 'text' ) + $.each(data,function(key,value) { + if(xType != 'text' ) newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if (tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } } - currentSettings.series = newSeries; - currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); + currentSettings.series = newSeries; + currentChart = PMA_createChart(currentSettings); + } + } + currentChart.series[0].data[currentData].select(); } - //End plot update + //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if (key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if (!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { + for (key in newValues) { + if(key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if(!isNumeric(value) && value != null) + sql_query += '\'' + value + '\' ,'; + else + sql_query += value + ' ,'; + } + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { 'token' : window.parent.token, 'db' : window.parent.db, 'ajax_request' : true, 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if (data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); - } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); - });//End submit handler + 'inline_edit' : false + }, function(data) { + if(data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } + else + PMA_ajaxShowMessage(data.error); + })//End $.post + }//End database update + $("#dataDisplay").dialog("close"); + });//End submit handler /* * Generate plot using Highcharts - */ + */ if (data != null) { $('#zoom_search_form') @@ -426,9 +418,8 @@ $(document).ready(function() { .hide(); $('#togglesearchformlink') .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + $('#togglesearchformdiv').show(); var selectedRow; -<<<<<<< HEAD var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; var series = new Array(); var xCord = new Array(); @@ -439,22 +430,10 @@ $(document).ready(function() { var xMin; // xAxis extreme min var yMax; // yAxis extreme max var yMin; // yAxis extreme min -======= - var columnNames = new Array(); - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; - var series = new Array(); - var xCord = new Array(); - var yCord = new Array(); - var xCat = new Array(); - var yCat = new Array(); - var tempX, tempY; - var it = 0; ->>>>>>> phpmyadmin/master // Set the basic plot settings var currentSettings = { chart: { -<<<<<<< HEAD renderTo: 'querychart', type: 'scatter', //zoomType: 'xy', @@ -463,74 +442,66 @@ $(document).ready(function() { }, credits: { enabled: false -======= - renderTo: 'querychart', - type: 'scatter', - zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 ->>>>>>> phpmyadmin/master }, - credits: { - enabled: false - }, - exporting: { enabled: false }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { - enabled: false + enabled: false, }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, 'table' : window.parent.table, 'where_clause' : data[id]['where_clause'], - 'token' : window.parent.token + 'token' : window.parent.token, } $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) + $('#fields_null_id_' + fid).attr('checked', true); + else + $('#fieldID_' + fid).val(data.row_info[key]); + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); - } + $("#dataDisplay").dialog("open"); + }, } - } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + } + } + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() } + xAxis: { + title: { text: $('#tableid_0').val() }, }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() } - } + min: null, + title: { text: $('#tableid_1').val() }, + endOnTick: false, + startOnTick: false + }, } $('#resizer').resizable({ @@ -542,150 +513,150 @@ $(document).ready(function() { ); } }); + + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); - - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + if (xType != 'text' && yType != 'text') { + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if (xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} - } - if (yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + + else if (xType =='text' && yType !='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data,function(key,value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if (tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } + + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } } - if (yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} - } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + xCord = tempX[2]; + } + + else if (xType !='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - if (xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } } - currentSettings.yAxis.labels = { formatter : function() { - if (tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } - } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + yCord = tempY[2]; + } + + else if (xType =='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data,function(key,value) { series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if (tempX[1][this.value] && tempX[1][this.value].length > 10) { - return tempX[1][this.value].substring(0,10) - } else { - return tempX[1][this.value]; - } - }}; - currentSettings.yAxis.labels = { formatter : function() { - if (tempY[1][this.value] && tempY[1][this.value].length > 10) { - return tempY[1][this.value].substring(0,10); - } else { - return tempY[1][this.value]; - } - }}; - xCord = tempX[2]; - yCord = tempY[2]; + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; + } + } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + xCord = tempX[2]; + yCord = tempY[2]; - } + } - currentSettings.series = series; + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); xMin = currentChart.xAxis[0].getExtremes().min; xMax = currentChart.xAxis[0].getExtremes().max; yMin = currentChart.yAxis[0].getExtremes().min; yMax = currentChart.yAxis[0].getExtremes().max; - includePan(currentChart); + includePan(currentChart); //Enable panning feature var setZoom = function() { var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; @@ -694,11 +665,11 @@ $(document).ready(function() { currentChart.xAxis[0].setExtremes(newxm,newxM); currentChart.yAxis[0].setExtremes(newym,newyM); }; + //Enable zoom feature $("#querychart").mousewheel(function(objEvent, intDelta) { if (intDelta > 0) { if (zoomRatio > 0.1) { zoomRatio = zoomRatio - 0.1; - setZoom(); } } @@ -708,5 +679,6 @@ $(document).ready(function() { } }); scrollToChart(); + } }); diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 12a09142fa..518121d95a 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -20,7 +20,7 @@ $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tbl_zoom_plot.js'; -$GLOBALS['js_include'][] = 'jquery/date.js'; +$GLOBALS['js_include'][] = 'date.js'; $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; /* Files required for chart exporting */ From 01d5a76ca992bb521530a804ef358c3ec3e5094c Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Fri, 19 Aug 2011 09:13:01 +0530 Subject: [PATCH 123/971] Added "Reset Zoom" link that reverts the plot to original display. --- js/tbl_zoom_plot.js | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index cb40e11584..e773175d7a 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -495,12 +495,23 @@ $(document).ready(function() { title: { text: 'Query Results' }, xAxis: { title: { text: $('#tableid_0').val() }, + events: { + setExtremes: function(e){ + this.resetZoom.show(); + } + } + }, yAxis: { min: null, title: { text: $('#tableid_1').val() }, endOnTick: false, - startOnTick: false + startOnTick: false, + events: { + setExtremes: function(e){ + this.resetZoom.show(); + } + } }, } @@ -678,7 +689,20 @@ $(document).ready(function() { setZoom(); } }); + //Add reset zoom feature + currentChart.yAxis[0].resetZoom = currentChart.xAxis[0].resetZoom = $('Reset zoom') + .appendTo(currentChart.container) + .css({ + position: 'absolute', + top: 10, + right: 20, + display: 'none' + }) + .click(function(){ + currentChart.xAxis[0].setExtremes(null, null) + currentChart.yAxis[0].setExtremes(null, null) + this.style.display = 'none' + }); scrollToChart(); - } }); From 46262835b6eb88290fbe32eec53c71b2568360a4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 10:03:35 +0530 Subject: [PATCH 124/971] 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 125/971] 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 126/971] 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 127/971] 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 128/971] 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 130/971] 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 131/971] 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 132/971] 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 133/971] 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 134/971] 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 135/971] 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 136/971] 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 137/971] 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 138/971] 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 139/971] 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 140/971] 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 141/971] 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 142/971] 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 143/971] 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 144/971] 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 145/971] 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 146/971] 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 147/971] 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 148/971] 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 149/971] 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 150/971] 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 151/971] 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 152/971] 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 153/971] 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 154/971] 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 155/971] 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 156/971] 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 157/971] 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 158/971] 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 159/971] 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 160/971] 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 161/971] 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 162/971] 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 163/971] 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 164/971] 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 165/971] 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 166/971] 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 167/971] 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 168/971] 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 169/971] 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 170/971] 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 171/971] 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 172/971] 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 173/971] 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 174/971] 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 175/971] 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 176/971] 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 177/971] 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 178/971] 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 179/971] 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 180/971] 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 181/971] 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 182/971] 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 183/971] 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 184/971] 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 185/971] 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 186/971] 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 187/971] 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 188/971] 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 189/971] 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 190/971] 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 191/971] 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 192/971] 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 193/971] 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 194/971] 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 195/971] 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 196/971] 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 197/971] 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 198/971] 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 199/971] 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 200/971] 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 201/971] 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 202/971] 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 203/971] 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 204/971] 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 205/971] 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 206/971] 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 207/971] 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 208/971] 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 43286629a88ba381130c2eb81472a421a426de38 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Fri, 19 Aug 2011 08:30:13 +0200 Subject: [PATCH 209/971] 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 210/971] 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 211/971] 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 212/971] 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 213/971] 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 214/971] 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 215/971] 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 216/971] 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 217/971] 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 218/971] 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 219/971] 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 220/971] 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 221/971] 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 222/971] 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 223/971] 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 224/971] 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 225/971] 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 226/971] 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 227/971] 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 228/971] 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 229/971] 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 230/971] 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 231/971] 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 232/971] 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 233/971] 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 234/971] 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 235/971] 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 236/971] 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 237/971] 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 238/971] 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 239/971] 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 240/971] 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 241/971] 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 242/971] 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 243/971] 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 244/971] 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 245/971] 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 246/971] 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 247/971] 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 248/971] 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 249/971] 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 250/971] 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 251/971] 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 252/971] 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 253/971] 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 254/971] 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 255/971] 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 256/971] 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 257/971] 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 258/971] 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 259/971] 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 260/971] 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 261/971] 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 262/971] 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 263/971] 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 264/971] 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 265/971] 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 266/971] 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 267/971] 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 268/971] 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 269/971] 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 270/971] 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 271/971] 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 272/971] 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 273/971] 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 274/971] 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 275/971] 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 276/971] 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 277/971] 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 278/971] 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 279/971] 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 280/971] 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 281/971] 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 282/971] 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 283/971] 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 284/971] 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 285/971] 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 286/971] 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 287/971] 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 288/971] 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 289/971] 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 290/971] 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 291/971] 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 292/971] 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 293/971] 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 294/971] 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 295/971] 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 296/971] 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 297/971] 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 298/971] 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 299/971] 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 300/971] 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 301/971] 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 302/971] 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 303/971] 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 304/971] 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 305/971] 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 306/971] 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 307/971] 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 308/971] 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 309/971] 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 310/971] 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 311/971] 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 312/971] 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 313/971] 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 314/971] 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 315/971] 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 316/971] 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 317/971] 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 318/971] 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 319/971] 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 320/971] 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 321/971] 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 322/971] 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 323/971] 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 324/971] 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 325/971] 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 326/971] 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 327/971] 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 328/971] 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 329/971] 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 330/971] 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 331/971] 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 332/971] 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 333/971] 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 334/971] 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 335/971] 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 336/971] 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 337/971] 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 338/971] 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 339/971] 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 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/971] 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/971] 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 c5b393665ca77d719bc67290cc4ddd003354cf4a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Aug 2011 13:36:28 +0530 Subject: [PATCH 342/971] 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 343/971] 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; + } ?>
@@ -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 364/971] 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 365/971] 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 366/971] 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 367/971] 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 368/971] 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 369/971] 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 (! 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 344/971] 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 345/971] 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 346/971] 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 347/971] 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 348/971] 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 349/971] 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 350/971] 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 351/971] 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 352/971] 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 353/971] 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 354/971] 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 355/971] 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 360/971] 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 361/971] 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 362/971] 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 363/971] 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 370/971] 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 372/971] 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 373/971] 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 374/971] 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 375/971] 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 376/971] 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 377/971] 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 378/971] 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 379/971] 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 380/971] 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 381/971] 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 382/971] 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 383/971] 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 384/971] 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 385/971] 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 386/971] 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 387/971] 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 388/971] 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 389/971] 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 390/971] 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 391/971] 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 392/971] 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 393/971] 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 394/971] 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 395/971] 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 396/971] 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 397/971] 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 398/971] 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 399/971] 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 400/971] 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 401/971] 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 402/971] 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 403/971] 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 404/971] 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 405/971] 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 406/971] 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 407/971] 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 408/971] 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 409/971] 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 410/971] 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 411/971] 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 412/971] 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 413/971] 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 414/971] 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 415/971] 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 416/971] 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 417/971] 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 418/971] 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 419/971] 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 420/971] 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 421/971] 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 422/971] 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 423/971] 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 424/971] 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 425/971] 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 426/971] 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 427/971] 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 428/971] 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 429/971] 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 430/971] 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 431/971] 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 432/971] 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 433/971] 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 434/971] 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 435/971] 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 436/971] 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 437/971] 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 438/971] 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 439/971] 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 440/971] 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 441/971] 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 442/971] 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 443/971] 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 444/971] 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 445/971] 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 446/971] 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 447/971] 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 448/971] 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 449/971] 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 450/971] 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 451/971] 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 452/971] 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 453/971] 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 454/971] 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 455/971] 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 456/971] 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 457/971] 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 458/971] 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 459/971] 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 460/971] 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 461/971] 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 462/971] 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 463/971] 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 464/971] 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 465/971] 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 466/971] 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 467/971] 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 468/971] 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 469/971] 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 470/971] 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 471/971] 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 472/971] 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 473/971] 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 474/971] 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 475/971] 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 476/971] 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 477/971] 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 478/971] 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 479/971] 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 480/971] 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 481/971] 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 482/971] 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 483/971] 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 484/971] 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 485/971] 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 486/971] 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 487/971] 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 064a18fea54982e956101d8f157b7772f89de8a7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:58:27 +0200 Subject: [PATCH 488/971] 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 758eb37b98..1eb9583bdb 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:49+0200\n" +"PO-Revision-Date: 2011-08-19 21:58+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12269,7 +12269,7 @@ msgstr "" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" -msgstr "" +msgstr "Okunan sabit konum oranı" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." From 8d0f72de444dcb2fda1642ebcc19c08dc79b131a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 21:59:15 +0200 Subject: [PATCH 489/971] 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 1eb9583bdb..f70246b6e0 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:58+0200\n" +"PO-Revision-Date: 2011-08-19 21:59+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12273,7 +12273,7 @@ msgstr "Okunan sabit konum oranı" #: po/advisory_rules.php:131 msgid "The rate of reading data from a fixed position is high." -msgstr "" +msgstr "Sabit konumdan okunan veri oranı yüksek." #: po/advisory_rules.php:132 msgid "" From 29b694c2256c90b3d8413b071e11bf992d6afddb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 19 Aug 2011 16:16:51 -0400 Subject: [PATCH 490/971] 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 eed7df221a202ce31c494a4a3d9f683bbf386f7a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:16:21 +0200 Subject: [PATCH 491/971] 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 f70246b6e0..f9dcb609f9 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:59+0200\n" +"PO-Revision-Date: 2011-08-19 23:16+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12261,6 +12261,13 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" +"Bu genellikle sık görülen indeks taramasını gösterir. Eğer bu tablolar " +"UPDATE'lerin ve DELETE'lerin yüksek birimlerine sahip ise ya da sahip " +"olmuşsa, tam indeks taramaları tablo taramalarından daha hızlıdır ama büyük " +"tablolarda çok İşlemci döngüsü gerektirir, çalıştırılan 'OPTIMIZE TABLE' tam " +"indeks taramalarının hızını ve/veya miktarını azaltabilir. Diğer taraftan " +"tam indeks taramaları sadece yeniden yazılan sorgular tarafından " +"azaltılabilir." #: po/advisory_rules.php:128 #, php-format From e9ed69b2e6360a96f3c5eacfdcf1333df8f3f5e4 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:17:06 +0200 Subject: [PATCH 492/971] 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 f9dcb609f9..8cb3ac696a 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 23:16+0200\n" +"PO-Revision-Date: 2011-08-19 23:17+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12273,6 +12273,7 @@ msgstr "" #, php-format msgid "Index scans average: %s, this value should be less than 1 per hour" msgstr "" +"İndeks taramaları ortalaması: %s, bu değer saat başına 1'den az olmalıdır." #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" From cc18f876a7dce336f030dcb03784a5763c16275d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:23:59 +0200 Subject: [PATCH 493/971] 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 8cb3ac696a..aaed62c193 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 23:17+0200\n" +"PO-Revision-Date: 2011-08-19 23:23+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12289,6 +12289,9 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" +"Bu çoğu sorgunun sonuçları sıralaması ve/veya tam tablo taraması yapması " +"gerektiğini gösterir, indeksleri kullanmayan birleştirme sorgular da dahil. " +"Uygulanabilir yerlere indeksleri ekler." #: po/advisory_rules.php:133 #, php-format From 3597c74b67af2c50d2117c9e1842fa6ea04f360d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:25:19 +0200 Subject: [PATCH 494/971] 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 aaed62c193..ead4c8c090 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 23:23+0200\n" +"PO-Revision-Date: 2011-08-19 23:25+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12299,6 +12299,8 @@ msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" msgstr "" +"Okunan sabit konum oranı ortalaması: %s, bu değer saat başına 1'den az " +"olmalıdır" #: po/advisory_rules.php:135 msgid "Rate of reading next table row" From 944ec3258a5eded1cdbbe2cd700328ee0b43aee7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:25:28 +0200 Subject: [PATCH 495/971] 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 ead4c8c090..fc5300edcb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12242,7 +12242,7 @@ msgstr "" msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" "Tablo birleştirmeleri ortalaması: %s, bu değer saat başına 1'den az " -"olmalıdır." +"olmalıdır" #: po/advisory_rules.php:125 msgid "Rate of reading first index entry" From c811c23a4e35e94e729b79ea2d274114e27e0142 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:25:35 +0200 Subject: [PATCH 496/971] 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 fc5300edcb..6c38e5ad96 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12273,7 +12273,7 @@ msgstr "" #, php-format msgid "Index scans average: %s, this value should be less than 1 per hour" msgstr "" -"İndeks taramaları ortalaması: %s, bu değer saat başına 1'den az olmalıdır." +"İndeks taramaları ortalaması: %s, bu değer saat başına 1'den az olmalıdır" #: po/advisory_rules.php:130 msgid "Rate of reading fixed position" From fb36b8f0ffe9a87477af4b0bb207f372311f18b9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:26:16 +0200 Subject: [PATCH 497/971] 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 6c38e5ad96..ea68a25a4c 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 23:25+0200\n" +"PO-Revision-Date: 2011-08-19 23:26+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12173,7 +12173,7 @@ msgid "" "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." +"bellek sınırlarınıza bağlıdır" #: po/advisory_rules.php:108 #, php-format From 93cf51b2a814b0b7dc2367a8d5004e4c1be6f9e2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:26:20 +0200 Subject: [PATCH 498/971] 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 ea68a25a4c..9a3d8e2c5a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12213,7 +12213,7 @@ 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." +"sonuçlanacaktır" #: po/advisory_rules.php:118 #, php-format From b947daf9747dda4cf28b65d0f22e0adaafaf3bb0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:26:24 +0200 Subject: [PATCH 499/971] 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 9a3d8e2c5a..00d2ca0fb8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12235,7 +12235,7 @@ msgid "" msgstr "" "Bu, birleştirmeler tam tablo taraması yapıyor anlamına gelir. Birleştirme " "şartlarında kullanılan alanlar için indekslerin eklenmesi tablo " -"birleştirmelerini fazlasıyla hızlandıracaktır." +"birleştirmelerini fazlasıyla hızlandıracaktır" #: po/advisory_rules.php:123 #, php-format From b46070a3071c8ab474bba7268431637afb79d259 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:29:31 +0200 Subject: [PATCH 500/971] 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 00d2ca0fb8..289fdba860 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 23:26+0200\n" +"PO-Revision-Date: 2011-08-19 23:29+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12315,6 +12315,8 @@ msgid "" "This indicates that many queries are doing full table scans. Add indexes " "where applicable." msgstr "" +"Bu çoğu sorgunun tam tablo taraması yaptığını gösterir. Uygulanabilir " +"yerlere indeksleri ekler." #: po/advisory_rules.php:138 #, php-format From 395343de8f7b5757d10e494d5177ae4017a2dd13 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:30:18 +0200 Subject: [PATCH 501/971] 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 289fdba860..1136e2be19 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 23:29+0200\n" +"PO-Revision-Date: 2011-08-19 23:30+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12323,6 +12323,8 @@ msgstr "" msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" msgstr "" +"Okunan sonraki tablo satırı oranı: %s, bu değer saat başına 1'den az " +"olmalıdır" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" From 887152a124476bdcb9f38e5e653a5672b4376d62 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:31:09 +0200 Subject: [PATCH 502/971] 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 1136e2be19..d4cc60ea02 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 23:30+0200\n" +"PO-Revision-Date: 2011-08-19 23:31+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12328,7 +12328,7 @@ msgstr "" #: po/advisory_rules.php:140 msgid "tmp_table_size vs. max_heap_table_size" -msgstr "" +msgstr "tmp_table_size 'a karşı max_heap_table_size" #: po/advisory_rules.php:141 msgid "tmp_table_size and max_heap_table_size are not the same." From 9528c578f6f5a1a573b9931497e50aa4615a4949 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:31:59 +0200 Subject: [PATCH 503/971] 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 d4cc60ea02..3fe02d1000 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12332,7 +12332,7 @@ msgstr "tmp_table_size 'a karşı 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 ve max_heap_table_size aynı şey değildir." #: po/advisory_rules.php:142 msgid "" From 362f6ec3db422703f2fdf7a9a2c8f83d2b6327e0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:35:37 +0200 Subject: [PATCH 504/971] 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 3fe02d1000..f6dd0a921f 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 23:31+0200\n" +"PO-Revision-Date: 2011-08-19 23:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -7956,7 +7956,7 @@ msgid "" "escaping or quotes, using this format: a" msgstr "" "Varsayılan değerler için lütfen sola eğik çizgisiz veya alıntısız sadece tek " -"değer girin. Bu biçimi kullanın: a" +"değer girin, bu biçimi kullanarak: a" #: libraries/tbl_properties.inc.php:119 libraries/tbl_properties.inc.php:494 #: tbl_printview.php:290 tbl_structure.php:154 tbl_structure.php:159 From bfe662750a20575dbeb31e255aab06cec5f42f70 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 19 Aug 2011 23:36:28 +0200 Subject: [PATCH 505/971] 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 f6dd0a921f..d13b47e28c 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 23:35+0200\n" +"PO-Revision-Date: 2011-08-19 23:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -8657,8 +8657,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Config.inc.php dosyasını değiştirerek daha fazla ayar ayarlayabilirsiniz, " -"örn. %sKur programcığı%s kullanarak." +"Config.inc.php dosyasını değiştirerek daha fazla ayar yapabilirsiniz, örn. %" +"sKur programcığı%s kullanarak." #: prefs_manage.php:300 msgid "Save to browser's storage" From 80daf344942c5b60b0c244771b7c18c309edf06d Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sat, 20 Aug 2011 00:43:51 +0200 Subject: [PATCH 506/971] 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 507/971] 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 508/971] 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 From 37fa3074d6f401ef0b4181e5aa486749fd1739ef Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:11:59 +0200 Subject: [PATCH 509/971] 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 85dca7fa0e..3d05127f49 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:26+0200\n" +"PO-Revision-Date: 2011-08-20 01:11+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -9495,6 +9495,9 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Kakor koli, pomnite, da ta sistem nudi priporočila, ki temeljijo na " +"preprostih računih in splošnih smernicah, katere morda ne ustrezajo vašemu " +"sistemu." #: server_status.php:812 msgid "" From 3da5de82702c3fbaba4e96a624603f02b81d5dcc Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:13:58 +0200 Subject: [PATCH 510/971] Translation update done using Pootle. --- po/sl.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 3d05127f49..bb6b160268 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-20 01:11+0200\n" +"PO-Revision-Date: 2011-08-20 01:13+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -9505,6 +9505,10 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Preden spremenite kateri koli del konfiguracije, se prepričajte, da veste, " +"kaj spreminjate (tako, da preberete dokumentacijo) in kako lahko spremembo " +"razveljavite. Napačno nastavljanje ima lahko na zmogljivost zelo negativen " +"učinek." #: server_status.php:814 msgid "" From b06a8cb70bb525482cc24f500bc3161499644f59 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:15:53 +0200 Subject: [PATCH 511/971] 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 bb6b160268..b0dc413003 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-20 01:13+0200\n" +"PO-Revision-Date: 2011-08-20 01:15+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -9516,6 +9516,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"Najboljši način nastavljanja vašega sistema je spreminjanje samo ene " +"nastavitve naenkrat, opazovanje ali primerjalno preizkušanje vaše zbirke " +"podatkov in razveljavitev spremembe, če ni jasno izmerljivega izboljšanja." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 From ca691fd51fd76d8f6d7ad1b3667de2a05adda908 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:17:29 +0200 Subject: [PATCH 512/971] 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 b0dc413003..bfecb4b28d 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-20 01:15+0200\n" +"PO-Revision-Date: 2011-08-20 01:17+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11703,6 +11703,8 @@ msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Za natančnejša povprečja je priporočljivo, da pred zagonom analitika pustite " +"strežnik delovati dlje kot en dan" #: po/advisory_rules.php:8 #, php-format From fc47ad7bc0b303ab54df8ef82f0c2cb5caae7c53 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:18:22 +0200 Subject: [PATCH 513/971] 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 bfecb4b28d..0b5b03ef25 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-20 01:17+0200\n" +"PO-Revision-Date: 2011-08-20 01:18+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11728,6 +11728,8 @@ msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Pustite strežniku delovati daljši čas, dokler ne izvede večje število " +"poizvedb." #: po/advisory_rules.php:13 #, php-format From 0e36115e7f5ac68c75622144017859f75db71af2 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:19:25 +0200 Subject: [PATCH 514/971] 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 0b5b03ef25..64d1cc0863 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-20 01:18+0200\n" +"PO-Revision-Date: 2011-08-20 01:19+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11767,6 +11767,8 @@ msgstr "Delež počasnih poizvedb" msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Odstotek počasnih poizvedb je v primerjavi z neprekinjemin delovanjem " +"strežnika visok." #: po/advisory_rules.php:23 #, php-format From a739d9d30dd6db2d79eb6418b54322429cb0f105 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:20:28 +0200 Subject: [PATCH 515/971] Translation update done using Pootle. --- po/sl.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 64d1cc0863..c6fc5650da 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-20 01:19+0200\n" +"PO-Revision-Date: 2011-08-20 01:20+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11776,6 +11776,7 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Vaš delež počasnih poizvedb je %s na uro; moral bi biti manj od 1 %% na uro." #: po/advisory_rules.php:25 msgid "Long query time" From ad5dd7d97ca9e49d92c4bab8587fed9726d83b43 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:21:28 +0200 Subject: [PATCH 516/971] 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 c6fc5650da..085907d482 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-20 01:20+0200\n" +"PO-Revision-Date: 2011-08-20 01:21+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11795,6 +11795,8 @@ msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." msgstr "" +"Predlagamo, da nastavite {long_query_time} na nižjo vrednost, odvisno od " +"vašega okolja. Po navadi se priporoča vrednost 1–5 sekund." #: po/advisory_rules.php:28 #, php-format From 08019b10c0aad9b16800332c1c979cd9554b7e9b Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:23:06 +0200 Subject: [PATCH 517/971] 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 085907d482..0aeed80a01 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-20 01:21+0200\n" +"PO-Revision-Date: 2011-08-20 01:23+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11816,6 +11816,9 @@ msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." msgstr "" +"Omogočite beleženje počasnih poizvedb tako, da nastavite {log_slow_queries} " +"na 'ON'. To bo pomagalo pri odpravljanju težav s slabo delujočimi " +"poizvedbami." #: po/advisory_rules.php:33 msgid "log_slow_queries is set to 'OFF'" From 112c4544815b9813ab1784cbf2b5f0929a0855a2 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:24:53 +0200 Subject: [PATCH 518/971] 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 0aeed80a01..7b4a38cd52 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-20 01:23+0200\n" +"PO-Revision-Date: 2011-08-20 01:24+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11884,6 +11884,9 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" +"Če niste prevedli iz izvorne kode, morda uporabljate paket, spremenjen z " +"distribucijo. Priročnik MySQL je točen samo za uradne izdaje MySQL, ne za " +"katere koli paketne distribucije (kot so RedHat, Debian/Ubuntu itn.)." #: po/advisory_rules.php:53 msgid "'source' found in version_comment" From b2e6ba037c990ca00e49fe87ec675f5151e54621 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:26:46 +0200 Subject: [PATCH 519/971] 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 7b4a38cd52..efaccf0769 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-20 01:24+0200\n" +"PO-Revision-Date: 2011-08-20 01:26+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11918,6 +11918,9 @@ msgid "" "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." msgstr "" +"Zmogljivost vašega pomnilnika je nad 3 GiB (predpostavljeno, da strežnik " +"teče na localhost), zato MySQL morda ne bo zmožen dostopati do celotnega " +"vašega pomnilnika. Razmislite o namestitvi 64-bitne različice MySQL." #: po/advisory_rules.php:63 #, php-format From dbe14d86cb38e6764e21d4f4e71ed009f03245d9 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:26:59 +0200 Subject: [PATCH 520/971] Translation update done using Pootle. --- po/sl.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index efaccf0769..4f99d7ea7c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11920,7 +11920,8 @@ msgid "" msgstr "" "Zmogljivost vašega pomnilnika je nad 3 GiB (predpostavljeno, da strežnik " "teče na localhost), zato MySQL morda ne bo zmožen dostopati do celotnega " -"vašega pomnilnika. Razmislite o namestitvi 64-bitne različice MySQL." +"vašega pomnilnika. Morda boste želeli razmisliti o namestitvi 64-bitne " +"različice MySQL." #: po/advisory_rules.php:63 #, php-format From 40b694ff9cce294f0988b89eafd84c5afadb1cc6 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:28:43 +0200 Subject: [PATCH 521/971] Translation update done using Pootle. --- po/sl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 4f99d7ea7c..4a48d54575 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-20 01:26+0200\n" +"PO-Revision-Date: 2011-08-20 01:28+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -5828,8 +5828,8 @@ msgid "" "The increment size for extending the size of an autoextending tablespace " "when it becomes full." msgstr "" -" Velikost povečevanja pri razširjanju velikosti samorazširitvenega prostora " -"v tabeli, ko ta postane poln." +"Velikost povečevanja pri razširjanju velikosti samorazširitvenega prostora v " +"tabeli, ko ta postane poln." #: libraries/engines/innodb.lib.php:32 msgid "Buffer pool size" From 8bce629ccc678848bd0640736551db296c72698f Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:28:48 +0200 Subject: [PATCH 522/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 4a48d54575..75532a8b2e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9139,7 +9139,7 @@ msgid "" "... delete the old one from the user tables and reload the privileges " "afterwards." msgstr "" -" ... izbriši starega uporabnika s seznama uporabnikov ter ponovno naloži " +"... izbriši starega uporabnika s seznama uporabnikov ter ponovno naloži " "njegove pravice." #: server_privileges.php:2199 From a310044be36d9bd3856fb61b11e6f27882f6441e Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:29:45 +0200 Subject: [PATCH 523/971] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 75532a8b2e..f44bf602fa 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-20 01:28+0200\n" +"PO-Revision-Date: 2011-08-20 01:29+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -7830,7 +7830,7 @@ msgstr "Ločilo" #: libraries/sql_query_form.lib.php:346 msgid "Show this query here again" -msgstr "Ponovno pokaži poizvedbo v tem oknu " +msgstr "Ponovno pokaži poizvedbo v tem oknu" #: libraries/sql_query_form.lib.php:402 msgid "View only" From 15df4f74fb219d54196a69ca18c389623cc0ddd5 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:29:54 +0200 Subject: [PATCH 524/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index f44bf602fa..92e794c318 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8963,7 +8963,7 @@ msgstr "Privilegiji tipični za tabelo" #: server_privileges.php:532 server_privileges.php:676 #: server_privileges.php:1695 msgid "Note: MySQL privilege names are expressed in English" -msgstr "Opomba: Imena privilegijev MySQL so zapisana v angleščini " +msgstr "Opomba: Imena privilegijev MySQL so zapisana v angleščini" #: server_privileges.php:601 msgid "Administration" From c790f497363ba6b6fc87c1e61a2b5ef3fa99ad91 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:30:02 +0200 Subject: [PATCH 525/971] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 92e794c318..cb4d7201ef 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-20 01:29+0200\n" +"PO-Revision-Date: 2011-08-20 01:30+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -10407,7 +10407,7 @@ msgstr "" "Zavedajte se tudi, da je ustvarjanje statistik iz dnevnikov zelo " "obremenjujoče opravilo, zato je priporočljivo, da izberete samo majhen " "časovni razpon ter onemogočite general_log in počistite njene tabele, ko " -"nadziranja ne potrebujete več. " +"nadziranja ne potrebujete več." #: server_status.php:1533 msgid "Preset chart" From 346ee4582181c93d904ebab97e7b33c3f69c7c2b Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:30:12 +0200 Subject: [PATCH 526/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index cb4d7201ef..b8496d3e0c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -10983,7 +10983,7 @@ msgstr "Tabela %1$s je bila uspešno spremenjena" #: tbl_change.php:700 msgid "Because of its length,
    this column might not be editable" -msgstr "Zaradi njegove dolžine
    stolpca morda ne bo mogoče urejati " +msgstr "Zaradi njegove dolžine
    stolpca morda ne bo mogoče urejati" #: tbl_change.php:819 msgid "Remove BLOB Repository Reference" From e4c691186899242f156f15496ee57114fb28aa8a Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:30:32 +0200 Subject: [PATCH 527/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index b8496d3e0c..24e651ba01 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1565,7 +1565,7 @@ msgstr "Spremenjene vrstice:" msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" "Razčlenjevalne konfiguracijske datoteke je spodletelo. Kot kaže, ni veljavna " -"koda JSON." +"koda JSON" #: js/messages.php:189 msgid "" From 219bb3cb38c1a225d7466089a291872bf9693270 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:30:58 +0200 Subject: [PATCH 528/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 24e651ba01..8b38c38244 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8513,7 +8513,7 @@ msgstr "Dejavne možnosti" #: pmd_help.php:22 msgid "To select relation, click :" -msgstr "Za izbiro relacije, kliknite:" +msgstr "Za izbiro relacije kliknite:" #: pmd_help.php:24 msgid "" From 54f00c1f109edbd4fe382a6adf2afbbf5e991e54 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 01:31:57 +0200 Subject: [PATCH 529/971] 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 d13b47e28c..8c9034a238 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 23:36+0200\n" +"PO-Revision-Date: 2011-08-20 01:31+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12341,6 +12341,10 @@ msgid "" "wish to increase the in-memory table limit you will have to increase the " "other value as well." msgstr "" +"Eğer kasıtlı olarak ikisinden birini değiştirirseniz: Sunucu bellek içi " +"tabloların en fazla boyutunu belirlemek için her iki düşük değeri kullanır. " +"Bu yüzden eğer bellek içi tablo sınırını arttırmak isterseniz, diğer değeri " +"de arttırmak zorunda kalacaksınız." #: po/advisory_rules.php:143 #, php-format From 4ba50871f61f8e7a5f7074c6839859296ea23c11 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 01:32:27 +0200 Subject: [PATCH 530/971] 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 8c9034a238..8787cdc92b 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-20 01:31+0200\n" +"PO-Revision-Date: 2011-08-20 01:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12349,7 +12349,7 @@ msgstr "" #: po/advisory_rules.php:143 #, php-format msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s" -msgstr "" +msgstr "Şu anki değerler tmp_table_size: %s, max_heap_table_size: %s" #: po/advisory_rules.php:145 msgid "Percentage of temp tables on disk" From a77857164f7e1135624c7f7acb68ebb27206d9e0 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 20 Aug 2011 01:33:30 +0200 Subject: [PATCH 531/971] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 8b38c38244..360c1511fd 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-20 01:30+0200\n" +"PO-Revision-Date: 2011-08-20 01:33+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -2808,7 +2808,7 @@ msgstr "ned" #: libraries/common.lib.php:1550 #: libraries/transformations/text_plain__dateformat.inc.php:35 msgid "%B %d, %Y at %I:%M %p" -msgstr "%d %B %Y ob %H.%M" +msgstr "%d. %B %Y ob %H.%M" #: libraries/common.lib.php:1865 #, php-format From c902d579364b6cf3eaad3669523419c17ac8590b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 01:33:34 +0200 Subject: [PATCH 532/971] 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 8787cdc92b..f8c58b75ec 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-20 01:32+0200\n" +"PO-Revision-Date: 2011-08-20 01:33+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12359,7 +12359,7 @@ msgstr "Diskteki geçici tabloların yüzdesi" msgid "" "Many temporary tables are being written to disk instead of being kept in " "memory." -msgstr "" +msgstr "Birçok geçici tablo bellekte tutulmak yerine diske yazılıyor." #: po/advisory_rules.php:147 msgid "" From 4db9c176b3be2325a7b824de8c2409fc4390640d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 20 Aug 2011 07:19:17 +0530 Subject: [PATCH 533/971] bug #3385954 - unknown table status:Create_time on dispalying view (again) --- libraries/display_tbl.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ddcfb7a175..e7488ffd61 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -578,8 +578,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo ''; } // generate table create time - echo ''; + if (! PMA_Table::isView($GLOBALS['table'], $GLOBALS['db'])) { + echo ''; + } } From c5b108b716dd765f67b30d530d6d50f7791c2569 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 20 Aug 2011 07:29:53 +0530 Subject: [PATCH 534/971] Coding style improvements to Dia_Relation_Schema --- .../schema/Dia_Relation_Schema.class.php | 294 +++++++++++------- 1 file changed, 178 insertions(+), 116 deletions(-) diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php index fa2884d977..11c03ec5bb 100644 --- a/libraries/schema/Dia_Relation_Schema.class.php +++ b/libraries/schema/Dia_Relation_Schema.class.php @@ -5,7 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); +include_once "Export_Relation_Schema.class.php"; /** * This Class inherits the XMLwriter class and @@ -14,7 +14,6 @@ include_once("Export_Relation_Schema.class.php"); * @access public * @see http://php.net/manual/en/book.xmlwriter.php */ - class PMA_DIA extends XMLWriter { public $title; @@ -44,7 +43,7 @@ class PMA_DIA extends XMLWriter * Create the XML document */ - $this->startDocument('1.0','UTF-8'); + $this->startDocument('1.0', 'UTF-8'); } /** @@ -55,27 +54,29 @@ class PMA_DIA extends XMLWriter * to define the document, then finally a Layer starts which * holds all the objects. * - * @param string paper The size of the paper/document - * @param float topMargin top margin of the paper/document in cm - * @param float bottomMargin bottom margin of the paper/document in cm - * @param float leftMargin left margin of the paper/document in cm - * @param float rightMargin right margin of the paper/document in cm - * @param string portrait document will be portrait or landscape + * @param string $paper the size of the paper/document + * @param float $topMargin top margin of the paper/document in cm + * @param float $bottomMargin bottom margin of the paper/document in cm + * @param float $leftMargin left margin of the paper/document in cm + * @param float $rightMargin right margin of the paper/document in cm + * @param string $portrait document will be portrait or landscape + * * @return void + * * @access public * @see XMLWriter::startElement(),XMLWriter::writeAttribute(),XMLWriter::writeRaw() */ function startDiaDoc($paper,$topMargin,$bottomMargin,$leftMargin,$rightMargin,$portrait) { - if($portrait == 'P'){ + if ($portrait == 'P') { $isPortrait='true'; - }else{ + } else { $isPortrait='false'; } $this->startElement('dia:diagram'); $this->writeAttribute('xmlns:dia', 'http://www.lysator.liu.se/~alla/dia/'); $this->startElement('dia:diagramdata'); - $this->writeRaw ( + $this->writeRaw( ' @@ -85,22 +86,22 @@ class PMA_DIA extends XMLWriter - #'.$paper.'# + #' . $paper . '# - + - + - + - + - + @@ -160,18 +161,21 @@ class PMA_DIA extends XMLWriter /** * Output Dia Document for download * - * @param string fileName name of the dia document + * @param string $fileName name of the dia document + * * @return void * @access public * @see XMLWriter::flush() */ function showOutput($fileName) { - if(ob_get_clean()){ + if (ob_get_clean()) { ob_end_clean(); } $output = $this->flush(); - PMA_download_header($fileName . '.dia', 'application/x-dia-diagram', strlen($output)); + PMA_download_header( + $fileName . '.dia', 'application/x-dia-diagram', strlen($output) + ); print $output; } } @@ -200,14 +204,17 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string table_name The table name - * @param integer pageNumber The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) - * @param boolean showKeys Whether to display ONLY keys or not + * @param string $tableName The table name + * @param integer $pageNumber The current page number (from the + * $cfg['Servers'][$i]['table_coords'] table) + * @param boolean $showKeys Whether to display ONLY keys or not + * * @return void + * * @global object The current dia document * @global array The relations settings * @global string The current db name + * * @see PMA_DIA */ function __construct($tableName, $pageNumber, $showKeys = false) @@ -218,7 +225,10 @@ class Table_Stats $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); if (!$result || !PMA_DBI_num_rows($result)) { - $dia->dieSchema($pageNumber,"DIA",sprintf(__('The %s table doesn\'t exist!'), $tableName)); + $dia->dieSchema( + $pageNumber, "DIA", + sprintf(__('The %s table doesn\'t exist!'), $tableName) + ); } /* * load fields @@ -228,7 +238,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -238,13 +251,21 @@ class Table_Stats } $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $dia->dieSchema($pageNumber,"DIA",sprintf(__('Please configure the coordinates for table %s'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $dia->dieSchema( + $pageNumber, + "DIA", + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -256,7 +277,11 @@ class Table_Stats /* * index */ - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, + PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -280,13 +305,15 @@ class Table_Stats * is used to generate the XML of Dia Document. Database Table * Object and their attributes are involved in the combination * of displaing Database - Table on Dia Document. - - * @param boolean changeColor Whether to show color for tables text or not - if changeColor is true then an array of $listOfColors - will be used to choose the random colors for tables text - we can change/add more colors to this array - @return void - * @global object The current Dia document + * + * @param boolean $changeColor Whether to show color for tables text or not + * if changeColor is true then an array of $listOfColors will be used to choose + * the random colors for tables text we can change/add more colors to this array + * + * @return void + * + * @global object The current Dia document + * * @access public * @see PMA_DIA */ @@ -301,7 +328,7 @@ class Table_Stats '00FF00' ); shuffle($listOfColors); - $this->tableColor = '#'.$listOfColors[0].''; + $this->tableColor = '#' . $listOfColors[0] . ''; } else { $this->tableColor = '#000000'; } @@ -311,19 +338,22 @@ class Table_Stats $dia->startElement('dia:object'); $dia->writeAttribute('type', 'Database - Table'); $dia->writeAttribute('version', '0'); - $dia->writeAttribute('id', ''.$this->tableId.''); + $dia->writeAttribute('id', '' . $this->tableId . ''); $dia->writeRaw( ' - + - + - + @@ -332,7 +362,7 @@ class Table_Stats - + @@ -344,7 +374,7 @@ class Table_Stats - #'.$this->tableName.'# + #' . $this->tableName . '# ## @@ -379,44 +409,44 @@ class Table_Stats ' - ); + ); $dia->startElement('dia:attribute'); $dia->writeAttribute('name', 'attributes'); foreach ($this->fields as $field) { - $dia->writeRaw( - ' - - #'.$field.'# - - - ## - - + $dia->writeRaw( + ' + + #' . $field . '# + + ## - ' - ); - unset($pm); - $pm = 'false'; - if (in_array($field, $this->primary)) { - $pm = 'true'; - } - if ($field == $this->displayfield) { - $pm = 'false'; - } - $dia->writeRaw( - ' - - - - - - - - - ' - ); + + + ## + ' + ); + unset($pm); + $pm = 'false'; + if (in_array($field, $this->primary)) { + $pm = 'true'; + } + if ($field == $this->displayfield) { + $pm = 'false'; + } + $dia->writeRaw( + ' + + + + + + + + + ' + ); } $dia->endElement(); $dia->endElement(); @@ -452,11 +482,13 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * * @return void + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -480,9 +512,11 @@ class Relation_Stats * then determines its left and right connection * points. * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Table right,left connection points and key position + * * @access private */ private function _getXy($table, $column) @@ -490,8 +524,7 @@ class Relation_Stats $pos = array_search($column, $table->fields); // left, right, position $value = 12; - if($pos != 0) - { + if ($pos != 0) { return array($pos + $value + $pos, $pos + $value + $pos + 1, $pos); } return array($pos + $value , $pos + $value + 1, $pos); @@ -506,12 +539,14 @@ class Relation_Stats * Database reference Object and their attributes are involved * in the combination of displaing Database - reference on Dia Document. * - * @param boolean changeColor Whether to use one color per relation or not - if changeColor is true then an array of $listOfColors - will be used to choose the random colors for references - lines. we can change/add more colors to this array + * @param boolean $changeColor Whether to use one color per relation or not + * if changeColor is true then an array of $listOfColors will be used to choose + * the random colors for references lines. we can change/add more colors to this + * * @return void - * @global object The current Dia document + * + * @global object The current Dia document + * * @access public * @see PMA_PDF */ @@ -525,8 +560,8 @@ class Relation_Stats * points are same then return it false and don't draw that * relation */ - if ( $this->srcConnPointsRight == $this->destConnPointsRight ){ - if ( $this->srcConnPointsLeft == $this->destConnPointsLeft ){ + if ( $this->srcConnPointsRight == $this->destConnPointsRight) { + if ( $this->srcConnPointsLeft == $this->destConnPointsLeft) { return false; } } @@ -538,13 +573,14 @@ class Relation_Stats '00FF00' ); shuffle($listOfColors); - $this->referenceColor = '#'.$listOfColors[0].''; + $this->referenceColor = '#' . $listOfColors[0] . ''; } else { $this->referenceColor = '#000000'; } $dia->writeRaw( - ' + ' @@ -576,7 +612,7 @@ class Relation_Stats - + @@ -610,11 +646,15 @@ class Relation_Stats - - + + ' - ); + ); } } @@ -667,11 +707,16 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); $dia = new PMA_DIA(); - $dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation); - $alltables = $this->getAllTables($db,$this->pageNumber); + $dia->startDiaDoc( + $this->paper, $this->_topMargin, $this->_bottomMargin, + $this->_leftMargin, $this->_rightMargin, $this->orientation + ); + $alltables = $this->getAllTables($db, $this->pageNumber); foreach ($alltables as $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys); + $this->tables[$table] = new Table_Stats( + $table, $this->pageNumber, $this->showKeys + ); } } @@ -682,12 +727,15 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $seen_a_relation = true; foreach ($exist_rel as $master_field => $rel) { /* put the foreign table on the schema only if selected - * by the user - * (do not use array_search() because we would have to - * to do a === false and this is not PHP3 compatible) - */ + * by the user + * (do not use array_search() because we would have to + * to do a === false and this is not PHP3 compatible) + */ if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'],$this->showKeys); + $this->_addRelation( + $one_table, $master_field, $rel['foreign_table'], + $rel['foreign_field'], $this->showKeys + ); } } } @@ -698,30 +746,40 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema $this->_drawRelations($this->showColor); } $dia->endDiaDoc(); - $dia->showOutput($db.'-'.$this->pageNumber); + $dia->showOutput($db . '-' . $this->pageNumber); exit(); } /** * Defines relation objects * - * @param string masterTable The master table name - * @param string masterField The relation field in the master table - * @param string foreignTable The foreign table name - * @param string foreignField The relation field in the foreign table + * @param string $masterTable The master table name + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param bool $showKeys Whether to display ONLY keys or not + * * @return void + * * @access private * @see Table_Stats::__construct(),Relation_Stats::__construct() */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $this->pageNumber, $showKeys + ); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $this->pageNumber, $showKeys + ); } - $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->_relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** @@ -731,8 +789,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema * foreign table's forein field using Dia object * type Database - Reference * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * * @return void + * * @access private * @see Relation_Stats::relationDraw() */ @@ -749,8 +809,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema * Tables are generated using Dia object type Database - Table * primary fields are underlined and bold in tables * - * @param boolean changeColor Whether to show color for tables text or not + * @param boolean $changeColor Whether to show color for tables text or not + * * @return void + * * @access private * @see Table_Stats::tableDraw() */ From 249a1d5c8cd7796cb240f99389b731df0f02cc43 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 20 Aug 2011 07:30:11 +0530 Subject: [PATCH 535/971] Coding style improvements to Eps_Relation_Schema --- .../schema/Eps_Relation_Schema.class.php | 462 +++++++++++------- 1 file changed, 285 insertions(+), 177 deletions(-) diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index 367b8c28be..be70889ea4 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -5,7 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); +include_once "Export_Relation_Schema.class.php"; /** * This Class is EPS Library and @@ -42,8 +42,10 @@ class PMA_EPS /** * Set document title * - * @param string value sets the title text + * @param string $value sets the title text + * * @return void + * * @access public */ function setTitle($value) @@ -54,8 +56,10 @@ class PMA_EPS /** * Set document author * - * @param string value sets the author + * @param string $value sets the author + * * @return void + * * @access public */ function setAuthor($value) @@ -66,8 +70,10 @@ class PMA_EPS /** * Set document creation date * - * @param string value sets the date + * @param string $value sets the date + * * @return void + * * @access public */ function setDate($value) @@ -78,17 +84,19 @@ class PMA_EPS /** * Set document orientation * - * @param string value sets the author + * @param string $value sets the author + * * @return void + * * @access public */ function setOrientation($value) { $this->stringCommands .= "%%PageOrder: Ascend \n"; - if($value == "L"){ + if ($value == "L") { $value = "Landscape"; $this->stringCommands .= '%%Orientation: ' . $value . "\n"; - }else{ + } else { $value = "Portrait"; $this->stringCommands .= '%%Orientation: ' . $value . "\n"; } @@ -102,17 +110,19 @@ class PMA_EPS * * font can be set whenever needed in EPS * - * @param string value sets the font name e.g Arial - * @param integer value sets the size of the font e.g 10 + * @param string $value sets the font name e.g Arial + * @param integer $value sets the size of the font e.g 10 + * * @return void + * * @access public */ function setFont($value,$size) { $this->font = $value; $this->fontSize = $size; - $this->stringCommands .= "/".$value." findfont % Get the basic font\n"; - $this->stringCommands .= "".$size." scalefont % Scale the font to $size points\n"; + $this->stringCommands .= "/" . $value . " findfont % Get the basic font\n"; + $this->stringCommands .= "" . $size . " scalefont % Scale the font to $size points\n"; $this->stringCommands .= "setfont % Make it the current font\n"; } @@ -144,19 +154,21 @@ class PMA_EPS * drawing the lines from x,y source to x,y destination and set the * width of the line. lines helps in showing relationships of tables * - * @param integer x_from The x_from attribute defines the start - left position of the element - * @param integer y_from The y_from attribute defines the start - right position of the element - * @param integer x_to The x_to attribute defines the end - left position of the element - * @param integer y_to The y_to attribute defines the end - right position of the element - * @param integer lineWidth sets the width of the line e.g 2 + * @param integer $x_from The x_from attribute defines the start + * left position of the element + * @param integer $y_from The y_from attribute defines the start + * right position of the element + * @param integer $x_to The x_to attribute defines the end + * left position of the element + * @param integer $y_to The y_to attribute defines the end + * right position of the element + * @param integer $lineWidth Sets the width of the line e.g 2 + * * @return void + * * @access public */ - function line($x_from=0, $y_from=0, $x_to=0, $y_to=0, $lineWidth=0) + function line($x_from = 0, $y_from = 0, $x_to = 0, $y_to = 0, $lineWidth = 0) { $this->stringCommands .= $lineWidth . " setlinewidth \n"; $this->stringCommands .= $x_from . ' ' . $y_from . " moveto \n"; @@ -170,28 +182,30 @@ class PMA_EPS * drawing the rectangle from x,y source to x,y destination and set the * width of the line. rectangles drawn around the text shown of fields * - * @param integer x_from The x_from attribute defines the start - left position of the element - * @param integer y_from The y_from attribute defines the start - right position of the element - * @param integer x_to The x_to attribute defines the end - left position of the element - * @param integer y_to The y_to attribute defines the end - right position of the element - * @param integer lineWidth sets the width of the line e.g 2 + * @param integer $x_from The x_from attribute defines the start + left position of the element + * @param integer $y_from The y_from attribute defines the start + right position of the element + * @param integer $x_to The x_to attribute defines the end + left position of the element + * @param integer $y_to The y_to attribute defines the end + right position of the element + * @param integer $lineWidth Sets the width of the line e.g 2 + * * @return void + * * @access public */ function rect($x_from, $y_from, $x_to, $y_to, $lineWidth) { - $this->stringCommands .= $lineWidth . " setlinewidth \n"; - $this->stringCommands .= "newpath \n"; - $this->stringCommands .= $x_from . " " . $y_from . " moveto \n"; - $this->stringCommands .= "0 " . $y_to . " rlineto \n"; - $this->stringCommands .= $x_to . " 0 rlineto \n"; - $this->stringCommands .= "0 -" . $y_to . " rlineto \n"; - $this->stringCommands .= "closepath \n"; - $this->stringCommands .= "stroke \n"; + $this->stringCommands .= $lineWidth . " setlinewidth \n"; + $this->stringCommands .= "newpath \n"; + $this->stringCommands .= $x_from . " " . $y_from . " moveto \n"; + $this->stringCommands .= "0 " . $y_to . " rlineto \n"; + $this->stringCommands .= $x_to . " 0 rlineto \n"; + $this->stringCommands .= "0 -" . $y_to . " rlineto \n"; + $this->stringCommands .= "closepath \n"; + $this->stringCommands .= "stroke \n"; } /** @@ -201,11 +215,11 @@ class PMA_EPS * them as x and y coordinates to which to move. The coordinates * specified become the current point. * - * @param integer x The x attribute defines the - left position of the element - * @param integer y The y attribute defines the - right position of the element + * @param integer $x The x attribute defines the left position of the element + * @param integer $y The y attribute defines the right position of the element + * * @return void + * * @access public */ function moveTo($x, $y) @@ -216,31 +230,33 @@ class PMA_EPS /** * Output/Display the text * - * @param string text The string to be displayed + * @param string $text The string to be displayed + * * @return void + * * @access public */ - function show($text) - { - $this->stringCommands .= '(' . $text . ") show \n"; - } + function show($text) + { + $this->stringCommands .= '(' . $text . ") show \n"; + } /** * Output the text at specified co-ordinates * - * @param string text The string to be displayed - * @param integer x The x attribute defines the - left position of the element - * @param integer y The y attribute defines the - right position of the element + * @param string $text String to be displayed + * @param integer $x X attribute defines the left position of the element + * @param integer $y Y attribute defines the right position of the element + * * @return void + * * @access public */ - function showXY($text, $x, $y) - { - $this->moveTo($x, $y); - $this->show($text); - } + function showXY($text, $x, $y) + { + $this->moveTo($x, $y); + $this->show($text); + } /** * get width of string/text @@ -252,10 +268,12 @@ class PMA_EPS * This is a bit hardcore method. I didn't found any other better than this. * if someone found better than this. would love to hear that method * - * @param string text string that width will be calculated - * @param integer font name of the font like Arial,sans-serif etc - * @param integer fontSize size of font + * @param string $text string that width will be calculated + * @param integer $font name of the font like Arial,sans-serif etc + * @param integer $fontSize size of font + * * @return integer width of the text + * * @access public */ function getStringWidth($text,$font,$fontSize) @@ -264,22 +282,22 @@ class PMA_EPS * Start by counting the width, giving each character a modifying value */ $count = 0; - $count = $count + ((strlen($text) - strlen(str_replace(array("i","j","l"),"",$text)))*0.23);//ijl - $count = $count + ((strlen($text) - strlen(str_replace(array("f"),"",$text)))*0.27);//f - $count = $count + ((strlen($text) - strlen(str_replace(array("t","I"),"",$text)))*0.28);//tI - $count = $count + ((strlen($text) - strlen(str_replace(array("r"),"",$text)))*0.34);//r - $count = $count + ((strlen($text) - strlen(str_replace(array("1"),"",$text)))*0.49);//1 - $count = $count + ((strlen($text) - strlen(str_replace(array("c","k","s","v","x","y","z","J"),"",$text)))*0.5);//cksvxyzJ - $count = $count + ((strlen($text) - strlen(str_replace(array("a","b","d","e","g","h","n","o","p","q","u","L","0","2","3","4","5","6","7","8","9"),"",$text)))*0.56);//abdeghnopquL023456789 - $count = $count + ((strlen($text) - strlen(str_replace(array("F","T","Z"),"",$text)))*0.61);//FTZ - $count = $count + ((strlen($text) - strlen(str_replace(array("A","B","E","K","P","S","V","X","Y"),"",$text)))*0.67);//ABEKPSVXY - $count = $count + ((strlen($text) - strlen(str_replace(array("w","C","D","H","N","R","U"),"",$text)))*0.73);//wCDHNRU - $count = $count + ((strlen($text) - strlen(str_replace(array("G","O","Q"),"",$text)))*0.78);//GOQ - $count = $count + ((strlen($text) - strlen(str_replace(array("m","M"),"",$text)))*0.84);//mM - $count = $count + ((strlen($text) - strlen(str_replace("W","",$text)))*.95);//W - $count = $count + ((strlen($text) - strlen(str_replace(" ","",$text)))*.28);//" " - $text = str_replace(" ","",$text);//remove the " "'s - $count = $count + (strlen(preg_replace("/[a-z0-9]/i","",$text))*0.3); //all other chrs + $count = $count + ((strlen($text) - strlen(str_replace(array("i", "j", "l"), "", $text))) * 0.23);//ijl + $count = $count + ((strlen($text) - strlen(str_replace(array("f"), "", $text))) * 0.27);//f + $count = $count + ((strlen($text) - strlen(str_replace(array("t", "I"), "", $text))) * 0.28);//tI + $count = $count + ((strlen($text) - strlen(str_replace(array("r"), "", $text))) * 0.34);//r + $count = $count + ((strlen($text) - strlen(str_replace(array("1"), "", $text))) * 0.49);//1 + $count = $count + ((strlen($text) - strlen(str_replace(array("c", "k", "s", "v", "x", "y", "z", "J"), "", $text))) * 0.5);//cksvxyzJ + $count = $count + ((strlen($text) - strlen(str_replace(array("a", "b", "d", "e", "g", "h", "n", "o", "p", "q", "u", "L", "0", "2", "3", "4", "5", "6", "7", "8", "9"), "", $text))) * 0.56);//abdeghnopquL023456789 + $count = $count + ((strlen($text) - strlen(str_replace(array("F", "T", "Z"), "", $text))) * 0.61);//FTZ + $count = $count + ((strlen($text) - strlen(str_replace(array("A", "B", "E", "K", "P", "S", "V", "X", "Y"), "", $text))) * 0.67);//ABEKPSVXY + $count = $count + ((strlen($text) - strlen(str_replace(array("w", "C", "D", "H", "N", "R", "U"), "", $text))) * 0.73);//wCDHNRU + $count = $count + ((strlen($text) - strlen(str_replace(array("G", "O", "Q"), "", $text))) * 0.78);//GOQ + $count = $count + ((strlen($text) - strlen(str_replace(array("m", "M"), "", $text))) * 0.84);//mM + $count = $count + ((strlen($text) - strlen(str_replace("W", "", $text))) * .95);//W + $count = $count + ((strlen($text) - strlen(str_replace(" ", "", $text))) * .28);//" " + $text = str_replace(" ", "", $text);//remove the " "'s + $count = $count + (strlen(preg_replace("/[a-z0-9]/i", "", $text)) * 0.3); //all other chrs $modifier = 1; $font = strtolower($font); @@ -289,7 +307,7 @@ class PMA_EPS */ case 'arial': case 'sans-serif': - break; + break; /* * .92 modifer for time, serif, brushscriptstd, and californian fb */ @@ -298,13 +316,13 @@ class PMA_EPS case 'brushscriptstd': case 'californian fb': $modifier = .92; - break; + break; /* * 1.23 modifier for broadway */ case 'broadway': $modifier = 1.23; - break; + break; } $textWidth = $count*$fontSize; return ceil($textWidth*$modifier); @@ -324,8 +342,10 @@ class PMA_EPS /** * Output EPS Document for download * - * @param string fileName name of the eps document + * @param string $fileName name of the eps document + * * @return void + * * @access public */ function showOutput($fileName) @@ -368,30 +388,37 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string tableName The table name - * @param string font The font name - * @param integer fontSize The font size - * @param integer same_wide_width The max width among tables - * @param boolean showKeys Whether to display keys or not - * @param boolean showInfo Whether to display table position or not + * @param string $tableName The table name + * @param string $font The font name + * @param integer $fontSize The font size + * @param integer $pageNumber Page number + * @param integer &$same_wide_width The max width among tables + * @param boolean $showKeys Whether to display keys or not + * @param boolean $showInfo Whether to display table position or not + * * @global object The current eps document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) * @global array The relations settings * @global string The current db name + * * @access private * @see PMA_EPS, Table_Stats::Table_Stats_setWidth, - Table_Stats::Table_Stats_setHeight + * Table_Stats::Table_Stats_setHeight */ - function __construct($tableName, $font, $fontSize, $pageNumber, &$same_wide_width, $showKeys = false, $showInfo = false) + function __construct($tableName, $font, $fontSize, $pageNumber, &$same_wide_width, + $showKeys = false, $showInfo = false) { global $eps, $cfgRelation, $db; $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $eps->dieSchema($pageNumber,"EPS",sprintf(__('The %s table doesn\'t exist!'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $eps->dieSchema( + $pageNumber, "EPS", + sprintf(__('The %s table doesn\'t exist!'), $tableName) + ); } /* @@ -402,7 +429,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->_tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -418,21 +448,28 @@ class Table_Stats // setWidth must me after setHeight, because title // can include table height which changes table width - $this->_setWidthTable($font,$fontSize); + $this->_setWidthTable($font, $fontSize); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } // x and y $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' - . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' - . ' AND pdf_page_number = ' . $pageNumber; + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' + . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $eps->dieSchema($pageNumber,"EPS",sprintf(__('Please configure the coordinates for table %s'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $eps->dieSchema( + $pageNumber, "EPS", + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -440,7 +477,10 @@ class Table_Stats // displayfield $this->displayfield = PMA_getDisplayField($db, $tableName); // index - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -459,16 +499,21 @@ class Table_Stats */ private function _getTitle() { - return ($this->_showInfo ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) : '') . ' ' . $this->_tableName; + return ($this->_showInfo + ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) + : '') . ' ' . $this->_tableName; } /** * Sets the width of the table * - * @param string font The font name - * @param integer fontSize The font size + * @param string $font The font name + * @param integer $fontSize The font size + * * @global object The current eps document + * * @return void + * * @access private * @see PMA_EPS */ @@ -477,14 +522,17 @@ class Table_Stats global $eps; foreach ($this->fields as $field) { - $this->width = max($this->width, $eps->getStringWidth($field,$font,$fontSize)); + $this->width = max( + $this->width, + $eps->getStringWidth($field, $font, $fontSize) + ); } - $this->width += $eps->getStringWidth(' ',$font,$fontSize); + $this->width += $eps->getStringWidth(' ', $font, $fontSize); /* * it is unknown what value must be added, because * table title is affected by the tabe width value */ - while ($this->width < $eps->getStringWidth($this->_getTitle(),$font,$fontSize)) { + while ($this->width < $eps->getStringWidth($this->_getTitle(), $font, $fontSize)) { $this->width += 7; } } @@ -492,7 +540,8 @@ class Table_Stats /** * Sets the height of the table * - * @param integer fontSize The font size + * @param integer $fontSize The font size + * * @return void * @access private */ @@ -505,9 +554,12 @@ class Table_Stats /** * Draw the table * - * @param boolean showColor Whether to display color + * @param boolean $showColor Whether to display color + * * @global object The current eps document + * * @return void + * * @access public * @see PMA_EPS,PMA_EPS::line,PMA_EPS::rect */ @@ -515,25 +567,24 @@ class Table_Stats { global $eps; //echo $this->_tableName.'
    '; - $eps->rect($this->x,$this->y + 12, - $this->width,$this->heightCell, - 1 - ); - $eps->showXY($this->_getTitle(),$this->x + 5,$this->y + 14); + $eps->rect($this->x, $this->y + 12, $this->width, $this->heightCell, 1); + $eps->showXY($this->_getTitle(), $this->x + 5, $this->y + 14); foreach ($this->fields as $field) { - $this->currentCell += $this->heightCell; - $showColor = 'none'; - if ($showColor) { - if (in_array($field, $this->primary)) { - $showColor = '#0c0'; - } - if ($field == $this->displayfield) { - $showColor = 'none'; - } + $this->currentCell += $this->heightCell; + $showColor = 'none'; + if ($showColor) { + if (in_array($field, $this->primary)) { + $showColor = '#0c0'; } - $eps->rect($this->x,$this->y + 12 + $this->currentCell, - $this->width, $this->heightCell,1); - $eps->showXY($field, $this->x + 5, $this->y + 14 + $this->currentCell); + if ($field == $this->displayfield) { + $showColor = 'none'; + } + } + $eps->rect( + $this->x, $this->y + 12 + $this->currentCell, + $this->width, $this->heightCell, 1 + ); + $eps->showXY($field, $this->x + 5, $this->y + 14 + $this->currentCell); } } } @@ -563,10 +614,11 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -617,26 +669,36 @@ class Relation_Stats /** * Gets arrows coordinates * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Arrows coordinates + * * @access private */ private function _getXy($table, $column) { $pos = array_search($column, $table->fields); // x_left, x_right, y - return array($table->x, $table->x + $table->width, $table->y + ($pos + 1.5) * $table->heightCell); + return array( + $table->x, + $table->x + $table->width, + $table->y + ($pos + 1.5) * $table->heightCell + ); } /** * draws relation links and arrows * shows foreign key relations * - * @param boolean changeColor Whether to use one color per relation or not - * @global object The current EPS document + * @param boolean $changeColor Whether to use one color per relation or not + * + * @global object The current EPS document + * * @access public * @see PMA_EPS + * + * @return void */ public function relationDraw($changeColor) { @@ -658,40 +720,58 @@ class Relation_Stats $color = 'black'; } // draw a line like -- to foreign field - $eps->line($this->xSrc,$this->ySrc, - $this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, + $eps->line( + $this->xSrc, + $this->ySrc, + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc, 1 - ); + ); // draw a line like -- to master field - $eps->line($this->xDest + $this->destDir * $this->wTick, $this->yDest, - $this->xDest, $this->yDest, + $eps->line( + $this->xDest + $this->destDir * $this->wTick, + $this->yDest, + $this->xDest, + $this->yDest, 1 - ); + ); // draw a line that connects to master field line and foreign field line - $eps->line($this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, - $this->xDest + $this->destDir * $this->wTick, $this->yDest, + $eps->line( + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc, + $this->xDest + $this->destDir * $this->wTick, + $this->yDest, 1 - ); + ); $root2 = 2 * sqrt(2); - $eps->line($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc + $this->wTick / $root2 , + $eps->line( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc + $this->wTick / $root2, 1 - ); - $eps->line($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc - $this->wTick / $root2 , + ); + $eps->line( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc - $this->wTick / $root2, 1 - ); - $eps->line($this->xDest + $this->destDir * $this->wTick / 2 , $this->yDest , + ); + $eps->line( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, - $this->yDest + $this->wTick / $root2 , - 1); - $eps->line($this->xDest + $this->destDir * $this->wTick / 2 , - $this->yDest , $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick , - $this->yDest - $this->wTick / $root2 , + $this->yDest + $this->wTick / $root2, 1 - ); + ); + $eps->line( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest - $this->wTick / $root2, + 1 + ); } } /* @@ -738,19 +818,26 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); $eps = new PMA_EPS(); - $eps->setTitle(sprintf(__('Schema of the %s database - Page %s'), $db, $this->pageNumber)); + $eps->setTitle( + sprintf( + __('Schema of the %s database - Page %s'), + $db, + $this->pageNumber + ) + ); $eps->setAuthor('phpMyAdmin ' . PMA_VERSION); $eps->setDate(date("j F Y, g:i a")); $eps->setOrientation($this->orientation); - $eps->setFont('Verdana','10'); + $eps->setFont('Verdana', '10'); - - - $alltables = $this->getAllTables($db,$this->pageNumber); + $alltables = $this->getAllTables($db, $this->pageNumber); foreach ($alltables AS $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); + $this->tables[$table] = new Table_Stats( + $table, $eps->getFont(), $eps->getFontSize(), $this->pageNumber, + $this->_tablewidth, $this->showKeys, $this->tableDimension + ); } if ($this->sameWide) { @@ -770,7 +857,11 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table,$eps->getFont(),$eps->getFontSize(), $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); + $this->_addRelation( + $one_table, $eps->getFont(), $eps->getFontSize(), + $master_field, $rel['foreign_table'], + $rel['foreign_field'], $this->tableDimension + ); } } } @@ -788,33 +879,48 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines relation objects * - * @param string masterTable The master table name - * @param string masterField The relation field in the master table - * @param string foreignTable The foreign table name - * @param string foreignField The relation field in the foreign table - * @param boolean showInfo Whether to display table position or not + * @param string $masterTable The master table name + * @param string $font The font + * @param int $fontSize The font size + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param boolean $showInfo Whether to display table position or not + * * @return void + * * @access private * @see _setMinMax,Table_Stats::__construct(),Relation_Stats::__construct() */ - private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) + private function _addRelation($masterTable, $font, $fontSize, $masterField, + $foreignTable, $foreignField, $showInfo) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); } - $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->_relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** - * Draws relation arrows and lines - * connects master table's master field to + * Draws relation arrows and lines connects master table's master field to * foreign table's forein field * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * * @return void + * * @access private * @see Relation_Stats::relationDraw() */ @@ -828,8 +934,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws tables * - * @param boolean changeColor Whether to show color for primary fields or not + * @param boolean $changeColor Whether to show color for primary fields or not + * * @return void + * * @access private * @see Table_Stats::Table_Stats_tableDraw() */ From 2992cb9904a0373df1fcfe4fe19c50a6779aea8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:39:03 +0200 Subject: [PATCH 536/971] 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 6bc927ea29..ed0476832c 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:45+0200\n" +"PO-Revision-Date: 2011-08-20 06:39+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12782,10 +12782,9 @@ msgid "Rate of open files" msgstr "Tasa de apertura de archivos" #: po/advisory_rules.php:186 -#, fuzzy #| msgid "The number of pending log file fsyncs." msgid "The rate of opening files is high." -msgstr "El número de fsyncs pendientes al archivo de registro." +msgstr "La tasa de apertura de archivos es alta." #: po/advisory_rules.php:188 #, php-format From 8122f4fb734e54c91954ce0750c7e1c6476e9bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:39:21 +0200 Subject: [PATCH 537/971] 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 ed0476832c..799b52ffcc 100644 --- a/po/es.po +++ b/po/es.po @@ -12790,6 +12790,7 @@ msgstr "La tasa de apertura de archivos es alta." #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr "" +"Tasa de apertura de archivos: %s, este valor debería ser menor a 5 por hora" #: po/advisory_rules.php:190 #, fuzzy, php-format From 51e8daceb1ffdb27610a88b2e8d44d6cfd349289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:40:47 +0200 Subject: [PATCH 538/971] 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 799b52ffcc..568c3e3c8d 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-20 06:39+0200\n" +"PO-Revision-Date: 2011-08-20 06:40+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12793,10 +12793,10 @@ msgstr "" "Tasa de apertura de archivos: %s, este valor debería ser menor a 5 por hora" #: po/advisory_rules.php:190 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Immediate table locks %%" -msgstr "Crear nueva tabla en la base de datos %s" +msgstr "Porcentaje de bloqueos de tabla inmediatos" #: po/advisory_rules.php:191 po/advisory_rules.php:196 #, fuzzy From 2e88766f42ff14ab13420c9cfe76ba57e52e3e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:46:02 +0200 Subject: [PATCH 539/971] 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 568c3e3c8d..3f0bef5787 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-20 06:40+0200\n" +"PO-Revision-Date: 2011-08-20 06:46+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12799,10 +12799,9 @@ msgid "Immediate table locks %%" msgstr "Porcentaje de bloqueos de tabla inmediatos" #: po/advisory_rules.php:191 po/advisory_rules.php:196 -#, fuzzy #| msgid "The number of times that a table lock was acquired immediately." msgid "Too many table locks were not granted immediately." -msgstr "El número de veces que un table lock fue adquirido inmediatamente." +msgstr "Demasiados bloqueos de tablas no fueron provistos inmediatamente." #: po/advisory_rules.php:192 po/advisory_rules.php:197 msgid "Optimize queries and/or use InnoDB to reduce lock wait." From 5f17e1bb784243e4791400ec36be8ce648dc28c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:46:25 +0200 Subject: [PATCH 540/971] 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 3f0bef5787..3f5b576148 100644 --- a/po/es.po +++ b/po/es.po @@ -12806,6 +12806,8 @@ msgstr "Demasiados bloqueos de tablas no fueron provistos inmediatamente." #: po/advisory_rules.php:192 po/advisory_rules.php:197 msgid "Optimize queries and/or use InnoDB to reduce lock wait." msgstr "" +"Optimice las consultas y/o utilice InnoDB para reducir el tiempo de espera " +"para bloqueos." #: po/advisory_rules.php:193 #, php-format From 0a14137114fd0a8eb78f476cc2d557e2fdf5876f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:49:50 +0200 Subject: [PATCH 541/971] 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 3f5b576148..91734dea0a 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-20 06:46+0200\n" +"PO-Revision-Date: 2011-08-20 06:49+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12812,7 +12812,7 @@ msgstr "" #: po/advisory_rules.php:193 #, php-format msgid "Immediate table locks: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Bloqueos de tabla inmediatos: %s%%, este valor debería ser mayor a 95%%" #: po/advisory_rules.php:195 msgid "Table lock wait rate" From 56f7b489fc86ac1a75b1447534200b3282f04022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:50:03 +0200 Subject: [PATCH 542/971] 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 91734dea0a..974a4dd412 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-20 06:49+0200\n" +"PO-Revision-Date: 2011-08-20 06:50+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12816,7 +12816,7 @@ msgstr "Bloqueos de tabla inmediatos: %s%%, este valor debería ser mayor a 95%% #: po/advisory_rules.php:195 msgid "Table lock wait rate" -msgstr "" +msgstr "Tasa de espera para bloqueos de tablas" #: po/advisory_rules.php:198 #, php-format From 791f2b0c2b9a786716bf2a2f5dbfc05c188a74f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:50:40 +0200 Subject: [PATCH 543/971] 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 974a4dd412..dec35cab88 100644 --- a/po/es.po +++ b/po/es.po @@ -12822,6 +12822,8 @@ msgstr "Tasa de espera para bloqueos de tablas" #, php-format msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" +"Tasa de espera para bloqueos de tablas: %s, este valor debería ser menor a 1 " +"por hora" #: po/advisory_rules.php:200 #, fuzzy From 718bd0c15ca18a67b029d962ac3b896e4a895d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:50:47 +0200 Subject: [PATCH 544/971] 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 dec35cab88..c937c5706e 100644 --- a/po/es.po +++ b/po/es.po @@ -12826,10 +12826,9 @@ msgstr "" "por hora" #: po/advisory_rules.php:200 -#, fuzzy #| msgid "Key cache" msgid "Thread cache" -msgstr "Caché de claves" +msgstr "Caché de hilos" #: po/advisory_rules.php:201 msgid "" From fd5be1ef257831fa04a66f308c7e96ae559ea71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:51:16 +0200 Subject: [PATCH 545/971] 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 c937c5706e..b933d4cad5 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-20 06:50+0200\n" +"PO-Revision-Date: 2011-08-20 06:51+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12835,6 +12835,8 @@ msgid "" "Thread cache is disabled, resulting in more overhead from new connections to " "MySQL." msgstr "" +"El caché de hilos está desactivado, esto resulta en mayor sobrecarga en las " +"nuevas conexiones a MySQL." #: po/advisory_rules.php:202 msgid "Enable the thread cache by setting {thread_cache_size} > 0." From fbcdafb1178385de43d06cce0760c570fce309a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:51:57 +0200 Subject: [PATCH 546/971] 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 b933d4cad5..5a42801d18 100644 --- a/po/es.po +++ b/po/es.po @@ -12841,6 +12841,8 @@ msgstr "" #: po/advisory_rules.php:202 msgid "Enable the thread cache by setting {thread_cache_size} > 0." msgstr "" +"Active el caché de hilos configurado «thread_cache_size» a un valor mayor a " +"0." #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" From e6781ab98cf67e0fddf74ddf2de4a3c82f3bc808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:52:14 +0200 Subject: [PATCH 547/971] 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 5a42801d18..20941b0edc 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-20 06:51+0200\n" +"PO-Revision-Date: 2011-08-20 06:52+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12846,7 +12846,7 @@ msgstr "" #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" -msgstr "" +msgstr "El caché de hilos está configurado a 0" #: po/advisory_rules.php:205 #, fuzzy, php-format From 46bed0eac09a42dea986b05ba8c59a758ef329f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:52:37 +0200 Subject: [PATCH 548/971] 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 20941b0edc..51220b6ee7 100644 --- a/po/es.po +++ b/po/es.po @@ -12849,10 +12849,10 @@ msgid "The thread cache is set to 0" msgstr "El caché de hilos está configurado a 0" #: po/advisory_rules.php:205 -#, fuzzy, php-format +#, php-format #| msgid "Tracking is not active." msgid "Thread cache hit rate %%" -msgstr "El seguimiento no está activo." +msgstr "Porcentaje de efectividad del caché de hilos" #: po/advisory_rules.php:206 #, fuzzy From 197225512a2c4f84f19fd5361fa787c75df40e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:52:47 +0200 Subject: [PATCH 549/971] 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 51220b6ee7..803ce201de 100644 --- a/po/es.po +++ b/po/es.po @@ -12855,10 +12855,9 @@ msgid "Thread cache hit rate %%" msgstr "Porcentaje de efectividad del caché de hilos" #: po/advisory_rules.php:206 -#, fuzzy #| msgid "Tracking is not active." msgid "Thread cache is not efficient." -msgstr "El seguimiento no está activo." +msgstr "El caché de hilos no es eficiente." #: po/advisory_rules.php:207 msgid "Increase {thread_cache_size}." From 05fa9bff24b71d77709899630be5bd39f0d44b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:53:18 +0200 Subject: [PATCH 550/971] 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 803ce201de..06efe1057f 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-20 06:52+0200\n" +"PO-Revision-Date: 2011-08-20 06:53+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12861,7 +12861,7 @@ msgstr "El caché de hilos no es eficiente." #: po/advisory_rules.php:207 msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "Aumente «thread_cache_size»." #: po/advisory_rules.php:208 #, php-format From 3aec38be992aa0208114021cf235ce07c7d81466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:53:37 +0200 Subject: [PATCH 551/971] 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 06efe1057f..5008433265 100644 --- a/po/es.po +++ b/po/es.po @@ -12867,6 +12867,8 @@ msgstr "Aumente «thread_cache_size»." #, php-format msgid "Thread cache hitrate: %s%%, this value should be above 80%%" msgstr "" +"Tasa de efectividad del caché de hilos: %s%%, este valor debería ser mayor a " +"80%%" #: po/advisory_rules.php:210 msgid "Threads that are slow to launch" From f546524ab4bbe1b19cbf40497853753cb5bcc823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:53:55 +0200 Subject: [PATCH 552/971] 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 5008433265..3cf566665b 100644 --- a/po/es.po +++ b/po/es.po @@ -12872,7 +12872,7 @@ msgstr "" #: po/advisory_rules.php:210 msgid "Threads that are slow to launch" -msgstr "" +msgstr "Hilos que inician ejecución lentamente" #: po/advisory_rules.php:211 #, fuzzy From 3789b2d103c79522eb576ed6e1b0b9766365179b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:54:15 +0200 Subject: [PATCH 553/971] 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 3cf566665b..d9bf32a193 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-20 06:53+0200\n" +"PO-Revision-Date: 2011-08-20 06:54+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12875,10 +12875,9 @@ msgid "Threads that are slow to launch" msgstr "Hilos que inician ejecución lentamente" #: po/advisory_rules.php:211 -#, fuzzy #| msgid "The number of threads that are not sleeping." msgid "There are too many threads that are slow to launch." -msgstr "El número de procesos que no están en reposo." +msgstr "Hay demasiados hilos que inician ejecución lentamente." #: po/advisory_rules.php:212 msgid "" From 2ec01e96391fac2e0ee829d32d84d52cc7ff0adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:55:09 +0200 Subject: [PATCH 554/971] 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 d9bf32a193..1f3ff95299 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-20 06:54+0200\n" +"PO-Revision-Date: 2011-08-20 06:55+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12884,6 +12884,9 @@ msgid "" "This generally happens in case of general system overload as it is pretty " "simple operations. You might want to monitor your system load carefully." msgstr "" +"Esto generalmente ocurre cuando el sistema en sí está sobrecargado ya que es " +"una operación relativamente sencilla. Debería de monitorizar la carga sobre " +"el sistema cuidadosamente." #: po/advisory_rules.php:213 #, php-format From 79db7ade5168062033b64b81ab0ef4177e9fe90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:55:56 +0200 Subject: [PATCH 555/971] 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 1f3ff95299..3865c5618a 100644 --- a/po/es.po +++ b/po/es.po @@ -12891,7 +12891,7 @@ msgstr "" #: po/advisory_rules.php:213 #, php-format msgid "%s thread(s) took longer than %s seconds to start, it should be 0" -msgstr "" +msgstr "%s hilo(s) tardaron más de %s segundos en iniciar, debería de ser 0" #: po/advisory_rules.php:215 msgid "Slow launch time" From 492d7173c09f81aece61e707abbb89a35ac2cae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:56:07 +0200 Subject: [PATCH 556/971] 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 3865c5618a..9478bbef50 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-20 06:55+0200\n" +"PO-Revision-Date: 2011-08-20 06:56+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12895,7 +12895,7 @@ msgstr "%s hilo(s) tardaron más de %s segundos en iniciar, debería de ser 0" #: po/advisory_rules.php:215 msgid "Slow launch time" -msgstr "" +msgstr "Tiempo de inicio lento" #: po/advisory_rules.php:216 msgid "Slow_launch_threads is above 2s" From 12190ab6c6d198c5d531c55f2c9c25845eb21cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:56:28 +0200 Subject: [PATCH 557/971] 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 9478bbef50..b0d104451c 100644 --- a/po/es.po +++ b/po/es.po @@ -12899,7 +12899,7 @@ msgstr "Tiempo de inicio lento" #: po/advisory_rules.php:216 msgid "Slow_launch_threads is above 2s" -msgstr "" +msgstr "«slow_launch_threads» es mayor a 2s" #: po/advisory_rules.php:217 msgid "" From d90f4daeb81c0be0c71694f3afa8b2314ba2bf61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:57:07 +0200 Subject: [PATCH 558/971] 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 b0d104451c..76f9236ae0 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-20 06:56+0200\n" +"PO-Revision-Date: 2011-08-20 06:57+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12906,6 +12906,8 @@ msgid "" "Set slow_launch_time to 1s or 2s to correctly count threads that are slow to " "launch" msgstr "" +"Configure «slow_launch_time» a 1 ó 2 segundos para contar correctamente los " +"hilos que inician ejecución lentamente" #: po/advisory_rules.php:218 #, fuzzy, php-format From bbe65821045344f268d1fd66eb7881ebe56a4696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:57:38 +0200 Subject: [PATCH 559/971] 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 76f9236ae0..b06f44540f 100644 --- a/po/es.po +++ b/po/es.po @@ -12910,10 +12910,10 @@ msgstr "" "hilos que inician ejecución lentamente" #: po/advisory_rules.php:218 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "slow_launch_time is set to %s" -msgstr "«long_query_time» está configurado a %d segundo(s)." +msgstr "«slow_launch_time» está configurado a %s" #: po/advisory_rules.php:220 #, fuzzy From 7abb595bc1b555023345784e0359fdd5371e0717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:57:47 +0200 Subject: [PATCH 560/971] 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 b06f44540f..c311221bee 100644 --- a/po/es.po +++ b/po/es.po @@ -12916,10 +12916,9 @@ msgid "slow_launch_time is set to %s" msgstr "«slow_launch_time» está configurado a %s" #: po/advisory_rules.php:220 -#, fuzzy #| msgid "Persistent connections" msgid "Percentage of used connections" -msgstr "Conexiones persistentes" +msgstr "Porcentaje de conexiones utilizadas" #: po/advisory_rules.php:221 msgid "" From 0076bfc6f97268d42a954a7b1aaf8b9d8cac6d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:58:21 +0200 Subject: [PATCH 561/971] 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 c311221bee..132bd48cf9 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-20 06:57+0200\n" +"PO-Revision-Date: 2011-08-20 06:58+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12925,6 +12925,8 @@ msgid "" "The maximum amount of used connections is getting close to the value of " "max_connections." msgstr "" +"El máximo de conexiones utilizadas simultáneamente está cercano al valor de " +"«max_connections»." #: po/advisory_rules.php:222 msgid "" From ac07d4f4480d40f82ef98efccc900edfdd31b216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 06:59:51 +0200 Subject: [PATCH 562/971] 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 132bd48cf9..9db7e200f2 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-20 06:58+0200\n" +"PO-Revision-Date: 2011-08-20 06:59+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12934,6 +12934,10 @@ msgid "" "do not close database handlers properly get killed sooner. Make sure the " "code closes database handlers properly." msgstr "" +"Aumente «max_connections» o reduzca «wait_timeout» para que las conexiones " +"que no liberan los manejadores de base de datos apropiadamente sean " +"eliminadas más rápido. Asegúrese que su código cierre los manejadores de " +"base de datos apropiadamente." #: po/advisory_rules.php:223 #, php-format From 50b469359a2d61bb44093831d50fcd252b38bf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:00:33 +0200 Subject: [PATCH 563/971] 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 9db7e200f2..a95c99694e 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-20 06:59+0200\n" +"PO-Revision-Date: 2011-08-20 07:00+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12944,6 +12944,8 @@ msgstr "" msgid "" "Max_used_connections is at %s%% of max_connections, it should be below 80%%" msgstr "" +"«max_used_connections» es %s%% de «max_connections», debería ser menor a 80%" +"%" #: po/advisory_rules.php:225 #, fuzzy From b2165e191fbfe002f85ab5d2cda096c9f677885c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:00:46 +0200 Subject: [PATCH 564/971] 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 a95c99694e..d2af184535 100644 --- a/po/es.po +++ b/po/es.po @@ -12948,10 +12948,9 @@ msgstr "" "%" #: po/advisory_rules.php:225 -#, fuzzy #| msgid "Persistent connections" msgid "Percentage of aborted connections" -msgstr "Conexiones persistentes" +msgstr "Porcentaje de conexiones abandonadas" #: po/advisory_rules.php:226 msgid "Too many connections are aborted." From 208b41f70c4784a37af184c99f51507b6a858c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:00:56 +0200 Subject: [PATCH 565/971] 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 d2af184535..3e849c0cbc 100644 --- a/po/es.po +++ b/po/es.po @@ -12954,7 +12954,7 @@ msgstr "Porcentaje de conexiones abandonadas" #: po/advisory_rules.php:226 msgid "Too many connections are aborted." -msgstr "" +msgstr "Demasiadas conexiones son abandonadas." #: po/advisory_rules.php:227 po/advisory_rules.php:232 msgid "" From 5894ec2b1987a23214bfdaf02d13ac84274f124c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:01:36 +0200 Subject: [PATCH 566/971] 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 3e849c0cbc..a8dc1b8186 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-20 07:00+0200\n" +"PO-Revision-Date: 2011-08-20 07:01+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12963,6 +12963,10 @@ msgid "" "source-of-aborted_connects/\\\">This article might help you track down " "the source." msgstr "" +"Las conexiones son abandonadas generalmente cuando no pueden ser " +"autorizadas. Este artículo podría ser " +"de ayuda para rastrear el motivo de las mismas." #: po/advisory_rules.php:228 #, php-format From 030ae59f29707ec955b90f495aa940653e30a4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:01:52 +0200 Subject: [PATCH 567/971] 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 a8dc1b8186..732e1b5552 100644 --- a/po/es.po +++ b/po/es.po @@ -12972,6 +12972,8 @@ msgstr "" #, php-format msgid "%s%% of all connections are aborted. This value should be below 1%%" msgstr "" +"%s%% de todas las conexiones son abandonadas. Este valor debería ser menor a " +"1%%" #: po/advisory_rules.php:230 #, fuzzy From bb155808ba221032cf61d0eed1adfa16aab9f2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:02:07 +0200 Subject: [PATCH 568/971] 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 732e1b5552..8dfa40c223 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-20 07:01+0200\n" +"PO-Revision-Date: 2011-08-20 07:02+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12976,10 +12976,9 @@ msgstr "" "1%%" #: po/advisory_rules.php:230 -#, fuzzy #| msgid "Persistent connections" msgid "Rate of aborted connections" -msgstr "Conexiones persistentes" +msgstr "Tasa de conexiones abandonadas" #: po/advisory_rules.php:231 msgid "Too many connections are aborted" From 59a8617d03b5826f0006e0006b541ab125362ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:02:20 +0200 Subject: [PATCH 569/971] 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 8dfa40c223..309cacd5ae 100644 --- a/po/es.po +++ b/po/es.po @@ -12982,7 +12982,7 @@ msgstr "Tasa de conexiones abandonadas" #: po/advisory_rules.php:231 msgid "Too many connections are aborted" -msgstr "" +msgstr "Demasiadas conexiones son abandonadas" #: po/advisory_rules.php:233 #, php-format From 452cbb4c049efb15dda4993e978f768e0a1738db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:02:36 +0200 Subject: [PATCH 570/971] 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 309cacd5ae..dd47938e48 100644 --- a/po/es.po +++ b/po/es.po @@ -12989,6 +12989,8 @@ msgstr "Demasiadas conexiones son abandonadas" msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"La tasa de conexiones abandonadas es %s, este valor debería ser menor a 1 " +"por hora" #: po/advisory_rules.php:235 #, fuzzy From d7c6f3a86d2ecb9ed81ab183049b8d4ba3a3cc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:03:37 +0200 Subject: [PATCH 571/971] 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 dd47938e48..c836ebf23f 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-20 07:02+0200\n" +"PO-Revision-Date: 2011-08-20 07:03+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -12993,10 +12993,9 @@ msgstr "" "por hora" #: po/advisory_rules.php:235 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of aborted clients" -msgstr "Formato del archivo importado" +msgstr "Porcentaje de clientes abandonados" #: po/advisory_rules.php:236 po/advisory_rules.php:241 msgid "Too many clients are aborted." From 2eebe896bf9532851eee6209a9956b954feb7d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:03:45 +0200 Subject: [PATCH 572/971] 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 c836ebf23f..7da3da3f9e 100644 --- a/po/es.po +++ b/po/es.po @@ -12999,7 +12999,7 @@ msgstr "Porcentaje de clientes abandonados" #: po/advisory_rules.php:236 po/advisory_rules.php:241 msgid "Too many clients are aborted." -msgstr "" +msgstr "Demasiados clientes son abandonados." #: po/advisory_rules.php:237 po/advisory_rules.php:242 msgid "" From e6760f5bccb90be236764a5be5a1025f2717bce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:04:34 +0200 Subject: [PATCH 573/971] 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 7da3da3f9e..5341d4344f 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-20 07:03+0200\n" +"PO-Revision-Date: 2011-08-20 07:04+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13007,6 +13007,10 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"Los clientes son abandonados generalmente cuando no cierran sus conexiones " +"MySQL apropiadamente. Esto puede ser debido a problemas de red o cuando el " +"código no libera el manejador de la base de datos correctamente. Revise su " +"conexión de red y código." #: po/advisory_rules.php:238 #, php-format From 2299f074e07fd5b4a1c0de94254682eee58a7839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:04:49 +0200 Subject: [PATCH 574/971] 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 5341d4344f..673947c7df 100644 --- a/po/es.po +++ b/po/es.po @@ -13016,6 +13016,8 @@ msgstr "" #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" msgstr "" +"%s%% de todos los clientes son abandonados. Este valor debería ser menor a 2" +"%%" #: po/advisory_rules.php:240 #, fuzzy From 1902413a5d8e7b95cd57fd1a5e1bbc525b422cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:04:59 +0200 Subject: [PATCH 575/971] 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 673947c7df..8a19076094 100644 --- a/po/es.po +++ b/po/es.po @@ -13020,10 +13020,9 @@ msgstr "" "%%" #: po/advisory_rules.php:240 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of aborted clients" -msgstr "Formato del archivo importado" +msgstr "Tasa de clientes abandonados" #: po/advisory_rules.php:243 #, php-format From 6fbd4d1274b157e187959911748dc64f5d7f709c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:05:16 +0200 Subject: [PATCH 576/971] 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 8a19076094..f8fe30d8ac 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-20 07:04+0200\n" +"PO-Revision-Date: 2011-08-20 07:05+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13028,6 +13028,8 @@ msgstr "Tasa de clientes abandonados" #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" msgstr "" +"La tasa de clientes abandonados es %s, este valor debería ser menor a 1 por " +"hora" #: po/advisory_rules.php:245 msgid "Is InnoDB disabled?" From 0be7c02bdbf7ed9076fcb262c5d03b272e64d338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:05:38 +0200 Subject: [PATCH 577/971] 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 f8fe30d8ac..61565ce12f 100644 --- a/po/es.po +++ b/po/es.po @@ -13033,7 +13033,7 @@ msgstr "" #: po/advisory_rules.php:245 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "¿InnoDB está desactivado?" #: po/advisory_rules.php:246 #, fuzzy From a6cd4aefd3571ec7e2e381b641b92f74a093ce59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:09:48 +0200 Subject: [PATCH 578/971] 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 61565ce12f..e2af687166 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-20 07:05+0200\n" +"PO-Revision-Date: 2011-08-20 07:09+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13036,10 +13036,9 @@ msgid "Is InnoDB disabled?" msgstr "¿InnoDB está desactivado?" #: po/advisory_rules.php:246 -#, fuzzy #| msgid "Could not save recent table" msgid "You do not have InnoDB enabled." -msgstr "No se pudo guardar la tabla reciente" +msgstr "No posee InnoDB activado." #: po/advisory_rules.php:247 msgid "InnoDB is usually the better choice for table engines." From 439033a3db7b80e2aa3fa46b7c1432770144cba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:10:19 +0200 Subject: [PATCH 579/971] 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 e2af687166..200e1028a2 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-20 07:09+0200\n" +"PO-Revision-Date: 2011-08-20 07:10+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13042,7 +13042,7 @@ msgstr "No posee InnoDB activado." #: po/advisory_rules.php:247 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "InnoDB es, usualmente, la mejor opción como motor para tablas." #: po/advisory_rules.php:248 msgid "have_innodb is set to 'value'" From d8e2f01aafb5f36d5e05839f9e9a9a8507fd2179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:10:43 +0200 Subject: [PATCH 580/971] 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 200e1028a2..397bdceb59 100644 --- a/po/es.po +++ b/po/es.po @@ -13045,8 +13045,9 @@ msgid "InnoDB is usually the better choice for table engines." msgstr "InnoDB es, usualmente, la mejor opción como motor para tablas." #: po/advisory_rules.php:248 +#, fuzzy msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "«have_innodb» está configurado como 'value'" #: po/advisory_rules.php:250 #, fuzzy From 4f5b48d974656b4a67a108d2cbeef206f7d3e6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:10:53 +0200 Subject: [PATCH 581/971] 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 397bdceb59..4dfb823b76 100644 --- a/po/es.po +++ b/po/es.po @@ -13050,10 +13050,9 @@ msgid "have_innodb is set to 'value'" msgstr "«have_innodb» está configurado como 'value'" #: po/advisory_rules.php:250 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB log size" -msgstr "Tamaño de la reserva de búfers" +msgstr "Tamaño de registro InnoDB" #: po/advisory_rules.php:251 #, fuzzy From 645dbd83bddb7175e29b4e0e641ef5cb1f351901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:11:54 +0200 Subject: [PATCH 582/971] Translation update done using Pootle. --- po/es.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 4dfb823b76..c8206f4559 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-20 07:10+0200\n" +"PO-Revision-Date: 2011-08-20 07:11+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13055,12 +13055,13 @@ msgid "InnoDB log size" msgstr "Tamaño de registro InnoDB" #: po/advisory_rules.php:251 -#, fuzzy #| msgid "The number writes done to the InnoDB buffer pool." msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." -msgstr "El número de escrituras hechas a la reserva de búfers InnoDB." +msgstr "" +"El tamaño del archivo de registro InnoDB no parece ser apropiado en relación " +"al conjunto de búfers InnoDB." #: po/advisory_rules.php:252 #, php-format From a94718c800e73c8184cefbef503882c85780a4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 07:15:19 +0200 Subject: [PATCH 583/971] Translation update done using Pootle. --- po/es.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index c8206f4559..5e82a937de 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-20 07:11+0200\n" +"PO-Revision-Date: 2011-08-20 07:15+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13077,6 +13077,17 @@ msgid "" "com/2007/01/increase-innodblogfilesize-proper-way.html\\\">this blog entry" msgstr "" +"Especialmente en un sistema con gran cantidad de escrituras a talbas InnoDB, " +"debería de configurar «innodb_log_file_size» a aproximadamente 25%% de " +"«innodb_buffer_pool_size». Sin embargo, mientras mayor sea este valor, mayor " +"será el tiempo de recuperación luego de una caída de la base de datos, por " +"lo que este valor no debería ser mayor a 256 MiB. Note, sin embargo, que no " +"puede simplemente cambiar el valor de esta variable. Necesitará cerrar el " +"servidor, eliminar los archivos de registro InnoDB, definir el nuevo valor " +"en el archivo 'my.cnf' y luego revisar los mensajes de error para asegurarse " +"que no hubo inconvenientens. Revise también este artículo." #: po/advisory_rules.php:253 #, php-format From b441555d688ce1d01b71a0f241b29257d4765298 Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Sat, 20 Aug 2011 10:58:33 +0530 Subject: [PATCH 584/971] Added FAQ in Documentation.html about 'How to use Zoom search feature?' (FAQ 6.32) --- Documentation.html | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/Documentation.html b/Documentation.html index d7c76e16a4..8872e5e9a2 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4410,13 +4410,43 @@ chmod o+rwx tmp

- 6.30 How do I create a relation in designer?

+ 6.31 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.

+

+ 6.32 How can I use the zoom search feature?

+ +

Zoom search feature is an alternative to table search feature. It allows you to explore + a table by representing its data in a scatter plot. You can locate this feature by selecting + a table and clicking the 'Search' tab. One of the sub-tab in the 'Table Search' page is + 'Zoom Search'.

+ + Consider the table REL_persons in + FAQ 6.6 for an example. To use zoom search, two columns need to be selected, + for example, id and town_code. The id values will be represented on one axis and town_code + values on the other axis. Each row will be represented as a point in a scatter plot based + on its id and town_code. You can include two additional search criteria apart from the two + fields to display.

+ + You can choose which field should be displayed as label for each point. If a display + column has been set for the table (see FAQ 6.7), it is taken as the label unless you specify otherwise. + You can also select the maximum number of rows you want to be displayed in the plot by + specifing it in the 'Max rows to plot' field. Once you have decided over your criteria, + click 'Go' to display the plot.

+ + After the plot is generated, you can use the mousewheel to zoom in and out of the plot. + In addition, panning feature is enabled to navigate through the plot. You can zoom-in to + a certail level of detail and use panning to locate your area of interest. Clicking on a + point opens a dialogue box, displaying field values of the data row represented by the point. + You can edit the values if required and and click on submit to issue an update query. Basic + instructions on how to use can be viewed by clicking the 'How to use?' link located just above + the plot.

+

phpMyAdmin project

From cae2c2a52b54c0dbdf952283cfd29baf2d9d03cf Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Sat, 20 Aug 2011 11:02:47 +0530 Subject: [PATCH 585/971] Modified the 'How to use?' message for info about mousewheel zoom and panning feature --- js/messages.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/messages.php b/js/messages.php index 7bb7bd3fa1..8a606dc6eb 100644 --- a/js/messages.php +++ b/js/messages.php @@ -265,7 +265,9 @@ $js_messages['strDisplayHelp'] = '
  • ' . '
  • ' . __('Hovering over a point will show its label.') . '
  • ' - . __('Drag and select an area in the plot to zoom into it.') + . __('Use mousewheel to zoom in or out of the plot.') + . '
  • ' + . __('Click and drag the mouse to navigate the plot.') . '
  • ' . __('Click reset zoom link to come back to original state.') . '
  • ' From 95b8e49d0eeb36edf19a13a419ea8a8561a26a4c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:02:25 +0200 Subject: [PATCH 586/971] 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 0f84323b53..77201e2006 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:21+0200\n" +"PO-Revision-Date: 2011-08-20 08:02+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10608,7 +10608,7 @@ msgstr "" #: tbl_operations.php:749 msgid "Check" -msgstr "" +msgstr "சரிபார்" #: tbl_operations.php:750 msgid "Optimize" From de8babb93315e6f16090fd4719fc0cd1aad3940b Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:02:59 +0200 Subject: [PATCH 587/971] 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 77201e2006..776f09bf87 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10612,7 +10612,7 @@ msgstr "சரிபார்" #: tbl_operations.php:750 msgid "Optimize" -msgstr "" +msgstr "உகப்பாக்கு" #: tbl_operations.php:751 msgid "Rebuild" From 0092410ba03c108b6d7d39119654800ed42287d1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:03:55 +0200 Subject: [PATCH 588/971] 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 776f09bf87..dfecf89f42 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-20 08:02+0200\n" +"PO-Revision-Date: 2011-08-20 08:03+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10616,7 +10616,7 @@ msgstr "உகப்பாக்கு" #: tbl_operations.php:751 msgid "Rebuild" -msgstr "" +msgstr "மீள்வாகு" #: tbl_operations.php:752 msgid "Repair" From daaf1c6cd1f85e6c742061b09cfb1e73ff9908f9 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:04:05 +0200 Subject: [PATCH 589/971] 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 dfecf89f42..3870cf3f1e 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-20 08:03+0200\n" +"PO-Revision-Date: 2011-08-20 08:04+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10620,7 +10620,7 @@ msgstr "மீள்வாகு" #: tbl_operations.php:752 msgid "Repair" -msgstr "" +msgstr "திருத்து" #: tbl_operations.php:764 msgid "Remove partitioning" From 7cb6a3e019c339ffd6f017beabed5b872a8063d5 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:04:42 +0200 Subject: [PATCH 590/971] 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 3870cf3f1e..002e3e1358 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10644,7 +10644,7 @@ msgstr "பாவனையளவு" #: tbl_printview.php:305 tbl_structure.php:789 msgid "Effective" -msgstr "" +msgstr "பயனுடைய" #: tbl_printview.php:330 tbl_structure.php:824 msgid "Row Statistics" From 3b460ee5643abbf85d5ea9f01d19bdd402f43812 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:05:43 +0200 Subject: [PATCH 591/971] 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 002e3e1358..41e66af1db 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-20 08:04+0200\n" +"PO-Revision-Date: 2011-08-20 08:05+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10600,7 +10600,7 @@ msgstr "" #: tbl_operations.php:745 #, php-format msgid "Partition %s" -msgstr "" +msgstr "பிரிவினை %s" #: tbl_operations.php:748 msgid "Analyze" From fc85bcf567b2a9e3d6bcea9442b5a0719c332725 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:06:05 +0200 Subject: [PATCH 592/971] 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 41e66af1db..c2f831b117 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-20 08:05+0200\n" +"PO-Revision-Date: 2011-08-20 08:06+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10595,7 +10595,7 @@ msgstr "" #: tbl_operations.php:737 msgid "Partition maintenance" -msgstr "" +msgstr "பிரிவினை பராமரிப்பு" #: tbl_operations.php:745 #, php-format From ecf8805f66439ee7d07a96c0243802e01f357f55 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:06:41 +0200 Subject: [PATCH 593/971] 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 c2f831b117..c00a6b9f93 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10591,7 +10591,7 @@ msgstr "" #: tbl_operations.php:716 msgid "Delete the table (DROP)" -msgstr "" +msgstr "அட்டவணையை அழி (அழி)" #: tbl_operations.php:737 msgid "Partition maintenance" From f3116da4357568591bb6a93b8d07b03324d8e917 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:07:19 +0200 Subject: [PATCH 594/971] 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 c00a6b9f93..72fe71c555 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-20 08:06+0200\n" +"PO-Revision-Date: 2011-08-20 08:07+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10583,7 +10583,7 @@ msgstr "" #: tbl_operations.php:681 msgid "Delete data or table" -msgstr "" +msgstr "தரவை அல்லது அட்டவணையை அழி" #: tbl_operations.php:696 msgid "Empty the table (TRUNCATE)" From 355d7416092e3c3e5bcd6dcb149d628923188231 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:07:57 +0200 Subject: [PATCH 595/971] 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 72fe71c555..34a5f00c39 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10587,7 +10587,7 @@ msgstr "தரவை அல்லது அட்டவணையை அழி" #: tbl_operations.php:696 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "அட்டவணையை வெறுமையாக்கு (காலி)" #: tbl_operations.php:716 msgid "Delete the table (DROP)" From 7c0d06f8c82528ab933316665677f9c8929b1636 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:08:26 +0200 Subject: [PATCH 596/971] 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 34a5f00c39..071f247c9d 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-20 08:07+0200\n" +"PO-Revision-Date: 2011-08-20 08:08+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10604,7 +10604,7 @@ msgstr "பிரிவினை %s" #: tbl_operations.php:748 msgid "Analyze" -msgstr "" +msgstr "ஆரய்தல்" #: tbl_operations.php:749 msgid "Check" From c7dfc22adb82379d9d94b138d5657a8fdaaf6a7c Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:08:55 +0200 Subject: [PATCH 597/971] 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 071f247c9d..2a166fe76c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10566,7 +10566,7 @@ msgstr "" #: tbl_operations.php:594 msgid "Table maintenance" -msgstr "" +msgstr "அட்டவணை பராமரிப்பு" #: tbl_operations.php:618 msgid "Defragment table" From 97bd00acb7d765a6587d184fe7c0c685800a95fc Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:09:24 +0200 Subject: [PATCH 598/971] 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 2a166fe76c..7677e9d914 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-20 08:08+0200\n" +"PO-Revision-Date: 2011-08-20 08:09+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10570,7 +10570,7 @@ msgstr "அட்டவணை பராமரிப்பு" #: tbl_operations.php:618 msgid "Defragment table" -msgstr "" +msgstr "அட்டவணையை ஒருங்கமை" #: tbl_operations.php:666 #, php-format From d60f55f92b160ba44de17aa18e06f21422cf9e44 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:10:15 +0200 Subject: [PATCH 599/971] 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 7677e9d914..3ac9c02097 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-20 08:09+0200\n" +"PO-Revision-Date: 2011-08-20 08:10+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10550,7 +10550,7 @@ msgstr "" #: tbl_operations.php:355 msgid "Table options" -msgstr "" +msgstr "அட்டவணை தெரிவுகள்" #: tbl_operations.php:359 msgid "Rename table to" From e55123e2e9755a45fbe4b3dd742dc89dd5b6ccb0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:10:40 +0200 Subject: [PATCH 600/971] 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 3ac9c02097..d90959099a 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10499,7 +10499,7 @@ msgstr "" #: tbl_indexes.php:179 msgid "Index name:" -msgstr "" +msgstr "சுட்டுப் பெயர்" #: tbl_indexes.php:185 msgid "Index type:" From 34189fc393c14c2798dd31c4db6d81c5c079df47 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:10:50 +0200 Subject: [PATCH 601/971] 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 d90959099a..31677f8368 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10503,7 +10503,7 @@ msgstr "சுட்டுப் பெயர்" #: tbl_indexes.php:185 msgid "Index type:" -msgstr "" +msgstr "சுட்டு வகை" #: tbl_indexes.php:265 #, php-format From c05e12c3dd8bb08d9cdd2df353572e779c76bb45 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:11:38 +0200 Subject: [PATCH 602/971] 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 31677f8368..c3bf19a468 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-20 08:10+0200\n" +"PO-Revision-Date: 2011-08-20 08:11+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10486,7 +10486,7 @@ msgstr "" #: tbl_indexes.php:169 msgid "Create a new index" -msgstr "" +msgstr "புதிய சுட்டியை உருவாக்கு" #: tbl_indexes.php:171 msgid "Modify an index" From e5ec57f8ef3c7a7402d199913156ff0c7fb90c23 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:12:13 +0200 Subject: [PATCH 603/971] 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 c3bf19a468..cf3e1a0a1d 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-20 08:11+0200\n" +"PO-Revision-Date: 2011-08-20 08:12+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10486,7 +10486,7 @@ msgstr "" #: tbl_indexes.php:169 msgid "Create a new index" -msgstr "புதிய சுட்டியை உருவாக்கு" +msgstr "புதிய சுட்யை உருவாக்கு" #: tbl_indexes.php:171 msgid "Modify an index" From 52379dea3695492368cb4dbe680c226224803efd Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:12:28 +0200 Subject: [PATCH 604/971] 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 cf3e1a0a1d..bff284aea9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10486,7 +10486,7 @@ msgstr "" #: tbl_indexes.php:169 msgid "Create a new index" -msgstr "புதிய சுட்யை உருவாக்கு" +msgstr "புதிய சுட்டை உருவாக்கு" #: tbl_indexes.php:171 msgid "Modify an index" From eefbc71ffa033d7636b868a86b822d96b9ecc42d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:12:41 +0200 Subject: [PATCH 605/971] 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 bff284aea9..2e90050fc6 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10490,7 +10490,7 @@ msgstr "புதிய சுட்டை உருவாக்கு" #: tbl_indexes.php:171 msgid "Modify an index" -msgstr "" +msgstr "சுட்டை மார்றியமை" #: tbl_indexes.php:176 msgid "" From e38091c76c647b26d03db6a3f68995096feab18e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:13:07 +0200 Subject: [PATCH 606/971] 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 2e90050fc6..b4a70657d2 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-20 08:12+0200\n" +"PO-Revision-Date: 2011-08-20 08:13+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10438,7 +10438,7 @@ msgstr "" #: tbl_gis_visualization.php:128 msgid "Width" -msgstr "" +msgstr "அகலம்" #: tbl_gis_visualization.php:132 msgid "Height" From db7f775a224ad1baaf0acc5fed26fb9e1d02ce84 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:13:16 +0200 Subject: [PATCH 607/971] 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 b4a70657d2..92b5871ec9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10442,7 +10442,7 @@ msgstr "அகலம்" #: tbl_gis_visualization.php:132 msgid "Height" -msgstr "" +msgstr "உயரம்" #: tbl_gis_visualization.php:136 #, fuzzy From d3679840626a9b71916f4fa635e8e8186321cbe1 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:13:39 +0200 Subject: [PATCH 608/971] 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 92b5871ec9..69b598b932 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10466,7 +10466,7 @@ msgstr "" #: tbl_gis_visualization.php:177 msgid "Save to file" -msgstr "" +msgstr "கோப்பை சேமி" #: tbl_gis_visualization.php:178 msgid "File name" From d3444a984cbf6acdb755b9f6f4940516529232d0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:13:54 +0200 Subject: [PATCH 609/971] 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 69b598b932..0be323f926 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10470,7 +10470,7 @@ msgstr "கோப்பை சேமி" #: tbl_gis_visualization.php:178 msgid "File name" -msgstr "" +msgstr "கோப்பின் பெயர்" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" From d0c03d1269f60a29d4af3af1694431458510e9e3 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:14:55 +0200 Subject: [PATCH 610/971] 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 0be323f926..3223315c28 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-20 08:13+0200\n" +"PO-Revision-Date: 2011-08-20 08:14+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10452,7 +10452,7 @@ msgstr "கள நிரல்களை சேர்க்க/ நீக்க #: tbl_gis_visualization.php:138 msgid "-- None --" -msgstr "" +msgstr "-- எதுவுமில்லை --" #: tbl_gis_visualization.php:151 #, fuzzy From 525e5ad11ff632332e14f4d1e01f3bfaabbf2f7a Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:15:34 +0200 Subject: [PATCH 611/971] 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 3223315c28..d130e73de1 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-20 08:14+0200\n" +"PO-Revision-Date: 2011-08-20 08:15+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10394,7 +10394,7 @@ msgstr "" #: tbl_chart.php:117 msgid "Series:" -msgstr "" +msgstr "தொடர்கள்" #: tbl_chart.php:119 #, fuzzy From e54f6ecd39025e14e0f23ef01a785ffa00a07309 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:16:36 +0200 Subject: [PATCH 612/971] 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 d130e73de1..1031e44ad0 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-20 08:15+0200\n" +"PO-Revision-Date: 2011-08-20 08:16+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10404,7 +10404,7 @@ msgstr "கள நிரல்களை சேர்க்க/ நீக்க #: tbl_chart.php:132 msgid "X-Axis label:" -msgstr "" +msgstr "X-அச்சு சிட்டை:" #: tbl_chart.php:133 msgid "X Values" From b41618d7d3ed9ed65fe880d3a31f95b599e7110d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:16:50 +0200 Subject: [PATCH 613/971] 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 1031e44ad0..30172e37e8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10408,7 +10408,7 @@ msgstr "X-அச்சு சிட்டை:" #: tbl_chart.php:133 msgid "X Values" -msgstr "" +msgstr "X மதிப்புக்கள்" #: tbl_chart.php:134 msgid "Y-Axis label:" From 88ac8800414f2df721ac0707e9945f3c390a9a68 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:17:04 +0200 Subject: [PATCH 614/971] 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 30172e37e8..584cb558ed 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-20 08:16+0200\n" +"PO-Revision-Date: 2011-08-20 08:17+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10412,7 +10412,7 @@ msgstr "X மதிப்புக்கள்" #: tbl_chart.php:134 msgid "Y-Axis label:" -msgstr "" +msgstr "Y-அச்சு சிட்டை:" #: tbl_chart.php:134 msgid "Y Values" From a64bb2a39f4dc301a23144592c37a834af733b22 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:17:14 +0200 Subject: [PATCH 615/971] 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 584cb558ed..3a579ef57f 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10416,7 +10416,7 @@ msgstr "Y-அச்சு சிட்டை:" #: tbl_chart.php:134 msgid "Y Values" -msgstr "" +msgstr "Y மதிப்புக்கள்:" #: tbl_create.php:30 #, php-format From 7c08a2c0d95e3281dced5a6704e198d78954a28e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:17:48 +0200 Subject: [PATCH 616/971] 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 3a579ef57f..fdd923f371 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10421,7 +10421,7 @@ msgstr "Y மதிப்புக்கள்:" #: tbl_create.php:30 #, php-format msgid "Table %s already exists!" -msgstr "" +msgstr "%s இந்த அட்டவணை ஏற்கனவே உள்ளது!" #: tbl_create.php:216 #, php-format From 7b08c6001fde6ec69bcb1ccd577c07ab6ce54a12 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:18:22 +0200 Subject: [PATCH 617/971] 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 fdd923f371..aa9b45aeb7 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-20 08:17+0200\n" +"PO-Revision-Date: 2011-08-20 08:18+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10426,7 +10426,7 @@ msgstr "%s இந்த அட்டவணை ஏற்கனவே உள்ள #: tbl_create.php:216 #, php-format msgid "Table %1$s has been created." -msgstr "" +msgstr "அட்டவணை %1$s உருவாக்கபட்டது." #: tbl_export.php:24 msgid "View dump (schema) of table" From 7dc5b0c197ec3461e29666ead3afa5f126c9b714 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:18:55 +0200 Subject: [PATCH 618/971] 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 aa9b45aeb7..574de7f458 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10366,7 +10366,7 @@ msgstr "பங்குனி" #: tbl_chart.php:90 msgid "Line" -msgstr "" +msgstr "கோடு" #: tbl_chart.php:91 #, fuzzy From 8e98809a5f99c4565b38981206c615271746ce29 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:19:53 +0200 Subject: [PATCH 619/971] 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 574de7f458..47e2cbcf8f 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-20 08:18+0200\n" +"PO-Revision-Date: 2011-08-20 08:19+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10386,7 +10386,7 @@ msgstr "" #: tbl_chart.php:97 msgid "Chart title" -msgstr "" +msgstr "வரைபட தலைப்பு" #: tbl_chart.php:103 msgid "X-Axis:" From a7526d006ce4c74a70a8ad85a77bd5e7bfb0f519 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:20:18 +0200 Subject: [PATCH 620/971] 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 47e2cbcf8f..fc5d27f081 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-20 08:19+0200\n" +"PO-Revision-Date: 2011-08-20 08:20+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10390,7 +10390,7 @@ msgstr "வரைபட தலைப்பு" #: tbl_chart.php:103 msgid "X-Axis:" -msgstr "" +msgstr "X-அச்சு" #: tbl_chart.php:117 msgid "Series:" From 47b8d437e5085d9f5a2a73664445bd97744cb32f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:20:52 +0200 Subject: [PATCH 621/971] 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 fc5d27f081..af12aebc60 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10293,7 +10293,7 @@ msgstr "" #: sql.php:959 msgid "Label" -msgstr "" +msgstr "சிட்டை" #: tbl_addfield.php:185 tbl_alter.php:99 tbl_indexes.php:98 #, php-format From 7834c1530bea1d10763290bd148af7867c5e6cb7 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:21:30 +0200 Subject: [PATCH 622/971] 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 af12aebc60..98b5164e8c 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-20 08:20+0200\n" +"PO-Revision-Date: 2011-08-20 08:21+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10112,7 +10112,7 @@ msgstr "" #: setup/lib/form_processing.lib.php:48 msgid "Ignore errors" -msgstr "" +msgstr "வழுக்களை நிராகரி" #: setup/lib/form_processing.lib.php:50 msgid "Show form" From 96e8e238b91e25d1b034b45aea22ae2043c3f3d2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:21:50 +0200 Subject: [PATCH 623/971] 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 98b5164e8c..b14302f2c8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10116,7 +10116,7 @@ msgstr "வழுக்களை நிராகரி" #: setup/lib/form_processing.lib.php:50 msgid "Show form" -msgstr "" +msgstr "படிவத்தை காட்டு" #: setup/lib/index.lib.php:122 msgid "" From ff37201d27f218fcdf011651b2759153f6859387 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:23:22 +0200 Subject: [PATCH 624/971] 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 b14302f2c8..e0779f2342 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-20 08:21+0200\n" +"PO-Revision-Date: 2011-08-20 08:23+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10096,7 +10096,7 @@ msgstr "" #: setup/frames/servers.inc.php:37 msgid "Add a new server" -msgstr "" +msgstr "ஒரு புதிய சேவையகத்தை சேர்" #: setup/lib/form_processing.lib.php:43 msgid "Warning" From 4780d36ea0cd981b3a008812c32e788ecd6aa305 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:23:58 +0200 Subject: [PATCH 625/971] 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 e0779f2342..84daaffa0d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10088,7 +10088,7 @@ msgstr "" #: setup/frames/index.inc.php:241 msgid "Donate" -msgstr "" +msgstr "நன்கொடை" #: setup/frames/servers.inc.php:28 msgid "Edit server" From a7b288a8265a2ba60a4de75f0aab7596c46d42d2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:24:22 +0200 Subject: [PATCH 626/971] 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 84daaffa0d..260ddedf82 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-20 08:23+0200\n" +"PO-Revision-Date: 2011-08-20 08:24+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10092,7 +10092,7 @@ msgstr "நன்கொடை" #: setup/frames/servers.inc.php:28 msgid "Edit server" -msgstr "" +msgstr "சேவையகத்தை தொகு" #: setup/frames/servers.inc.php:37 msgid "Add a new server" From 7860067b58a09c200538fbb0d055de3185fffcc0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:24:35 +0200 Subject: [PATCH 627/971] 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 260ddedf82..5405b523c4 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10080,7 +10080,7 @@ msgstr "" #: setup/frames/index.inc.php:229 msgid "Load" -msgstr "" +msgstr "ஏற்று" #: setup/frames/index.inc.php:240 msgid "phpMyAdmin homepage" From 4c06c08ff8ffabbae96f04370a8826b3d28a17f0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:24:47 +0200 Subject: [PATCH 628/971] 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 5405b523c4..06fe0626fd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10084,7 +10084,7 @@ msgstr "ஏற்று" #: setup/frames/index.inc.php:240 msgid "phpMyAdmin homepage" -msgstr "" +msgstr "phpMyAdmin அகப்பக்கம்" #: setup/frames/index.inc.php:241 msgid "Donate" From d2b7d39b742a5b83e739b21cfc83ab996acd2e6f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:24:57 +0200 Subject: [PATCH 629/971] 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 06fe0626fd..3e3ecd8385 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10076,7 +10076,7 @@ msgstr "" #: setup/frames/index.inc.php:225 msgid "Display" -msgstr "" +msgstr "திரை" #: setup/frames/index.inc.php:229 msgid "Load" From bc7680a5495c61baec102c3028b1eaf078a921b0 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:25:11 +0200 Subject: [PATCH 630/971] 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 3e3ecd8385..51bd7362a1 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-20 08:24+0200\n" +"PO-Revision-Date: 2011-08-20 08:25+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10072,7 +10072,7 @@ msgstr "" #: setup/frames/index.inc.php:220 msgid "End of line" -msgstr "" +msgstr "முடிவுக்கோடு" #: setup/frames/index.inc.php:225 msgid "Display" From 10b2535330d939c591ab814146d936a8914542b5 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:25:32 +0200 Subject: [PATCH 631/971] 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 51bd7362a1..d9dddfc93c 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10064,7 +10064,7 @@ msgstr "" #: setup/frames/index.inc.php:207 msgid "- none -" -msgstr "" +msgstr "- ஒன்றுமில்லை -" #: setup/frames/index.inc.php:210 msgid "Default server" From b1b59a18370235e786969389e6d9acae1bd7b98e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:26:37 +0200 Subject: [PATCH 632/971] 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 d9dddfc93c..45e83cad72 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-20 08:25+0200\n" +"PO-Revision-Date: 2011-08-20 08:26+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10068,7 +10068,7 @@ msgstr "- ஒன்றுமில்லை -" #: setup/frames/index.inc.php:210 msgid "Default server" -msgstr "" +msgstr "முன்னிருப்பு சேவையகம்" #: setup/frames/index.inc.php:220 msgid "End of line" From 68a96d58c7d4958efb23da7a43214af693232cd6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:26:51 +0200 Subject: [PATCH 633/971] 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 45e83cad72..ca77bbe1c0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10056,7 +10056,7 @@ msgstr "" #: setup/frames/index.inc.php:186 msgid "Default language" -msgstr "" +msgstr "முன்னிருப்பு மொழி" #: setup/frames/index.inc.php:196 msgid "let the user choose" From ae3a9bc687b59fe8c20d27c2dccc15fb88ab11c4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:27:07 +0200 Subject: [PATCH 634/971] 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 ca77bbe1c0..1514545203 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-20 08:26+0200\n" +"PO-Revision-Date: 2011-08-20 08:27+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10052,7 +10052,7 @@ msgstr "" #: setup/frames/index.inc.php:157 msgid "New server" -msgstr "" +msgstr "புதிய சேவையகம்" #: setup/frames/index.inc.php:186 msgid "Default language" From 2abd4e5bde64908c5e1b69e8a5586e37518cfbd4 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:27:39 +0200 Subject: [PATCH 635/971] 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 1514545203..6047dcc15d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10040,7 +10040,7 @@ msgstr "" #: setup/frames/index.inc.php:101 setup/frames/menu.inc.php:15 msgid "Overview" -msgstr "" +msgstr "இருதிப்பர்வை" #: setup/frames/index.inc.php:109 msgid "Show hidden messages (#MSG_COUNT)" From 2354d4679dc3ed2a1821e649d72d781741d25458 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:27:56 +0200 Subject: [PATCH 636/971] 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 f8c58b75ec..1648de2e74 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-20 01:33+0200\n" +"PO-Revision-Date: 2011-08-20 08:27+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12371,6 +12371,13 @@ msgid "" "mentioned in the beginning of an Article by the Pythian Group" msgstr "" +"{max_heap_table_size} ve {tmp_table_size} arttırmak yardımcı olabilir. Ancak " +"bazı geçici tablolar herzaman diske yazılır, bu değişkenlerin değeri " +"bağımsızdır. Pythian Grubu Makalesi'nde başlangıcında da bahsedilmiş " +"olan şu şartlardan (Geçici tablonun içerisinde: BLOB veya TEXT sütununun " +"varlığı ya da 512 bayttan büyük sütunun varlığı) kaçınmak için bunları " +"elemek bakımından sorgularınızı yeniden yazmak zorunda kalacaksınız" #: po/advisory_rules.php:148 #, php-format From e7e5971161cb5530e91fb3bc131f22b890da896f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:28:10 +0200 Subject: [PATCH 637/971] 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 6047dcc15d..61614bde0f 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-20 08:27+0200\n" +"PO-Revision-Date: 2011-08-20 08:28+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10044,7 +10044,7 @@ msgstr "இருதிப்பர்வை" #: setup/frames/index.inc.php:109 msgid "Show hidden messages (#MSG_COUNT)" -msgstr "" +msgstr "மறைத்த செய்திகளை காட்டு (#MSG_COUNT)" #: setup/frames/index.inc.php:149 msgid "There are no configured servers" From 1923540850624548af8d5eb192a8921763112344 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:29:16 +0200 Subject: [PATCH 638/971] 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 1648de2e74..9953771507 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-20 08:27+0200\n" +"PO-Revision-Date: 2011-08-20 08:29+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12385,6 +12385,7 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" +"Tüm geçici tabloların %%%s diske yazılıyor, bu değer %%25'in altında olmalı" #: po/advisory_rules.php:150 msgid "Temp disk rate" From 8f04e6040f0b5078fc207641f88df5839214f4fe Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:29:17 +0200 Subject: [PATCH 639/971] 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 61614bde0f..75ddc4e0cd 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-20 08:28+0200\n" +"PO-Revision-Date: 2011-08-20 08:29+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10030,7 +10030,7 @@ msgstr "" #: setup/frames/index.inc.php:93 msgid "Configuration saved." -msgstr "" +msgstr "உள்ளமைவு சேமிக்கப்பட்டது" #: setup/frames/index.inc.php:94 msgid "" From 382427069670048585300023b68474b6e3ddd3ac Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:29:24 +0200 Subject: [PATCH 640/971] 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 75ddc4e0cd..580b2b2ff0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10030,7 +10030,7 @@ msgstr "" #: setup/frames/index.inc.php:93 msgid "Configuration saved." -msgstr "உள்ளமைவு சேமிக்கப்பட்டது" +msgstr "உள்ளமைவு சேமிக்கப்பட்டது." #: setup/frames/index.inc.php:94 msgid "" From 914b3ae4a26d6d25a11c8e26d62611d43ecadd30 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:29:48 +0200 Subject: [PATCH 641/971] 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 580b2b2ff0..20fffd747e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -9968,7 +9968,7 @@ msgstr "" #: server_synchronize.php:1221 #, php-format msgid "Configuration: %s" -msgstr "" +msgstr "உள்ளமைவு: %s" #: server_synchronize.php:1236 msgid "Socket" From 9bd3cf73dd4a46f85c7b2d1a531579347c7bf10e Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:30:04 +0200 Subject: [PATCH 642/971] 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 20fffd747e..2c5fd1682f 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-20 08:29+0200\n" +"PO-Revision-Date: 2011-08-20 08:30+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9972,7 +9972,7 @@ msgstr "உள்ளமைவு: %s" #: server_synchronize.php:1236 msgid "Socket" -msgstr "" +msgstr "பொருத்துவாய்" #: server_synchronize.php:1282 msgid "" From 155d7f8149c82dad100709c4bcdc55161404a24d Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:31:54 +0200 Subject: [PATCH 643/971] 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 2c5fd1682f..927a656e09 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-20 08:30+0200\n" +"PO-Revision-Date: 2011-08-20 08:31+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9982,7 +9982,7 @@ msgstr "" #: server_variables.php:65 msgid "Setting variable failed" -msgstr "" +msgstr "மாறி அமைப்பு தோல்வியடைந்தது" #: server_variables.php:84 msgid "Server variables and settings" From 49607dd9f1ae840cd7f6493b11267ceee22caa8a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:32:03 +0200 Subject: [PATCH 644/971] 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 9953771507..3052b33b1b 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-20 08:29+0200\n" +"PO-Revision-Date: 2011-08-20 08:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12401,6 +12401,13 @@ msgid "" "mentioned in in the MySQL Documentation" msgstr "" +"{max_heap_table_size} ve {tmp_table_size} arttırmak yardımcı olabilir. Ancak " +"bazı geçici tablolar her zaman diske yazılır, bu değişkenlerin değeri " +"bağımsızdır. MySQL Belgesi içinde bahsedildiği gibi şu " +"şartlardan (Geçici tablonun içerisinde: BLOB veya TEXT sütununun varlığı ya " +"da 512 bayttan büyük sütunun varlığı) kaçınmak için bunları elemek " +"bakımından sorgularınızı yeniden yazmak zorunda kalacaksınız" #: po/advisory_rules.php:153 #, php-format From ca146f652584cf6277639883ad82e4b1f56a3e54 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:32:47 +0200 Subject: [PATCH 645/971] 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 927a656e09..842b92e79a 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-20 08:31+0200\n" +"PO-Revision-Date: 2011-08-20 08:32+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9986,7 +9986,7 @@ msgstr "மாறி அமைப்பு தோல்வியடைந்த #: server_variables.php:84 msgid "Server variables and settings" -msgstr "" +msgstr "சேவையக மாறிகள் மற்றும் அமைப்புக்கள்" #: server_variables.php:111 server_variables.php:137 msgid "Session value" From 046cc3c300a3c015865ac13ea5586f8c45aacdb6 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:33:17 +0200 Subject: [PATCH 646/971] 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 842b92e79a..2f455d1ae0 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-20 08:32+0200\n" +"PO-Revision-Date: 2011-08-20 08:33+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9990,7 +9990,7 @@ msgstr "சேவையக மாறிகள் மற்றும் அமை #: server_variables.php:111 server_variables.php:137 msgid "Session value" -msgstr "" +msgstr "அமர்வு மதிப்பு" #: server_variables.php:111 msgid "Global value" From 8206f541203a2a2fbeabaf5ee6ea3a537c63cfd8 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:33:43 +0200 Subject: [PATCH 647/971] 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 2f455d1ae0..9669399910 100644 --- a/po/ta.po +++ b/po/ta.po @@ -9994,7 +9994,7 @@ msgstr "அமர்வு மதிப்பு" #: server_variables.php:111 msgid "Global value" -msgstr "" +msgstr "முழுதளாவிய மதிப்பு" #: setup/frames/config.inc.php:38 setup/frames/index.inc.php:226 msgid "Download" From 1b66adcf83561264358665a71284c258db726714 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:33:52 +0200 Subject: [PATCH 648/971] 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 9669399910..0058231973 100644 --- a/po/ta.po +++ b/po/ta.po @@ -9998,7 +9998,7 @@ msgstr "முழுதளாவிய மதிப்பு" #: setup/frames/config.inc.php:38 setup/frames/index.inc.php:226 msgid "Download" -msgstr "" +msgstr "பதிவிறக்கம்" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" From fdf5131ad4fa95840461ddd9ef4ec5627c41feef Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:34:02 +0200 Subject: [PATCH 649/971] 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 3052b33b1b..524ff43642 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-20 08:32+0200\n" +"PO-Revision-Date: 2011-08-20 08:34+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12374,8 +12374,8 @@ msgstr "" "{max_heap_table_size} ve {tmp_table_size} arttırmak yardımcı olabilir. Ancak " "bazı geçici tablolar herzaman diske yazılır, bu değişkenlerin değeri " "bağımsızdır. Pythian Grubu Makalesi'nde başlangıcında da bahsedilmiş " -"olan şu şartlardan (Geçici tablonun içerisinde: BLOB veya TEXT sütununun " +"65841&comments\\\">Pythian Grubu Makalesi'nde başlangıcında bahsedildiği " +"gibi şu şartlardan (Geçici tablonun içerisinde: BLOB veya TEXT sütununun " "varlığı ya da 512 bayttan büyük sütunun varlığı) kaçınmak için bunları " "elemek bakımından sorgularınızı yeniden yazmak zorunda kalacaksınız" From 4ab3a469ae30a17b1d88f407bf23d91b86461937 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:34:24 +0200 Subject: [PATCH 650/971] 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 0058231973..1f5c0412be 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-20 08:33+0200\n" +"PO-Revision-Date: 2011-08-20 08:34+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -10026,7 +10026,7 @@ msgstr "" #: setup/frames/index.inc.php:65 msgid "Insecure connection" -msgstr "" +msgstr "பாதுகாப்பற்ற இணைப்பு" #: setup/frames/index.inc.php:93 msgid "Configuration saved." From ba62c05c28e511494438beb32a63bb5ebfff074e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:34:26 +0200 Subject: [PATCH 651/971] 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 524ff43642..b8e348ada2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12372,7 +12372,7 @@ msgid "" "php?note_id=10150111255065841&comments\\\">Article by the Pythian Group" msgstr "" "{max_heap_table_size} ve {tmp_table_size} arttırmak yardımcı olabilir. Ancak " -"bazı geçici tablolar herzaman diske yazılır, bu değişkenlerin değeri " +"bazı geçici tablolar her zaman diske yazılır, bu değişkenlerin değeri " "bağımsızdır. Pythian Grubu Makalesi'nde başlangıcında bahsedildiği " "gibi şu şartlardan (Geçici tablonun içerisinde: BLOB veya TEXT sütununun " From 5533c3001dc9761122252318e20104408d2d9a75 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:34:40 +0200 Subject: [PATCH 652/971] 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 1f5c0412be..c8570bb02d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -10040,7 +10040,7 @@ msgstr "" #: setup/frames/index.inc.php:101 setup/frames/menu.inc.php:15 msgid "Overview" -msgstr "இருதிப்பர்வை" +msgstr "இறுதிப்பர்வை" #: setup/frames/index.inc.php:109 msgid "Show hidden messages (#MSG_COUNT)" From 200697b5c6fc58420797021375480d8f8268b979 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:35:22 +0200 Subject: [PATCH 653/971] 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 b8e348ada2..d462815e32 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-20 08:34+0200\n" +"PO-Revision-Date: 2011-08-20 08:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12415,6 +12415,8 @@ msgid "" "Rate of temporay tables being written to disk: %s, this value should be less " "than 1 per hour" msgstr "" +"Diske yazılan geçici tabloların oranı: %s, bu değer saat başına 1'den az " +"olmalıdır" #: po/advisory_rules.php:155 msgid "MyISAM key buffer size" From bd4e387f78b85d33567354c56a1a9d032da3c6ed Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:35:33 +0200 Subject: [PATCH 654/971] 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 c8570bb02d..f68d4602da 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-20 08:34+0200\n" +"PO-Revision-Date: 2011-08-20 08:35+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9963,7 +9963,7 @@ msgstr "" #: server_synchronize.php:1192 msgid "Current connection" -msgstr "" +msgstr "நடப்பாணை இணைப்பு" #: server_synchronize.php:1221 #, php-format From b2ad9741a1d08f307fc352e3c31208186227a2a2 Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:36:54 +0200 Subject: [PATCH 655/971] 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 f68d4602da..db52e1c7df 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-20 08:35+0200\n" +"PO-Revision-Date: 2011-08-20 08:36+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9959,7 +9959,7 @@ msgstr "" #: server_synchronize.php:1184 msgid "Enter manually" -msgstr "" +msgstr "கைமுறையாக நுழை" #: server_synchronize.php:1192 msgid "Current connection" From 0d4b2bcee152342522633e125e12d479209a9256 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:37:15 +0200 Subject: [PATCH 656/971] 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 d462815e32..8fd3381a8a 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-20 08:35+0200\n" +"PO-Revision-Date: 2011-08-20 08:37+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12424,7 +12424,7 @@ msgstr "MyISAM anahtar arabellek boyutu" #: po/advisory_rules.php:156 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." -msgstr "" +msgstr "Anahtar arabellek başlatılmadı. Önbelleklenecek MyISAM indeksleri yok." #: po/advisory_rules.php:157 msgid "" From a1ef8f2d39e81cbcf67ec5eafd50be6e84323b2f Mon Sep 17 00:00:00 2001 From: ysajeepan Date: Sat, 20 Aug 2011 08:37:40 +0200 Subject: [PATCH 657/971] 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 db52e1c7df..7d6d5eb796 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-20 08:36+0200\n" +"PO-Revision-Date: 2011-08-20 08:37+0200\n" "Last-Translator: \n" "Language-Team: Tamil \n" "Language: ta\n" @@ -9955,7 +9955,7 @@ msgstr "" #: server_synchronize.php:1038 msgid "Executed queries" -msgstr "" +msgstr "வினவல்கள் நிறைவடைந்தது" #: server_synchronize.php:1184 msgid "Enter manually" From 574e98ed2c04f4831adb0e578ad44ae05095e5d5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:38:52 +0200 Subject: [PATCH 658/971] 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 8fd3381a8a..12afacdb9e 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-20 08:37+0200\n" +"PO-Revision-Date: 2011-08-20 08:38+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12431,6 +12431,8 @@ msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"{key_buffer_size} ayarı MyISAM indekslerinizin boyutuna bağlıdır. 64M " +"başlangıç için iyidir." #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" From 57e348cff3c1d20bef9c13f9b2e253670214dfb5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 08:39:04 +0200 Subject: [PATCH 659/971] 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 12afacdb9e..a52668dab2 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-20 08:38+0200\n" +"PO-Revision-Date: 2011-08-20 08:39+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12436,7 +12436,7 @@ msgstr "" #: po/advisory_rules.php:158 msgid "key_buffer_size is 0" -msgstr "" +msgstr "key_buffer_size 0'dır" #: po/advisory_rules.php:160 #, php-format From 85f62705e4dbbbf34b1e1c3bbc790b66a0e78966 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Sat, 20 Aug 2011 15:55:02 +0530 Subject: [PATCH 660/971] Rewrote the functions in querywindow.js using jquery --- js/querywindow.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/js/querywindow.js b/js/querywindow.js index ba9fe6e18f..55c895a061 100644 --- a/js/querywindow.js +++ b/js/querywindow.js @@ -7,36 +7,35 @@ function PMA_queryAutoCommit() function PMA_querywindowCommit(tab) { - document.getElementById('hiddenqueryform').querydisplay_tab.value = tab; - document.getElementById('hiddenqueryform').submit(); + $('#hiddenqueryform').find("input[name='querydisplay_tab']").attr("value" ,tab); + $('#hiddenqueryform').submit(); return false; } function PMA_querywindowSetFocus() { - document.getElementById('sqlquery').focus(); + $('#sqlquery').focus(); } function PMA_querywindowResize() { // for Gecko - if (typeof(self.sizeToContent) == 'function') { - self.sizeToContent(); + if (typeof($(this)[0].sizeToContent) == 'function') { + $(this)[0].sizeToContent(); //self.scrollbars.visible = false; // give some more space ... to prevent 'fli(pp/ck)ing' - self.resizeBy(10, 50); + $(this)[0].resizeBy(10, 50); return; } // for IE, Opera - if (document.getElementById && typeof(document.getElementById('querywindowcontainer')) != 'undefined') { - + if ($('#querywindowcontainer') != 'undefined') { // get content size - var newWidth = document.getElementById('querywindowcontainer').offsetWidth; - var newHeight = document.getElementById('querywindowcontainer').offsetHeight; + var newWidth = $("#querywindowcontainer")[0].offsetWidth; + var newHeight = $("#querywindowcontainer")[0].offsetHeight; // set size to contentsize // plus some offset for scrollbars, borders, statusbar, menus ... - self.resizeTo(newWidth + 45, newHeight + 75); + $(this)[0].resizeTo(newWidth + 45, newHeight + 75); } } From 08604d7f08339162238f21e06f848e9606c9ad4e Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Sat, 20 Aug 2011 14:18:53 +0300 Subject: [PATCH 661/971] duplicate rule name --- libraries/advisory_rules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index f13f838890..bbc8d5c6fd 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -127,7 +127,7 @@ rule 'Query cache disabled' The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'. Note: If you are using memcached, ignore this recommendation. query_cache_size is set to 0 or query_cache_type is set to 'OFF' -rule 'Query cache usage' [!fired('Query cache disabled')] +rule 'Query caching method' [!fired('Query cache disabled')] Questions / Uptime value > 100 Suboptimal caching method. @@ -141,7 +141,7 @@ rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query Consider increasing {query_cache_limit}. The current query cache hit rate of %s% is below 20% | round(value,1) -rule 'Query Cache usage' [!fired('Query cache disabled')] +rule 'Query cache usage' [!fired('Query cache disabled')] 100 - Qcache_free_memory / query_cache_size * 100 value < 80 Less than 80% of the query cache is being utilized. From 4adf3478e6b64d7ea77e8d5cdffa4f7cd829f56d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 20 Aug 2011 07:35:38 -0400 Subject: [PATCH 662/971] Typo, English improvements --- Documentation.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation.html b/Documentation.html index 8872e5e9a2..d590a6bb00 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4420,9 +4420,9 @@ chmod o+rwx tmp

    6.32 How can I use the zoom search feature?

    -

    Zoom search feature is an alternative to table search feature. It allows you to explore +

    The Zoom search feature is an alternative to table search feature. It allows you to explore a table by representing its data in a scatter plot. You can locate this feature by selecting - a table and clicking the 'Search' tab. One of the sub-tab in the 'Table Search' page is + a table and clicking the 'Search' tab. One of the sub-tabs in the 'Table Search' page is 'Zoom Search'.

    Consider the table REL_persons in @@ -4443,7 +4443,7 @@ chmod o+rwx tmp In addition, panning feature is enabled to navigate through the plot. You can zoom-in to a certail level of detail and use panning to locate your area of interest. Clicking on a point opens a dialogue box, displaying field values of the data row represented by the point. - You can edit the values if required and and click on submit to issue an update query. Basic + You can edit the values if required and click on submit to issue an update query. Basic instructions on how to use can be viewed by clicking the 'How to use?' link located just above the plot.

    From b0ed51d8cdaa0ec42649f6258932889687890594 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sat, 20 Aug 2011 13:51:06 +0200 Subject: [PATCH 663/971] Remove todo item --- libraries/advisory_rules.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt index c3445e09fe..7745157436 100644 --- a/libraries/advisory_rules.txt +++ b/libraries/advisory_rules.txt @@ -214,7 +214,6 @@ 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 From db134711de590a29eaade490d976679b9f9307fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:37:11 +0200 Subject: [PATCH 664/971] 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 5e82a937de..15d34f0a28 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-20 07:15+0200\n" +"PO-Revision-Date: 2011-08-20 15:37+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13095,6 +13095,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"El tamaño del archivo de registros InnoDB es %s%% del tamaño del conjunto de " +"búfers InnoDB, no debería ser menor a 20%%" #: po/advisory_rules.php:255 msgid "Max InnoDB log size" From fdeab03842f15869441aeadfb25ede4043ec1aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:37:30 +0200 Subject: [PATCH 665/971] 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 15d34f0a28..3a28bf6057 100644 --- a/po/es.po +++ b/po/es.po @@ -13100,7 +13100,7 @@ msgstr "" #: po/advisory_rules.php:255 msgid "Max InnoDB log size" -msgstr "" +msgstr "Tamaño máximo del registro InnoDB" #: po/advisory_rules.php:256 msgid "The InnoDB log file size is inadequately large." From 6c7d2bf945f430eec557ee293d4cdbddb04f781d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:37:52 +0200 Subject: [PATCH 666/971] 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 3a28bf6057..665353e665 100644 --- a/po/es.po +++ b/po/es.po @@ -13104,7 +13104,7 @@ msgstr "Tamaño máximo del registro InnoDB" #: po/advisory_rules.php:256 msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "El tamaño del archivo de registros InnoDB es inadecuadamente grande." #: po/advisory_rules.php:257 #, php-format From ab27b9aef7d58e99233cc2ef219cc541a3dd2c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:40:48 +0200 Subject: [PATCH 667/971] Translation update done using Pootle. --- po/es.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 665353e665..12e8b0e031 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-20 15:37+0200\n" +"PO-Revision-Date: 2011-08-20 15:40+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13119,6 +13119,17 @@ msgid "" "\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" "innodblogfilesize-proper-way.html\\\">this blog entry" msgstr "" +"Normalmente es suficiente definir «innodb_log_file_size» a el 25% del valor " +"de «innodb_buffer_pool_size». Un valor muy alto de «innodb_log_file_size» " +"reduce considerablemente la velocidad de la recuperación luego de una caída " +"de la base de datos. Revise también este artículo. Necesitará cerrar el servidor, " +"eliminar los archivos de registros InnoDB, definir el nuevo valor en el " +"archivo 'my.cnf', iniciar el servidor y luego verificar los registros de " +"error para asegurarse que no hubo inconvenientes. Revise también este artículo." #: po/advisory_rules.php:258 #, php-format From 23f52fa9159ad087c33587bbdcf4ffef74fec273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:41:14 +0200 Subject: [PATCH 668/971] 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 12e8b0e031..ca2ed9d938 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-20 15:40+0200\n" +"PO-Revision-Date: 2011-08-20 15:41+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13134,7 +13134,7 @@ msgstr "" #: po/advisory_rules.php:258 #, php-format msgid "Your absolute InnoD log size is %s MiB" -msgstr "" +msgstr "El tamaño del archivo de registros InnoDB es %s MiB" #: po/advisory_rules.php:260 #, fuzzy From 05f8b315205d435b58e4ae0e6ca044ef316f3101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:41:30 +0200 Subject: [PATCH 669/971] 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 ca2ed9d938..a308f62181 100644 --- a/po/es.po +++ b/po/es.po @@ -13137,10 +13137,9 @@ msgid "Your absolute InnoD log size is %s MiB" msgstr "El tamaño del archivo de registros InnoDB es %s MiB" #: po/advisory_rules.php:260 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "Tamaño de la reserva de búfers" +msgstr "Tamaño de la reserva de búfers InnoDB" #: po/advisory_rules.php:261 msgid "Your InnoDB buffer pool is fairly small." From 24d98a5cd43a673bf1a51e0fc313240ba7fe8ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:41:54 +0200 Subject: [PATCH 670/971] 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 a308f62181..a75dace568 100644 --- a/po/es.po +++ b/po/es.po @@ -13095,8 +13095,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" -"El tamaño del archivo de registros InnoDB es %s%% del tamaño del conjunto de " -"búfers InnoDB, no debería ser menor a 20%%" +"El tamaño del archivo de registros InnoDB es %s%% del tamaño de la reserva " +"de búfers InnoDB, no debería ser menor a 20%%" #: po/advisory_rules.php:255 msgid "Max InnoDB log size" From c50f063b19d40a50838d8e70f776a166a993bc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:42:03 +0200 Subject: [PATCH 671/971] 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 a75dace568..d7896c1f11 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-20 15:41+0200\n" +"PO-Revision-Date: 2011-08-20 15:42+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13061,7 +13061,7 @@ msgid "" "InnoDB buffer pool." msgstr "" "El tamaño del archivo de registro InnoDB no parece ser apropiado en relación " -"al conjunto de búfers InnoDB." +"a la reserva de búfers InnoDB." #: po/advisory_rules.php:252 #, php-format From a0cccc3d1929bbed44514604dc08626833b1427a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:42:22 +0200 Subject: [PATCH 672/971] 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 d7896c1f11..aa7d9a3b6e 100644 --- a/po/es.po +++ b/po/es.po @@ -13143,7 +13143,7 @@ msgstr "Tamaño de la reserva de búfers InnoDB" #: po/advisory_rules.php:261 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "Su reserva de búfers InnoDB es relativamente pequeña." #: po/advisory_rules.php:262 #, php-format From b39c65b6b6b9a928dc3690d39ebf99d9e12cec4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:45:16 +0200 Subject: [PATCH 673/971] Translation update done using Pootle. --- po/es.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index aa7d9a3b6e..65608cabf2 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-20 15:42+0200\n" +"PO-Revision-Date: 2011-08-20 15:45+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13159,6 +13159,17 @@ msgid "" "\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" "innodb_buffer_pool_size/\\\">this article" msgstr "" +"La reserva de búfers InnoDB tiene un profundo impacto en la performance de " +"las tablas InnoDB. Asigne toda la memoria disponible a este búfer. Para " +"servidores de base de datos que sólo utilicen InnoDB como motor de " +"almacenamiento y no tengan otros servicios (por ejemplo un servidor web), " +"puede definir este valor hasta un 80%% de su memoria disponible. Si no es el " +"caso, deberá analizar cuidadosamente el consumo de memoria de los otros " +"servicios y tablas con otros motores y configurar esta variable acorde a " +"ello. Si se la define demasiado alta, su sistema comenzará a utilizar el " +"área de intercambio en disco disminuyendo la performance significativamente. " +"Revise también este artículo" #: po/advisory_rules.php:263 #, php-format From d91985ecbb9fcc1d23655da23d2defe680dcda39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:50:08 +0200 Subject: [PATCH 674/971] 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 65608cabf2..698c2833e6 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-20 15:45+0200\n" +"PO-Revision-Date: 2011-08-20 15:50+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13179,6 +13179,10 @@ msgid "" "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" +"Actualmente está utilizando %s%% de su memoria de la reserva de búfers " +"InnoDB. Esta regla se dispara si está asignando menos del 60%%. Sin embargo, " +"esto puede ser perfectamente adecuado para su sistema si no posee muchas " +"tablas InnoDB o tiene otros servicios en el mismo equipo." #: po/advisory_rules.php:265 #, fuzzy From a4ff3d57ff781b635ee3b9aab3d8e159579eebdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:50:35 +0200 Subject: [PATCH 675/971] 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 698c2833e6..2f796eb906 100644 --- a/po/es.po +++ b/po/es.po @@ -13185,10 +13185,9 @@ msgstr "" "tablas InnoDB o tiene otros servicios en el mismo equipo." #: po/advisory_rules.php:265 -#, fuzzy #| msgid "max. concurrent connections" msgid "MyISAM concurrent inserts" -msgstr "Número máx. de conexiones concurrentes" +msgstr "Inserciones MyISAM concurrentes" #: po/advisory_rules.php:266 msgid "Enable concurrent_insert by setting it to 1" From b57e9193407b1a81b0d0a3a33b262af47c331a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:50:52 +0200 Subject: [PATCH 676/971] 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 2f796eb906..0a83251a0c 100644 --- a/po/es.po +++ b/po/es.po @@ -13191,7 +13191,7 @@ msgstr "Inserciones MyISAM concurrentes" #: po/advisory_rules.php:266 msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "Active «concurrent_insert» definiéndolo como 1" #: po/advisory_rules.php:267 msgid "" From 12149ee155de432679bace614325561062e54b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:51:44 +0200 Subject: [PATCH 677/971] 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 0a83251a0c..78adc426c8 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-20 15:50+0200\n" +"PO-Revision-Date: 2011-08-20 15:51+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13199,6 +13199,10 @@ msgid "" "writers for a given table. See also MySQL Documentation" msgstr "" +"Definir «concurrent_insert» a 1 reduce la competencia entre lectores y " +"escritores en una tabla particular. Revise también la documentación MySQL" #: po/advisory_rules.php:268 msgid "concurrent_insert is set to 0" From 5ded18261d4f5651561a077f87168957a82f637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 15:51:59 +0200 Subject: [PATCH 678/971] 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 78adc426c8..807f637774 100644 --- a/po/es.po +++ b/po/es.po @@ -13206,7 +13206,7 @@ msgstr "" #: po/advisory_rules.php:268 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "«concurrent_insert» está definido como 0" #, fuzzy #~ msgid "" From 7c57d4ddad5831a2276498f27f5d589eb7643f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sat, 20 Aug 2011 17:29:08 +0200 Subject: [PATCH 679/971] 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 807f637774..893fbb4a71 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-20 15:51+0200\n" +"PO-Revision-Date: 2011-08-20 17:29+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -13045,7 +13045,6 @@ msgid "InnoDB is usually the better choice for table engines." msgstr "InnoDB es, usualmente, la mejor opción como motor para tablas." #: po/advisory_rules.php:248 -#, fuzzy msgid "have_innodb is set to 'value'" msgstr "«have_innodb» está configurado como 'value'" From a5ca144d693f937525f65e68505976cf50870b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:12:25 +0200 Subject: [PATCH 680/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 6e46a44c73..6cea845ccf 100644 --- a/po/da.po +++ b/po/da.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-23 21:27+0200\n" +"PO-Revision-Date: 2011-08-20 18:12+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" From cdb0a6c1fd763440ccad41de11837af8ddf908a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:13:37 +0200 Subject: [PATCH 681/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 6cea845ccf..fba55fb03f 100644 --- a/po/da.po +++ b/po/da.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-20 18:12+0200\n" +"PO-Revision-Date: 2011-08-20 18:13+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" From d512430b9942520dd16e494b3b0887a89f9fa98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:14:28 +0200 Subject: [PATCH 682/971] Translation update done using Pootle. --- po/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index fba55fb03f..9753217686 100644 --- a/po/da.po +++ b/po/da.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-20 18:13+0200\n" +"PO-Revision-Date: 2011-08-20 18:14+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -414,10 +414,10 @@ msgid "You have to choose at least one column to display" msgstr "Du skal vælge mindst en kolonne der skal vises" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "visuel konstruktør" +msgstr "Skift til %svisuel konstruktør%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:955 From 1a4eeffaab5ddd44428fc02ce222e7e202cc71e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:15:18 +0200 Subject: [PATCH 683/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 9753217686..7db84944bf 100644 --- a/po/da.po +++ b/po/da.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-20 18:14+0200\n" +"PO-Revision-Date: 2011-08-20 18:15+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -885,10 +885,9 @@ msgstr "" #: 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 "Tilføj rutine" +msgstr "Tilføj et punkt" #: gis_data_editor.php:218 js/messages.php:287 #, fuzzy From a913c7946e10be33304d7de81a9933c405257ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:15:35 +0200 Subject: [PATCH 684/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 7db84944bf..8d12af73ae 100644 --- a/po/da.po +++ b/po/da.po @@ -850,10 +850,10 @@ msgid "Dump has been saved to file %s." msgstr "Dump er blevet gemt i filen %s." #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Værdier for kolonnen \"%s\"" +msgstr "Værdi for kolonnen \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" From e68ad93ca7f550f8d184b25772f19d99d1439b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:16:02 +0200 Subject: [PATCH 685/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 8d12af73ae..8757989eef 100644 --- a/po/da.po +++ b/po/da.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-20 18:15+0200\n" +"PO-Revision-Date: 2011-08-20 18:16+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -890,10 +890,9 @@ msgid "Add a point" msgstr "Tilføj et punkt" #: gis_data_editor.php:218 js/messages.php:287 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Linjer afsluttes med" +msgstr "Linjestreng" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" From d3b859cf87b3cd04c576959ed5cc9c6ebd138154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:16:17 +0200 Subject: [PATCH 686/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 8757989eef..9ca2961163 100644 --- a/po/da.po +++ b/po/da.po @@ -896,7 +896,7 @@ msgstr "Linjestreng" #: gis_data_editor.php:221 gis_data_editor.php:275 msgid "Outer Ring:" -msgstr "" +msgstr "Ydre ring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" From 8d78283c6e8f1c0d55d09e87ab2bc5815cee21de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:16:27 +0200 Subject: [PATCH 687/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 9ca2961163..5eb4338d9c 100644 --- a/po/da.po +++ b/po/da.po @@ -900,7 +900,7 @@ msgstr "Ydre ring:" #: gis_data_editor.php:223 gis_data_editor.php:277 js/messages.php:290 msgid "Inner Ring" -msgstr "" +msgstr "Indre ring" #: gis_data_editor.php:248 #, fuzzy From 7404bbd43244745ebdff9b55e16867032b2a5125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:16:39 +0200 Subject: [PATCH 688/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 5eb4338d9c..dc5135dd55 100644 --- a/po/da.po +++ b/po/da.po @@ -903,10 +903,9 @@ msgid "Inner Ring" msgstr "Indre ring" #: gis_data_editor.php:248 -#, fuzzy #| msgid "Add constraints" msgid "Add a linestring" -msgstr "Tilføj begrænsninger" +msgstr "Tilføj en linjestreng" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 #, fuzzy From 49a682d0fc35de6b1e9c59f53944bf0217fb483f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:16:56 +0200 Subject: [PATCH 689/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index dc5135dd55..51c321faaa 100644 --- a/po/da.po +++ b/po/da.po @@ -908,10 +908,9 @@ msgid "Add a linestring" msgstr "Tilføj en linjestreng" #: gis_data_editor.php:248 gis_data_editor.php:298 js/messages.php:293 -#, fuzzy #| msgid "Add a new server" msgid "Add an inner ring" -msgstr "Tilføj ny server" +msgstr "Tilføj en indre ring" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" From f254bb4bd71c90b856445832d6b329d02c735ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:17:14 +0200 Subject: [PATCH 690/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 51c321faaa..3d61f0baa4 100644 --- a/po/da.po +++ b/po/da.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-20 18:16+0200\n" +"PO-Revision-Date: 2011-08-20 18:17+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -917,10 +917,9 @@ msgid "Polygon" msgstr "" #: gis_data_editor.php:300 js/messages.php:294 -#, fuzzy #| msgid "Add column" msgid "Add a polygon" -msgstr "Tilføj kolonne" +msgstr "Tilføj polygon" #: gis_data_editor.php:304 #, fuzzy From a91d6744c9d42b1060f8bd1f21aaa338b317a39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:17:23 +0200 Subject: [PATCH 691/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 3d61f0baa4..2e07a38a7c 100644 --- a/po/da.po +++ b/po/da.po @@ -871,7 +871,7 @@ msgstr "Geometri" #: 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 97ec3b958f1945e4262ad7ecc5fa7c7e8c78471e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:17:46 +0200 Subject: [PATCH 692/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 2e07a38a7c..95300ccff4 100644 --- a/po/da.po +++ b/po/da.po @@ -922,10 +922,9 @@ msgid "Add a polygon" msgstr "Tilføj polygon" #: gis_data_editor.php:304 -#, fuzzy #| msgid "Geometry" msgid "Add geometry" -msgstr "Geometri" +msgstr "Tilføj geometri" #: gis_data_editor.php:312 msgid "" From 6458a829cddf2bcb00a3a746dd8e9d249512aaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:19:08 +0200 Subject: [PATCH 693/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 95300ccff4..c41dd2dfe5 100644 --- a/po/da.po +++ b/po/da.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-20 18:17+0200\n" +"PO-Revision-Date: 2011-08-20 18:19+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -931,6 +931,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Vælg \"GeomFromText\" fra kolonnen \"Function\" og indsæt strengen nedenfor i " +"feltet \"Value\"" #: import.php:57 #, php-format From 1c8cd1c5e1fcede46ae2acfe3132f894e9ca388c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:19:55 +0200 Subject: [PATCH 694/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index c41dd2dfe5..b7e7f53901 100644 --- a/po/da.po +++ b/po/da.po @@ -914,7 +914,7 @@ msgstr "Tilføj en indre ring" #: gis_data_editor.php:262 js/messages.php:288 msgid "Polygon" -msgstr "" +msgstr "Polygon" #: gis_data_editor.php:300 js/messages.php:294 #| msgid "Add column" From 4805eb977c78f24283588dfd5264e528dacb4a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:20:18 +0200 Subject: [PATCH 695/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index b7e7f53901..8128f9270d 100644 --- a/po/da.po +++ b/po/da.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-20 18:19+0200\n" +"PO-Revision-Date: 2011-08-20 18:20+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -861,7 +861,7 @@ msgstr "Brug OpenStreetMaps som basislag" #: 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 05e5b2f03f744b9a16e40a03df74551777e5ad36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:20:25 +0200 Subject: [PATCH 696/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 8128f9270d..1069366a89 100644 --- a/po/da.po +++ b/po/da.po @@ -876,7 +876,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 98317bd367bcca72d85d761bb362a5507b26caa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:20:30 +0200 Subject: [PATCH 697/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 1069366a89..f8dab157bc 100644 --- a/po/da.po +++ b/po/da.po @@ -881,7 +881,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 64ad83cc824e741170979b98a3c68c5e59c641ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:21:10 +0200 Subject: [PATCH 698/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index f8dab157bc..3eaf2912db 100644 --- a/po/da.po +++ b/po/da.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-20 18:20+0200\n" +"PO-Revision-Date: 2011-08-20 18:21+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1212,10 +1212,9 @@ msgid "Query statistics" msgstr "Statistik over forespørgsler" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "Kunne ikke indlæse konfigurationsfilen" +msgstr "Konfigurationen for den lokale skærm er inkompatibel" #: js/messages.php:94 msgid "" From c85db3b012a80950cead6009cc2a1d3f958a78bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:24:08 +0200 Subject: [PATCH 699/971] Translation update done using Pootle. --- po/da.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 3eaf2912db..0d58e6ebd8 100644 --- a/po/da.po +++ b/po/da.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-20 18:21+0200\n" +"PO-Revision-Date: 2011-08-20 18:24+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1223,6 +1223,10 @@ msgid "" "likely that your current configuration will not work anymore. Please reset " "your configuration to default in the Settings menu." msgstr "" +"Konfigurationen af diagramopstillingen i din browsers lokale lager er ikke " +"længere kompatibel med den nyere version af skærmdialogen. Det er meget " +"sandsynligt, at din aktuelle konfiguration ikke vil virke længere.Nulstil " +"derfor din konfiguration i menuen Settings" #: js/messages.php:96 #, fuzzy From c3892839a6c8792e5681e49f4351f8641795a37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:24:45 +0200 Subject: [PATCH 700/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 0d58e6ebd8..d210c2e5eb 100644 --- a/po/da.po +++ b/po/da.po @@ -1229,10 +1229,9 @@ msgstr "" "derfor din konfiguration i menuen Settings" #: js/messages.php:96 -#, fuzzy #| msgid "Query cache" msgid "Query cache efficiency" -msgstr "Forespørgsel-mellemlager" +msgstr "Effektivitet af forespørgsels-mellemlager" #: js/messages.php:97 po/advisory_rules.php:70 #, fuzzy From c92cec7724354b82d1fa9abd947f79ba00603e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:25:12 +0200 Subject: [PATCH 701/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index d210c2e5eb..2592e8bcba 100644 --- a/po/da.po +++ b/po/da.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-20 18:24+0200\n" +"PO-Revision-Date: 2011-08-20 18:25+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1234,10 +1234,9 @@ msgid "Query cache efficiency" msgstr "Effektivitet af forespørgsels-mellemlager" #: js/messages.php:97 po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache usage" -msgstr "Forespørgsel-mellemlager" +msgstr "Forbrug af forespørgsels-mellemlager" #: js/messages.php:98 #, fuzzy From 3007a838305c6fc2f4484b9f6caa781124e4c269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:25:43 +0200 Subject: [PATCH 702/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 2592e8bcba..98aba5578c 100644 --- a/po/da.po +++ b/po/da.po @@ -1239,10 +1239,9 @@ msgid "Query cache usage" msgstr "Forbrug af forespørgsels-mellemlager" #: js/messages.php:98 -#, fuzzy #| msgid "Query cache" msgid "Query cache used" -msgstr "Forespørgsel-mellemlager" +msgstr "Forbrugt forespørgsels-mellemlager" #: js/messages.php:100 msgid "System CPU Usage" From f55d55344d4270c291f12a37bf027657503b4e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:25:56 +0200 Subject: [PATCH 703/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 98aba5578c..fea10e3d88 100644 --- a/po/da.po +++ b/po/da.po @@ -1270,10 +1270,9 @@ msgid "Average load" msgstr "Gennemsnitlig belastning" #: js/messages.php:107 -#, fuzzy #| msgid "System memory" msgid "Total memory" -msgstr "Systemhukommelse" +msgstr "Total hukommelse" #: js/messages.php:108 #, fuzzy From a75ae7e5db780f2d50ac1fabfc37d3db83621270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:26:26 +0200 Subject: [PATCH 704/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index fea10e3d88..bd7a0b97d1 100644 --- a/po/da.po +++ b/po/da.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-20 18:25+0200\n" +"PO-Revision-Date: 2011-08-20 18:26+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1275,10 +1275,9 @@ msgid "Total memory" msgstr "Total hukommelse" #: js/messages.php:108 -#, fuzzy #| msgid "System memory" msgid "Cached memory" -msgstr "Systemhukommelse" +msgstr "Hukommelse i mellemlager" #: js/messages.php:109 #, fuzzy From 28a487ec22ecb23dd3547d03f82ac89c5feb87ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:27:03 +0200 Subject: [PATCH 705/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index bd7a0b97d1..cf04dc3d4f 100644 --- a/po/da.po +++ b/po/da.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-20 18:26+0200\n" +"PO-Revision-Date: 2011-08-20 18:27+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1280,10 +1280,9 @@ msgid "Cached memory" msgstr "Hukommelse i mellemlager" #: js/messages.php:109 -#, fuzzy #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "Bufferpool" +msgstr "Hukommelse i bufferl" #: js/messages.php:110 #, fuzzy From 94446ab3d1c5936e630c0bb55b2627df8aa7d221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:27:23 +0200 Subject: [PATCH 706/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index cf04dc3d4f..9315f0376a 100644 --- a/po/da.po +++ b/po/da.po @@ -1285,10 +1285,9 @@ msgid "Buffered memory" msgstr "Hukommelse i bufferl" #: js/messages.php:110 -#, fuzzy #| msgid "System memory" msgid "Free memory" -msgstr "Systemhukommelse" +msgstr "Ledig hukommelse" #: js/messages.php:111 #, fuzzy From ffe01b60cbb0b7160ae8d82bb1b913a26f53be69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:27:48 +0200 Subject: [PATCH 707/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 9315f0376a..51476d94bc 100644 --- a/po/da.po +++ b/po/da.po @@ -1290,10 +1290,9 @@ msgid "Free memory" msgstr "Ledig hukommelse" #: js/messages.php:111 -#, fuzzy #| msgid "System memory" msgid "Used memory" -msgstr "Systemhukommelse" +msgstr "Forbrugt hukommelse" #: js/messages.php:113 #, fuzzy From 77b91d6b4b5963e5af6ff3f808ecb92ba1eac3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:28:18 +0200 Subject: [PATCH 708/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 51476d94bc..7440805f19 100644 --- a/po/da.po +++ b/po/da.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-20 18:27+0200\n" +"PO-Revision-Date: 2011-08-20 18:28+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1295,10 +1295,9 @@ msgid "Used memory" msgstr "Forbrugt hukommelse" #: js/messages.php:113 -#, fuzzy #| msgid "Total" msgid "Total Swap" -msgstr "Total" +msgstr "Total sidelager" #: js/messages.php:114 msgid "Cached Swap" From 95f4bd61f402d241a69b11df57f9394ac07416c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:28:42 +0200 Subject: [PATCH 709/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7440805f19..5ad9a16c07 100644 --- a/po/da.po +++ b/po/da.po @@ -1301,7 +1301,7 @@ msgstr "Total sidelager" #: js/messages.php:114 msgid "Cached Swap" -msgstr "" +msgstr "Sidelager i mellemlager" #: js/messages.php:115 msgid "Used Swap" From 2804b956fb2e5c919e8fc30ea1d019afc063d5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:28:53 +0200 Subject: [PATCH 710/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 5ad9a16c07..44e35150f4 100644 --- a/po/da.po +++ b/po/da.po @@ -1305,7 +1305,7 @@ msgstr "Sidelager i mellemlager" #: js/messages.php:115 msgid "Used Swap" -msgstr "" +msgstr "Forbrugt sidelager" #: js/messages.php:116 #, fuzzy From 3d6715ac847c5c8dc7b2a8533ae6b7e3ee92b619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:29:13 +0200 Subject: [PATCH 711/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 44e35150f4..bdf7035d7a 100644 --- a/po/da.po +++ b/po/da.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-20 18:28+0200\n" +"PO-Revision-Date: 2011-08-20 18:29+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1308,10 +1308,9 @@ msgid "Used Swap" msgstr "Forbrugt sidelager" #: js/messages.php:116 -#, fuzzy #| msgid "Free pages" msgid "Free Swap" -msgstr "Frie sider" +msgstr "Ledigt sidelager" #: js/messages.php:118 msgid "Bytes sent" From 44ba375745412b12aa14df5d8f53fb88db1449b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:29:22 +0200 Subject: [PATCH 712/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index bdf7035d7a..f3376d9c67 100644 --- a/po/da.po +++ b/po/da.po @@ -1314,7 +1314,7 @@ msgstr "Ledigt sidelager" #: js/messages.php:118 msgid "Bytes sent" -msgstr "" +msgstr "Bytes sendt" #: js/messages.php:119 #, fuzzy From ea0019b98f4fd562018901308d8a947df8270425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:29:39 +0200 Subject: [PATCH 713/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index f3376d9c67..a29f2fdb4e 100644 --- a/po/da.po +++ b/po/da.po @@ -1317,10 +1317,9 @@ msgid "Bytes sent" msgstr "Bytes sendt" #: js/messages.php:119 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "Modtaget" +msgstr "Bytes modtaget" #: js/messages.php:120 server_status.php:1040 msgid "Connections" From 98320e0832ad96739cf44afaef0249e442bc73ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:30:15 +0200 Subject: [PATCH 714/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index a29f2fdb4e..9fa1d1ec4a 100644 --- a/po/da.po +++ b/po/da.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-20 18:29+0200\n" +"PO-Revision-Date: 2011-08-20 18:30+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1344,10 +1344,9 @@ msgid "Remove chart" msgstr "Fjern diagram" #: js/messages.php:128 -#, fuzzy #| msgid "Edit labels and series" msgid "Edit title and labels" -msgstr "Rediger overskrifter og serier" +msgstr "Rediger titel og etiketter" #: js/messages.php:129 msgid "Add chart to grid" From 62de273edacd78dfcc3462046dce63cd4e4b48bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:30:30 +0200 Subject: [PATCH 715/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 9fa1d1ec4a..74341720a3 100644 --- a/po/da.po +++ b/po/da.po @@ -1373,7 +1373,6 @@ msgid "Pause monitor" msgstr "Sæt monitor på pause" #: js/messages.php:136 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." msgstr "general_log og slow_query_log er aktiveret." From f5ed02fff0a2fb1d797d5c3a7c3eee3c8a830404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:30:59 +0200 Subject: [PATCH 716/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 74341720a3..2c9a7b3781 100644 --- a/po/da.po +++ b/po/da.po @@ -1386,7 +1386,6 @@ msgid "slow_query_log is enabled." msgstr "slow_query_log er aktiveret." #: js/messages.php:139 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "slow_query_log og general_log er deaktiveret." From e59b0abedd89177bedb3e501d0a9ae11fe184a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:32:50 +0200 Subject: [PATCH 717/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 2c9a7b3781..df13e18893 100644 --- a/po/da.po +++ b/po/da.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-20 18:30+0200\n" +"PO-Revision-Date: 2011-08-20 18:32+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1236,7 +1236,7 @@ msgstr "Effektivitet af forespørgsels-mellemlager" #: js/messages.php:97 po/advisory_rules.php:70 #| msgid "Query cache" msgid "Query cache usage" -msgstr "Forbrug af forespørgsels-mellemlager" +msgstr "Forespørgsels-cache forbrug" #: js/messages.php:98 #| msgid "Query cache" From 620b7c2608940d5bbf42ae86fc3316662871988e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:33:11 +0200 Subject: [PATCH 718/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index df13e18893..566de3597e 100644 --- a/po/da.po +++ b/po/da.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-20 18:32+0200\n" +"PO-Revision-Date: 2011-08-20 18:33+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1236,7 +1236,7 @@ msgstr "Effektivitet af forespørgsels-mellemlager" #: js/messages.php:97 po/advisory_rules.php:70 #| msgid "Query cache" msgid "Query cache usage" -msgstr "Forespørgsels-cache forbrug" +msgstr "Forbrug af forespørgsels-mellemlager" #: js/messages.php:98 #| msgid "Query cache" From 41b1e6524ae6fc92e5f593541f6d42235e1d54db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:33:52 +0200 Subject: [PATCH 719/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 566de3597e..4c08cd4ab7 100644 --- a/po/da.po +++ b/po/da.po @@ -1282,7 +1282,7 @@ msgstr "Hukommelse i mellemlager" #: js/messages.php:109 #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "Hukommelse i bufferl" +msgstr "Buffer hukommelse" #: js/messages.php:110 #| msgid "System memory" From 21d2627a2029dfc8854ce4d15862065af96c6995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:34:10 +0200 Subject: [PATCH 720/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 4c08cd4ab7..53b1545229 100644 --- a/po/da.po +++ b/po/da.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-20 18:33+0200\n" +"PO-Revision-Date: 2011-08-20 18:34+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1282,7 +1282,7 @@ msgstr "Hukommelse i mellemlager" #: js/messages.php:109 #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "Buffer hukommelse" +msgstr "Hukommelse i buffer" #: js/messages.php:110 #| msgid "System memory" From ce860fb1411b0faa2e973c4a7e0b89bc2f0826d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:34:43 +0200 Subject: [PATCH 721/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 53b1545229..cb3f81816f 100644 --- a/po/da.po +++ b/po/da.po @@ -1297,7 +1297,7 @@ msgstr "Forbrugt hukommelse" #: js/messages.php:113 #| msgid "Total" msgid "Total Swap" -msgstr "Total sidelager" +msgstr "Totalt sidelager" #: js/messages.php:114 msgid "Cached Swap" From 5b4c1fd20eb1981e42d49dd85ed1621a7ceae835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:35:02 +0200 Subject: [PATCH 722/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index cb3f81816f..3a788cca8b 100644 --- a/po/da.po +++ b/po/da.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-20 18:34+0200\n" +"PO-Revision-Date: 2011-08-20 18:35+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" From 2ee6bd482d1f79afa2d090408a23c7166fbb8535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:36:36 +0200 Subject: [PATCH 723/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 3a788cca8b..7bc9c6f6d8 100644 --- a/po/da.po +++ b/po/da.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-20 18:35+0200\n" +"PO-Revision-Date: 2011-08-20 18:36+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1489,7 +1489,6 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analyserer & indlæser logs. Dette kan vare nogen tid." #: js/messages.php:165 -#, fuzzy #| msgid "" #| "This columns shows the amount of identical queries that are grouped " #| "together. However only the SQL Text is being compared, thus the queries " From 21722bfc98bc7217e44fd971a1a7a352b3fba8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:36:48 +0200 Subject: [PATCH 724/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7bc9c6f6d8..675b2691e0 100644 --- a/po/da.po +++ b/po/da.po @@ -1521,7 +1521,6 @@ msgid "Jump to Log table" msgstr "Gå til logtabellen" #: js/messages.php:170 -#, fuzzy #| msgid "Log analysed, but not data found in this time span." msgid "Log analysed, but no data found in this time span." msgstr "Loggen er analyseret, men ingen data fundet i dette tidsinterval." From 179f91d004867e2dfb2a819adc0b41668cbde966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:37:10 +0200 Subject: [PATCH 725/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 675b2691e0..22b6883ba8 100644 --- a/po/da.po +++ b/po/da.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-20 18:36+0200\n" +"PO-Revision-Date: 2011-08-20 18:37+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1527,10 +1527,9 @@ msgstr "Loggen er analyseret, men ingen data fundet i dette tidsinterval." #. l10n: A collection of available filters #: js/messages.php:173 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Filter" +msgstr "Filtre" #. l10n: Filter as in "Start Filtering" #: js/messages.php:175 From 9d933b7d47e4539acd0773cc0afa6e5991c526e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:37:24 +0200 Subject: [PATCH 726/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 22b6883ba8..19f095e00f 100644 --- a/po/da.po +++ b/po/da.po @@ -1538,7 +1538,7 @@ msgstr "Filter" #: js/messages.php:176 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Filtrer forespørgsler efter ord/regex:" #: js/messages.php:177 msgid "Group queries, ignoring variable data in WHERE clauses" From e929f96dccf2ac283ae03e4fafe2643255128255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:38:05 +0200 Subject: [PATCH 727/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 19f095e00f..5ef49ccb4f 100644 --- a/po/da.po +++ b/po/da.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-20 18:37+0200\n" +"PO-Revision-Date: 2011-08-20 18:38+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1542,7 +1542,7 @@ msgstr "Filtrer forespørgsler efter ord/regex:" #: js/messages.php:177 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "" +msgstr "Grupper forespørgsler, og ignorer variabeldata i WHERE klausuler" #: js/messages.php:178 #, fuzzy From 6efd496c626a2aeed4c06bc832809ba219c5104a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:38:21 +0200 Subject: [PATCH 728/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 5ef49ccb4f..35cc131852 100644 --- a/po/da.po +++ b/po/da.po @@ -1545,10 +1545,9 @@ msgid "Group queries, ignoring variable data in WHERE clauses" msgstr "Grupper forespørgsler, og ignorer variabeldata i WHERE klausuler" #: js/messages.php:178 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Antal indsatte rækker" +msgstr "Sum af grupperede rækker:" #: js/messages.php:179 #, fuzzy From 07672c452ced7a039530838cc9763fa00facf0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:38:45 +0200 Subject: [PATCH 729/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 35cc131852..5ecb1853ee 100644 --- a/po/da.po +++ b/po/da.po @@ -1550,10 +1550,9 @@ msgid "Sum of grouped rows:" msgstr "Sum af grupperede rækker:" #: js/messages.php:179 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Total" +msgstr "Total:" #: js/messages.php:181 msgid "Loading logs" From c82f003ccb7f45fe690148dcae03d3ef7e460e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:39:02 +0200 Subject: [PATCH 730/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 5ecb1853ee..b57ad98a0e 100644 --- a/po/da.po +++ b/po/da.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-20 18:38+0200\n" +"PO-Revision-Date: 2011-08-20 18:39+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1560,7 +1560,7 @@ msgstr "Indlæser logs" #: js/messages.php:182 msgid "Monitor refresh failed" -msgstr "" +msgstr "Skærmopfriskning fejlede" #: js/messages.php:183 msgid "" From 64dc7e084cf3e87843d2986330516fc7bef59746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:39:34 +0200 Subject: [PATCH 731/971] Translation update done using Pootle. --- po/da.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/da.po b/po/da.po index b57ad98a0e..1ee0c294f9 100644 --- a/po/da.po +++ b/po/da.po @@ -1568,6 +1568,10 @@ msgid "" "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." msgstr "" +"Serveren returnerede et ugyldigt svar mens der blev anmodet om nye " +"diagramdata. Dette er sandsynligvis fordi din session er udløbet. " +"Genindlæsning af siden og genindtastning af dine legitimationsoplysninger " +"burde hjælpe." #: js/messages.php:184 #, fuzzy From 5592610a0901ecc764d4181d407998d6103bd35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:39:43 +0200 Subject: [PATCH 732/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 1ee0c294f9..3c09654523 100644 --- a/po/da.po +++ b/po/da.po @@ -1574,10 +1574,9 @@ msgstr "" "burde hjælpe." #: js/messages.php:184 -#, fuzzy #| msgid "Reload" msgid "Reload page" -msgstr "Genindlæs" +msgstr "Genindlæs side" #: js/messages.php:186 msgid "Affected rows:" From fdc05aacdcb77975d60274ab7b5ccb8c77885ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:39:53 +0200 Subject: [PATCH 733/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 3c09654523..07562d77b1 100644 --- a/po/da.po +++ b/po/da.po @@ -1580,7 +1580,7 @@ msgstr "Genindlæs side" #: js/messages.php:186 msgid "Affected rows:" -msgstr "" +msgstr "Berørte rækker:" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" From 08e23dffdf83623fba4b88aa12bea7979c5df1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:40:06 +0200 Subject: [PATCH 734/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 07562d77b1..a1e5c228ff 100644 --- a/po/da.po +++ b/po/da.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-20 18:39+0200\n" +"PO-Revision-Date: 2011-08-20 18:40+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1585,6 +1585,8 @@ msgstr "Berørte rækker:" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" +"Kunne ikke fortolke konfigurationsfilen. Det ser ikke ud til at være gyldig " +"JSON kode" #: js/messages.php:189 msgid "" From ac1e73c0c3ceabece7220a2b842d717183c72efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:40:42 +0200 Subject: [PATCH 735/971] Translation update done using Pootle. --- po/da.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/da.po b/po/da.po index a1e5c228ff..76ceaca0f8 100644 --- a/po/da.po +++ b/po/da.po @@ -1593,6 +1593,8 @@ msgid "" "Failed building chart grid with imported config. Resetting to default " "config..." msgstr "" +"Kunne ikke bygge diagramgitter med den importerede konfiguration. Nulstiller " +"til standard konfiguration..." #: js/messages.php:190 libraries/config/messages.inc.php:170 #: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69 From 49331672e4f8c7dcf99105371f483abe023e63e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:41:00 +0200 Subject: [PATCH 736/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 76ceaca0f8..c0e4fb0a94 100644 --- a/po/da.po +++ b/po/da.po @@ -1604,10 +1604,9 @@ msgid "Import" msgstr "Importer" #: js/messages.php:192 -#, fuzzy #| msgid "Update Query" msgid "Analyse Query" -msgstr "Opdater forespørgsel" +msgstr "Analyser forespørgsel" #: js/messages.php:196 #, fuzzy From fd5afcc2413b4c796ce20966490a057f64a0b84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:41:02 +0200 Subject: [PATCH 737/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index c0e4fb0a94..6ecebcf7e3 100644 --- a/po/da.po +++ b/po/da.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-20 18:40+0200\n" +"PO-Revision-Date: 2011-08-20 18:41+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" From 44e13cb462defc8e6c71df4e3909dff81093b5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:41:50 +0200 Subject: [PATCH 738/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6ecebcf7e3..480af00536 100644 --- a/po/da.po +++ b/po/da.po @@ -1609,10 +1609,9 @@ msgid "Analyse Query" msgstr "Analyser forespørgsel" #: js/messages.php:196 -#, fuzzy #| msgid "Apply a divisor" msgid "Advisor system" -msgstr "Anvend divisor" +msgstr "Rådgivningssystem" #: js/messages.php:197 msgid "Possible performance issues" From b9d17cdec9cd784d8e74b980f723173257f26651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:41:58 +0200 Subject: [PATCH 739/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 480af00536..75a1025e97 100644 --- a/po/da.po +++ b/po/da.po @@ -1615,7 +1615,7 @@ msgstr "Rådgivningssystem" #: js/messages.php:197 msgid "Possible performance issues" -msgstr "" +msgstr "Mulige ydelsesmæssige problemer" #: js/messages.php:198 msgid "Issue" From c01ad1395dc5d5d211198867a3d563184aab14dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:00 +0200 Subject: [PATCH 740/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 75a1025e97..0196a45ea4 100644 --- a/po/da.po +++ b/po/da.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-20 18:41+0200\n" +"PO-Revision-Date: 2011-08-20 18:42+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" From b6ba253f19ef00c8117065bca68a78fd4237100c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:08 +0200 Subject: [PATCH 741/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 0196a45ea4..eef174e2f0 100644 --- a/po/da.po +++ b/po/da.po @@ -1619,7 +1619,7 @@ msgstr "Mulige ydelsesmæssige problemer" #: js/messages.php:198 msgid "Issue" -msgstr "" +msgstr "Problem" #: js/messages.php:199 #, fuzzy From 8d76b7892cddaaa848771f35ef459e8bb812318c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:14 +0200 Subject: [PATCH 742/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index eef174e2f0..e3bcab63cf 100644 --- a/po/da.po +++ b/po/da.po @@ -1622,10 +1622,9 @@ msgid "Issue" msgstr "Problem" #: js/messages.php:199 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Dokumentation" +msgstr "Anbefaling" #: js/messages.php:200 #, fuzzy From aa24a974d84cbb629d861bcacfc02cb6199a51f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:23 +0200 Subject: [PATCH 743/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index e3bcab63cf..f0c858b65e 100644 --- a/po/da.po +++ b/po/da.po @@ -1627,10 +1627,9 @@ msgid "Recommendation" msgstr "Anbefaling" #: js/messages.php:200 -#, fuzzy #| msgid "Details" msgid "Rule details" -msgstr "Detaljer" +msgstr "Regel-detaljer" #: js/messages.php:201 #, fuzzy From c107846b2615b44c4ee473b23a4709cd33986998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:27 +0200 Subject: [PATCH 744/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f0c858b65e..7f5bb4baae 100644 --- a/po/da.po +++ b/po/da.po @@ -1629,7 +1629,7 @@ msgstr "Anbefaling" #: js/messages.php:200 #| msgid "Details" msgid "Rule details" -msgstr "Regel-detaljer" +msgstr "Regeldetaljer" #: js/messages.php:201 #, fuzzy From 2f78609b22d1cd1fba8da7bab1b6d5cd96ab5f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:37 +0200 Subject: [PATCH 745/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 7f5bb4baae..11b1af1790 100644 --- a/po/da.po +++ b/po/da.po @@ -1632,10 +1632,9 @@ msgid "Rule details" msgstr "Regeldetaljer" #: js/messages.php:201 -#, fuzzy #| msgid "Authentication" msgid "Justification" -msgstr "Autentifikation" +msgstr "Begrundelse" #: js/messages.php:202 msgid "Used variable / formula" From da980defd2a4ba218168e50bc5185f00a5c3aaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:49 +0200 Subject: [PATCH 746/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 11b1af1790..e022845470 100644 --- a/po/da.po +++ b/po/da.po @@ -1638,7 +1638,7 @@ msgstr "Begrundelse" #: js/messages.php:202 msgid "Used variable / formula" -msgstr "" +msgstr "Brugt variabel/formel" #: js/messages.php:203 msgid "Test" From 75f8a78c2d13764838593bbb59f3effc825ae2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:42:57 +0200 Subject: [PATCH 747/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index e022845470..ab0c9f1664 100644 --- a/po/da.po +++ b/po/da.po @@ -1642,7 +1642,7 @@ msgstr "Brugt variabel/formel" #: js/messages.php:203 msgid "Test" -msgstr "" +msgstr "Test" #: js/messages.php:208 libraries/tbl_properties.inc.php:763 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 From c21a8ed5cb02bfa3e37baa6815874d9db5b30b1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:43:23 +0200 Subject: [PATCH 748/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index ab0c9f1664..fbf5ebec2b 100644 --- a/po/da.po +++ b/po/da.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-20 18:42+0200\n" +"PO-Revision-Date: 2011-08-20 18:43+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1765,10 +1765,9 @@ msgid "Change" msgstr "Ændre" #: js/messages.php:252 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Maksimal eksekveringstid" +msgstr "Eksekveringstid for forespørgsel" #: js/messages.php:255 libraries/config/FormDisplay.tpl.php:323 #: libraries/schema/User_Schema.class.php:334 From 15ff30977d45c2227db73edc5b662b24ed782496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:43:42 +0200 Subject: [PATCH 749/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index fbf5ebec2b..64b11b2e01 100644 --- a/po/da.po +++ b/po/da.po @@ -1786,10 +1786,9 @@ msgid "Show search criteria" msgstr "Vis søgekriterie" #: js/messages.php:262 libraries/tbl_select.lib.php:150 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Søg" +msgstr "Forstør søgning" #: js/messages.php:264 msgid "Each point represents a data row." From 6e70559f88fd570d0cf991a49a917b9779f48c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:44:10 +0200 Subject: [PATCH 750/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 64b11b2e01..5b04f963b5 100644 --- a/po/da.po +++ b/po/da.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-20 18:43+0200\n" +"PO-Revision-Date: 2011-08-20 18:44+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1792,7 +1792,7 @@ msgstr "Forstør søgning" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Hvert punkt repræsenterer en datarække" #: js/messages.php:266 msgid "Hovering over a point will show its label." From 1bda870ef876a317dffc701d4c2eb87bf2f33e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:44:18 +0200 Subject: [PATCH 751/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 5b04f963b5..7b41ec1327 100644 --- a/po/da.po +++ b/po/da.po @@ -1788,7 +1788,7 @@ msgstr "Vis søgekriterie" #: js/messages.php:262 libraries/tbl_select.lib.php:150 #| msgid "Search" msgid "Zoom Search" -msgstr "Forstør søgning" +msgstr "Forstør søgning" #: js/messages.php:264 msgid "Each point represents a data row." From 2916ee049f65283d74354526dcdb28f7b58de9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:45:16 +0200 Subject: [PATCH 752/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 7b41ec1327..ca7ca3f9e6 100644 --- a/po/da.po +++ b/po/da.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-20 18:44+0200\n" +"PO-Revision-Date: 2011-08-20 18:45+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1796,7 +1796,7 @@ msgstr "Hvert punkt repræsenterer en datarække" #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Ved at holde pointeren over et punkt vises dets etiket" #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." From a31c5ded54416488639b50fab8333ac96ae34370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:45:56 +0200 Subject: [PATCH 753/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index ca7ca3f9e6..b2f2856561 100644 --- a/po/da.po +++ b/po/da.po @@ -1800,7 +1800,7 @@ msgstr "Ved at holde pointeren over et punkt vises dets etiket" #: js/messages.php:268 msgid "Drag and select an area in the plot to zoom into it." -msgstr "" +msgstr "Træk og vælg et område i plottet for at forstørre det." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." From 33ec80cf637cf5dc7961a1c5922dd524392b6045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:46:49 +0200 Subject: [PATCH 754/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index b2f2856561..2d991f888a 100644 --- a/po/da.po +++ b/po/da.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-20 18:45+0200\n" +"PO-Revision-Date: 2011-08-20 18:46+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1805,6 +1805,8 @@ msgstr "Træk og vælg et område i plottet for at forstørre det." #: js/messages.php:270 msgid "Click reset zoom link to come back to original state." msgstr "" +"Klik på linket for nulstil zoom for at vende tilbage til den oprindelige " +"tilstand." #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." From d2d5e9a9f840b61dc1ed4de4b673d1f36a1cc2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:47:27 +0200 Subject: [PATCH 755/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 2d991f888a..5df424e578 100644 --- a/po/da.po +++ b/po/da.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-20 18:46+0200\n" +"PO-Revision-Date: 2011-08-20 18:47+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1810,7 +1810,7 @@ msgstr "" #: js/messages.php:272 msgid "Click a data point to view and possibly edit the data row." -msgstr "" +msgstr "Klik et datapunkt for at se og muligvis redigere datarækken" #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." From c67881f189c04f643fbc8be9fb07ac698619fcc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:48:27 +0200 Subject: [PATCH 756/971] Translation update done using Pootle. --- po/da.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 5df424e578..47973e670f 100644 --- a/po/da.po +++ b/po/da.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-20 18:47+0200\n" +"PO-Revision-Date: 2011-08-20 18:48+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1815,6 +1815,7 @@ msgstr "Klik et datapunkt for at se og muligvis redigere datarækken" #: js/messages.php:274 msgid "The plot can be resized by dragging it along the bottom right corner." msgstr "" +"Plottet kan ændres i størrelse ved at trække det i nederste højre hjørne." #: js/messages.php:276 msgid "Strings are converted into integer for plotting" From 72d70acca19e84713aa3b8c29831c3db1e1092f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:48:54 +0200 Subject: [PATCH 757/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 47973e670f..4c927abf45 100644 --- a/po/da.po +++ b/po/da.po @@ -1819,7 +1819,7 @@ msgstr "" #: js/messages.php:276 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Strenge er konverteret til heltal i plottet." #: js/messages.php:278 #, fuzzy From e574bb82ca97970e83b871c04be63744dbe10312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:49:09 +0200 Subject: [PATCH 758/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 4c927abf45..364f79e45b 100644 --- a/po/da.po +++ b/po/da.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-20 18:48+0200\n" +"PO-Revision-Date: 2011-08-20 18:49+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1822,10 +1822,9 @@ msgid "Strings are converted into integer for plotting" msgstr "Strenge er konverteret til heltal i plottet." #: js/messages.php:278 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Tilføj/Slet kolonner" +msgstr "Vælg to kolonner" #: js/messages.php:279 msgid "Select two different columns" From affa88ffecd123e35899351d17f88dce6daaf7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:49:22 +0200 Subject: [PATCH 759/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 364f79e45b..6c9bf09cc4 100644 --- a/po/da.po +++ b/po/da.po @@ -1828,7 +1828,7 @@ msgstr "Vælg to kolonner" #: js/messages.php:279 msgid "Select two different columns" -msgstr "" +msgstr "Vælg to forskellige kolonner" #: js/messages.php:282 tbl_change.php:317 tbl_indexes.php:211 #: tbl_indexes.php:238 From 2db45324b0b55db3225f355284486a23b208fe11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:49:29 +0200 Subject: [PATCH 760/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 6c9bf09cc4..cdf943acb0 100644 --- a/po/da.po +++ b/po/da.po @@ -1841,7 +1841,7 @@ msgstr "Kopi" #: js/messages.php:291 msgid "Outer Ring" -msgstr "" +msgstr "Ydre ring" #: js/messages.php:297 #, fuzzy From 8329baa30181e027b71abf145e0279a34fc52b24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:49:36 +0200 Subject: [PATCH 761/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index cdf943acb0..6430d5b533 100644 --- a/po/da.po +++ b/po/da.po @@ -1844,10 +1844,9 @@ msgid "Outer Ring" msgstr "Ydre ring" #: js/messages.php:297 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Tilføj kolonne" +msgstr "Tilføj kolonner" #: js/messages.php:300 msgid "Select referenced key" From d9d632aeedc08346c3c95c949c15d9a9b3954035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:50:15 +0200 Subject: [PATCH 762/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6430d5b533..dc23df3e57 100644 --- a/po/da.po +++ b/po/da.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-20 18:49+0200\n" +"PO-Revision-Date: 2011-08-20 18:50+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1878,7 +1878,7 @@ msgstr "Tilføj mulighed for kolonne" #: js/messages.php:310 msgid "Press escape to cancel editing" -msgstr "" +msgstr "Tryk på ESC for at annullere redigeringen." #: js/messages.php:311 msgid "" From d3592eeff489a02b3b2c330170666e6f7f9f637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:51:05 +0200 Subject: [PATCH 763/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index dc23df3e57..1bf5d10af9 100644 --- a/po/da.po +++ b/po/da.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-20 18:50+0200\n" +"PO-Revision-Date: 2011-08-20 18:51+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1885,6 +1885,8 @@ msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" +"Du har redigeret nogle data og de er ikke blevet gemt. Er du sikker på, at " +"du vil forlade siden uden at gemme data ?" #: js/messages.php:312 msgid "Drag to reorder" From eeee11568bbab394ce2c869672e02fdcfcad20f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:57:50 +0200 Subject: [PATCH 764/971] Translation update done using Pootle. --- po/da.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 1bf5d10af9..b557891c70 100644 --- a/po/da.po +++ b/po/da.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-20 18:51+0200\n" +"PO-Revision-Date: 2011-08-20 18:57+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1909,6 +1909,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 "" +"Denne tabel indeholder ikke en unik kolonne. Funktioner relateret til " +"redigering af gitter, afkrydsningsboks og links til redigering, kopiering og " +"sletning fungerer måske ikke, efter at data er gemt. " #: js/messages.php:318 msgid "" From cff0821cc9145f49120e11533a6a07f5ab90b835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:58:42 +0200 Subject: [PATCH 765/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index b557891c70..221755fdd1 100644 --- a/po/da.po +++ b/po/da.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-20 18:57+0200\n" +"PO-Revision-Date: 2011-08-20 18:58+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1917,6 +1917,8 @@ msgstr "" msgid "" "You can also edit most columns
    by clicking directly on their content." msgstr "" +"Du kan også redigere de fleste kolonner
    ved at klikke direkte på deres " +"indhold." #: js/messages.php:319 #, fuzzy From e2134b7f0b0a5ea518902656c88cbea98e219d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:58:53 +0200 Subject: [PATCH 766/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 221755fdd1..af637f8a22 100644 --- a/po/da.po +++ b/po/da.po @@ -1921,10 +1921,9 @@ msgstr "" "indhold." #: js/messages.php:319 -#, fuzzy #| msgid "Go to view" msgid "Go to link" -msgstr "Gå til view" +msgstr "Gå til link" #: js/messages.php:322 msgid "Generate password" From a5dcb44c06be64e06db25e2704713cfa22996ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:58:59 +0200 Subject: [PATCH 767/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index af637f8a22..6bead0836e 100644 --- a/po/da.po +++ b/po/da.po @@ -1965,7 +1965,6 @@ msgid "Done" msgstr "Færdig" #: js/messages.php:356 -#, fuzzy #| msgid "Prev" msgctxt "Previous month" msgid "Prev" From 1b88ccb51f0e303fe35d0ad51caffdd007e5083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:59:04 +0200 Subject: [PATCH 768/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6bead0836e..96644cfff8 100644 --- a/po/da.po +++ b/po/da.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-20 18:58+0200\n" +"PO-Revision-Date: 2011-08-20 18:59+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -1971,7 +1971,6 @@ msgid "Prev" msgstr "Forrige" #: js/messages.php:361 -#, fuzzy #| msgid "Next" msgctxt "Next month" msgid "Next" From dd065d0c14f5b4a417e70452408deb3726be9b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 18:59:11 +0200 Subject: [PATCH 769/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 96644cfff8..af5f30e8dd 100644 --- a/po/da.po +++ b/po/da.po @@ -2120,7 +2120,6 @@ msgstr "lørdag" #. l10n: Short week day name #: js/messages.php:417 -#, fuzzy #| msgctxt "Short week day name" #| msgid "Sun" msgid "Sun" From 96523fd3ea04af6764f439468c8a67d9e5dc516c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:00:00 +0200 Subject: [PATCH 770/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index af5f30e8dd..6befd6f970 100644 --- a/po/da.po +++ b/po/da.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-20 18:59+0200\n" +"PO-Revision-Date: 2011-08-20 19:00+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -2210,7 +2210,7 @@ msgstr "Sekund" #: libraries/Advisor.class.php:145 #, php-format msgid "Failed formatting string for rule '%s'. PHP threw following error: %s" -msgstr "" +msgstr "Fejlende formatteringsstreng for regel '%s'. PHP gav følgende fejl: %s" #: libraries/Config.class.php:1159 msgid "Font size" From ca51480d0cb63732b4cee4a957b4f27621f4f2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:00:39 +0200 Subject: [PATCH 771/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6befd6f970..64279c896e 100644 --- a/po/da.po +++ b/po/da.po @@ -2354,10 +2354,9 @@ msgstr[0] "%1$d række sat ind." msgstr[1] "%1$d rækker sat ind." #: libraries/PDF.class.php:81 -#, fuzzy #| msgid "Allows reading data." msgid "Error while creating PDF:" -msgstr "Tillader læsning af data." +msgstr "Fejl ved oprettelse af PDF:" #: libraries/RecentTable.class.php:107 msgid "Could not save recent table" From 324be46aa95c61be278ff2a6da1225dd8b997059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:00:56 +0200 Subject: [PATCH 772/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 64279c896e..300b5dd7e6 100644 --- a/po/da.po +++ b/po/da.po @@ -2393,10 +2393,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "Denne MySQL-server understøtter ikke %s datalager." #: libraries/Table.class.php:303 -#, fuzzy #| msgid "Show slave status" msgid "unknown table status: " -msgstr "Vis slavestatus" +msgstr "ukendt tabelstatus:" #: libraries/Table.class.php:1034 msgid "Invalid database" From 85b6528a86549aeacaca233ac1d06f11dca2e649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:01:20 +0200 Subject: [PATCH 773/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 300b5dd7e6..268833d5f1 100644 --- a/po/da.po +++ b/po/da.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-20 19:00+0200\n" +"PO-Revision-Date: 2011-08-20 19:01+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -2587,10 +2587,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS hent BLOB info mislykkedes:" #: libraries/blobstreaming.lib.php:337 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "hent BLOB Content-Type mislykkedes" +msgstr "PBMS hent BLOB Content-Type mislykkedes" #: libraries/blobstreaming.lib.php:363 msgid "View image" From c519531a683af66ac31a8891abfe254eeb1b9eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:01:27 +0200 Subject: [PATCH 774/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 268833d5f1..f4a80d7a97 100644 --- a/po/da.po +++ b/po/da.po @@ -2858,7 +2858,6 @@ msgstr "Manglende parameter" #: libraries/common.lib.php:2294 libraries/common.lib.php:2297 #: libraries/display_tbl.lib.php:306 -#, fuzzy #| msgid "Begin" msgctxt "First page" msgid "Begin" From 2677e9885d52d2a5b01dc91c967100ae84b5a56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:01:32 +0200 Subject: [PATCH 775/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index f4a80d7a97..372006c86a 100644 --- a/po/da.po +++ b/po/da.po @@ -2866,7 +2866,6 @@ msgstr "Start" #: libraries/common.lib.php:2295 libraries/common.lib.php:2298 #: libraries/display_tbl.lib.php:307 server_binlog.php:135 #: server_binlog.php:137 -#, fuzzy #| msgid "Previous" msgctxt "Previous page" msgid "Previous" From 693aa49f46da0af27f835f0e2b4ccfaf73bfe232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:01:37 +0200 Subject: [PATCH 776/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 372006c86a..1ec38602a6 100644 --- a/po/da.po +++ b/po/da.po @@ -2874,7 +2874,6 @@ msgstr "Forrige" #: libraries/common.lib.php:2324 libraries/common.lib.php:2327 #: libraries/display_tbl.lib.php:370 server_binlog.php:170 #: server_binlog.php:172 -#, fuzzy #| msgid "Next" msgctxt "Next page" msgid "Next" From 7333225ae8d38b2152730a0e9a146d32827571fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:01:43 +0200 Subject: [PATCH 777/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 1ec38602a6..be634b0638 100644 --- a/po/da.po +++ b/po/da.po @@ -2881,7 +2881,6 @@ msgstr "Næste" #: libraries/common.lib.php:2325 libraries/common.lib.php:2328 #: libraries/display_tbl.lib.php:385 -#, fuzzy #| msgid "End" msgctxt "Last page" msgid "End" From d4730726f57377589c50e864740ce3a8ad3ba131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:02:02 +0200 Subject: [PATCH 778/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index be634b0638..93d9bb297d 100644 --- a/po/da.po +++ b/po/da.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-20 19:01+0200\n" +"PO-Revision-Date: 2011-08-20 19:02+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -4256,10 +4256,9 @@ msgid "Memory limit" msgstr "Hukommelsesgrænse" #: libraries/config/messages.inc.php:319 -#, fuzzy #| msgid "These are Edit, Inline edit, Copy and Delete links" msgid "These are Edit, Copy and Delete links" -msgstr "Dette er Ret, Ret linje, Kopi og Slet links" +msgstr "Dette er Ret, Kopi og Slet links" #: libraries/config/messages.inc.php:320 msgid "Where to show the table row links" From 7f3026a3cecf27334c54e07d21b8462a782d2637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:02:33 +0200 Subject: [PATCH 779/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 93d9bb297d..ca0162fa3e 100644 --- a/po/da.po +++ b/po/da.po @@ -4414,7 +4414,7 @@ msgstr "Vis hjælpeknap" #: libraries/config/messages.inc.php:357 msgid "Save all edited cells at once" -msgstr "" +msgstr "Gem alle redigerede celler med det samme" #: libraries/config/messages.inc.php:358 msgid "Directory where exports can be saved on server" From 4e9f420b50bceb79e494e64880ac93533e673a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:03:31 +0200 Subject: [PATCH 780/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index ca0162fa3e..d0bda8d000 100644 --- a/po/da.po +++ b/po/da.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-20 19:02+0200\n" +"PO-Revision-Date: 2011-08-20 19:03+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -4614,10 +4614,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:399 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" -msgstr "Maksimalt antal tabeller vist i tabellisten" +msgstr "Maksimalt antal rækker gemt i tabellen \"table_uiprefs\"" #: libraries/config/messages.inc.php:400 msgid "Try to connect without password" From 20b5c4bd6292b39d3971c91864fcb5014e62dd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:04:11 +0200 Subject: [PATCH 781/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index d0bda8d000..88eac2653e 100644 --- a/po/da.po +++ b/po/da.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-20 19:03+0200\n" +"PO-Revision-Date: 2011-08-20 19:04+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -4950,10 +4950,9 @@ msgid "Show function fields" msgstr "Vis funktionsfelter" #: libraries/config/messages.inc.php:462 -#, fuzzy #| msgid "Where to show the table row links" msgid "Whether to show hint or not" -msgstr "Hvor links til tablerækker skal vises" +msgstr "Om hints skal vises eller ej" #: libraries/config/messages.inc.php:463 #, fuzzy From 1e8d1c5d5bc98d712a3caa0b693d9445f99842a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:04:21 +0200 Subject: [PATCH 782/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 88eac2653e..1d6ea830ca 100644 --- a/po/da.po +++ b/po/da.po @@ -4955,10 +4955,9 @@ msgid "Whether to show hint or not" msgstr "Om hints skal vises eller ej" #: libraries/config/messages.inc.php:463 -#, fuzzy #| msgid "Show indexes" msgid "Show hint" -msgstr "Vis indekser" +msgstr "Vis hint" #: libraries/config/messages.inc.php:464 msgid "" From d80b9b1c9f79351b9d75d952605276593d1e2136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:04:39 +0200 Subject: [PATCH 783/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 1d6ea830ca..0a49da5878 100644 --- a/po/da.po +++ b/po/da.po @@ -5685,10 +5685,9 @@ msgid "Language" msgstr "Sprog" #: libraries/display_tbl.lib.php:401 -#, fuzzy #| msgid "Save directory" msgid "Save edited data" -msgstr "Gemmemappe" +msgstr "Gem redigerede data" #: libraries/display_tbl.lib.php:407 msgid "Restore column order" From c9ebb842a716703a6660385fd0faccf70cb528ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:04:50 +0200 Subject: [PATCH 784/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 0a49da5878..a19b364664 100644 --- a/po/da.po +++ b/po/da.po @@ -6575,10 +6575,9 @@ msgid "Stand-in structure for view" msgstr "Stand-in-struktur for visning" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Tillader læsning af data." +msgstr "Fejl ved læsning af data." #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" From dd2088960c439dcd0513e4cdf8981ba828ce82e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:05:03 +0200 Subject: [PATCH 785/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index a19b364664..4f7fc10711 100644 --- a/po/da.po +++ b/po/da.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-20 19:04+0200\n" +"PO-Revision-Date: 2011-08-20 19:05+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -6623,7 +6623,6 @@ msgid "" msgstr "De følgende strukturer er enten oprettet eller ændret. Her kan du: " #: libraries/import.lib.php:1095 -#, fuzzy #| msgid "View a structure`s contents by clicking on its name" msgid "View a structure's contents by clicking on its name" msgstr "Vis en strukturs indhold ved at klikke på dens navn" From ac6450e6022c8f84f334187863f18a7f28141532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:05:18 +0200 Subject: [PATCH 786/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 4f7fc10711..cbe0ba1ccd 100644 --- a/po/da.po +++ b/po/da.po @@ -6634,10 +6634,9 @@ msgstr "" "Ændr alle indstillinger ved at klikke på det tilhørende \"Indstilling\" link" #: libraries/import.lib.php:1097 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Rediger dens struktur ved at følge linket \"Struktur\"" +msgstr "Rediger struktur ved at følge linket \"Struktur\"" #: libraries/import.lib.php:1100 msgid "Go to database" From 1a94c2644fc4dc1c9302d0ea07e2220e6190f528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:05:45 +0200 Subject: [PATCH 787/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index cbe0ba1ccd..a2225d09c5 100644 --- a/po/da.po +++ b/po/da.po @@ -6643,10 +6643,10 @@ msgid "Go to database" msgstr "Gå til database" #: libraries/import.lib.php:1103 libraries/import.lib.php:1126 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "Manglende data for %s" +msgstr "Rediger indstillinger for %s" #: libraries/import.lib.php:1121 msgid "Go to table" From 3116218d25981669f9062caa9debe65e926699f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:05:58 +0200 Subject: [PATCH 788/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index a2225d09c5..6d1646a875 100644 --- a/po/da.po +++ b/po/da.po @@ -6653,10 +6653,10 @@ msgid "Go to table" msgstr "Gå til tabel" #: libraries/import.lib.php:1124 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Kun strukturen" +msgstr "Strukturen af %s" #: libraries/import.lib.php:1130 msgid "Go to view" From db818247dcfaff82ec4094499f73df880f375b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:06:13 +0200 Subject: [PATCH 789/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 6d1646a875..8485186406 100644 --- a/po/da.po +++ b/po/da.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-20 19:05+0200\n" +"PO-Revision-Date: 2011-08-20 19:06+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -6737,7 +6737,7 @@ msgstr "Import valutaer (ex. $5.00 to 5.00)" #: libraries/import/shp.php:14 msgid "ESRI Shape File" -msgstr "" +msgstr "ESRI formfil" #: libraries/import/shp.php:254 #, php-format From c3dbdaa4c11d04defaec36e6ba04582f82bdba85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:06:38 +0200 Subject: [PATCH 790/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 8485186406..7a755e7dff 100644 --- a/po/da.po +++ b/po/da.po @@ -6742,7 +6742,7 @@ msgstr "ESRI formfil" #: libraries/import/shp.php:254 #, php-format msgid "There was an error importing the ESRI shape file: \"%s\"." -msgstr "" +msgstr "Der var en fejl i importen af ESRI formfilen \"%s\"" #: libraries/import/shp.php:310 msgid "" From b5a66921c65b5da69ed29ff2456a231f7380af49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:07:24 +0200 Subject: [PATCH 791/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7a755e7dff..da48250a12 100644 --- a/po/da.po +++ b/po/da.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-20 19:06+0200\n" +"PO-Revision-Date: 2011-08-20 19:07+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -6749,6 +6749,8 @@ msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Du prøvede på at importere en invalid fil eller den importerede fil " +"indeholder invalide data" #: libraries/import/shp.php:312 #, php-format From ca05835e2271e41f0ad1e2905fabb111323442ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:07:49 +0200 Subject: [PATCH 792/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index da48250a12..1df5b62532 100644 --- a/po/da.po +++ b/po/da.po @@ -6755,7 +6755,7 @@ msgstr "" #: libraries/import/shp.php:312 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "MySQL Spatial Extension understøtter ikke ESRI type \"%s\"." #: libraries/import/shp.php:350 #, fuzzy From 8d05c2df92f15b69542863baffd1f5f11636b333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:08:37 +0200 Subject: [PATCH 793/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 1df5b62532..0f20777c35 100644 --- a/po/da.po +++ b/po/da.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-20 19:07+0200\n" +"PO-Revision-Date: 2011-08-20 19:08+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -6758,10 +6758,9 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "MySQL Spatial Extension understøtter ikke ESRI type \"%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 "Denne side indeholder ingen tabeller!" +msgstr "Den importerede fil indeholder ingen data!" #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" From 8f3596c83a6d1c28172f5d964dfc63acad98c859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:08:40 +0200 Subject: [PATCH 794/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 0f20777c35..8fc3703110 100644 --- a/po/da.po +++ b/po/da.po @@ -7280,7 +7280,6 @@ msgid "Execute every" msgstr "Udfør hver" #: libraries/rte/rte_events.lib.php:449 -#, fuzzy #| msgid "Start" msgctxt "Start of recurring event" msgid "Start" From 86a5ee21f36a5a57d0f62089ea679c980f93c6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:08:42 +0200 Subject: [PATCH 795/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 8fc3703110..89add6e551 100644 --- a/po/da.po +++ b/po/da.po @@ -7286,7 +7286,6 @@ msgid "Start" msgstr "Start" #: libraries/rte/rte_events.lib.php:457 -#, fuzzy #| msgid "End" msgctxt "End of recurring event" msgid "End" From 6a108e31a5652ba531a6e1130ae72d0040c6c392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:08:52 +0200 Subject: [PATCH 796/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 89add6e551..1d654522a1 100644 --- a/po/da.po +++ b/po/da.po @@ -8082,10 +8082,9 @@ msgid "Operator" msgstr "Operatør" #: libraries/tbl_select.lib.php:143 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Søg" +msgstr "Tabelsøgning" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 #, fuzzy From 64edd4aaed785699e281906c31773c4fcb749cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:01 +0200 Subject: [PATCH 797/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 1d654522a1..2a44275567 100644 --- a/po/da.po +++ b/po/da.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-20 19:08+0200\n" +"PO-Revision-Date: 2011-08-20 19:09+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -8087,10 +8087,9 @@ msgid "Table Search" msgstr "Tabelsøgning" #: libraries/tbl_select.lib.php:229 tbl_change.php:994 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Indsæt" +msgstr "Rediger/Indsæt" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" From ddb2ba22341aa3bfb74b05fdc6f17fc0facb867e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:09 +0200 Subject: [PATCH 798/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 2a44275567..f7efe74ddc 100644 --- a/po/da.po +++ b/po/da.po @@ -8434,7 +8434,6 @@ msgid "No databases" msgstr "Ingen databaser" #: navigation.php:270 -#, fuzzy #| msgid "filter tables by name" msgid "Filter tables by name" msgstr "filtrer tabeller efter navn" From d9c89b8e436c6694f2540b3d5d7739d03a16040c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:21 +0200 Subject: [PATCH 799/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index f7efe74ddc..24b6dc86fe 100644 --- a/po/da.po +++ b/po/da.po @@ -9478,10 +9478,9 @@ msgid "Monitor" msgstr "Monitor" #: server_status.php:690 -#, fuzzy #| msgid "Apply a divisor" msgid "Advisor" -msgstr "Anvend divisor" +msgstr "Rådgiver" #: server_status.php:700 server_status.php:722 msgid "Refresh rate: " From 723217aa071f288f9d361d3c98febce9f5410a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:34 +0200 Subject: [PATCH 800/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 24b6dc86fe..c8ed9f3fe8 100644 --- a/po/da.po +++ b/po/da.po @@ -9499,10 +9499,9 @@ msgid "Filter by category..." msgstr "Filtrer efter kategori..." #: server_status.php:765 -#, fuzzy #| msgid "Show only alert values" msgid "Show unformatted values" -msgstr "Vis kun alert-værdier" +msgstr "Vis uformatterede værdier" #: server_status.php:769 msgid "Related links:" From e5918c31909cae650e33dc7ecb806b26d6e92e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:47 +0200 Subject: [PATCH 801/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index c8ed9f3fe8..b36c33bf13 100644 --- a/po/da.po +++ b/po/da.po @@ -9508,10 +9508,9 @@ msgid "Related links:" msgstr "Relaterede links:" #: server_status.php:800 -#, fuzzy #| msgid "Query type" msgid "Run analyzer" -msgstr "Forespørgselstype" +msgstr "Kør analysator" #: server_status.php:801 #, fuzzy From 75f70b290dd5388b87d22dd67731f7704184b061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:09:54 +0200 Subject: [PATCH 802/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index b36c33bf13..f8cdeb7790 100644 --- a/po/da.po +++ b/po/da.po @@ -9513,7 +9513,6 @@ msgid "Run analyzer" msgstr "Kør analysator" #: server_status.php:801 -#, fuzzy #| msgid "Instructions/Setup" msgid "Instructions" msgstr "Instruktioner/Opsætning" From f0511887c0e4cc865ccf5708787e3ee8c5232055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:10:36 +0200 Subject: [PATCH 803/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index f8cdeb7790..d273c1ffd5 100644 --- a/po/da.po +++ b/po/da.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-20 19:09+0200\n" +"PO-Revision-Date: 2011-08-20 19:10+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -9522,6 +9522,8 @@ msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"Rådgiversystemer kan give anbefalinger om servervariable ved at analysere " +"serverens statusvariable" #: server_status.php:810 msgid "" From dd0c33d5303125042869922dccca76af4cf27f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:11:32 +0200 Subject: [PATCH 804/971] Translation update done using Pootle. --- po/da.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index d273c1ffd5..947f0bd15e 100644 --- a/po/da.po +++ b/po/da.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-20 19:10+0200\n" +"PO-Revision-Date: 2011-08-20 19:11+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -9531,6 +9531,8 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Bemærk dog, at dette system giver anbefalinger baseret på simple beregninger " +"og tommelfingerregler, som ikke passer med dit system" #: server_status.php:812 msgid "" From 41856258f9819acac96588f91d9f7005b00047c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:13:20 +0200 Subject: [PATCH 805/971] Translation update done using Pootle. --- po/da.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 947f0bd15e..fbc75611b5 100644 --- a/po/da.po +++ b/po/da.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-20 19:11+0200\n" +"PO-Revision-Date: 2011-08-20 19:13+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -9540,6 +9540,9 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Før konfigurationen ændres, så vær sikker på, hvad du ændrer (ved at læse " +"dokumentationen) og hvordan du annullerer ændringer. Forkert tuning kan have " +"en meget negativ effekt på ydeevnen." #: server_status.php:814 msgid "" From a59c63ec5c4a65baabc06a26e7b507b2cc058d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:15:01 +0200 Subject: [PATCH 806/971] Translation update done using Pootle. --- po/da.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index fbc75611b5..7e1c15e2bc 100644 --- a/po/da.po +++ b/po/da.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-20 19:13+0200\n" +"PO-Revision-Date: 2011-08-20 19:15+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -9550,6 +9550,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"Den bedste måde at finjustere dit system vil være at ændre een indstiling ad " +"gangen, observere og teste din database og annullere ændringen, hvis der " +"ingen klart synlig forskel var." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:836 From a8103b353cda4227d4ec6c8bd901a93908535cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:15:07 +0200 Subject: [PATCH 807/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7e1c15e2bc..212e1142a8 100644 --- a/po/da.po +++ b/po/da.po @@ -10355,7 +10355,6 @@ msgid "Refresh rate" msgstr "Opdateringsfrekvens" #: server_status.php:1468 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" msgstr "Diagramkolonner:" From 8b716010aac0247901923fa1070376f4f44859b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:15:22 +0200 Subject: [PATCH 808/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 212e1142a8..84631f1f9f 100644 --- a/po/da.po +++ b/po/da.po @@ -10360,10 +10360,9 @@ msgid "Chart columns" msgstr "Diagramkolonner:" #: server_status.php:1484 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "Fejlhåndtering:" +msgstr "Diagramopstilling" #: server_status.php:1484 msgid "" From 827b2b4ac244510053abf73299c60658d401a2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:15:32 +0200 Subject: [PATCH 809/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 84631f1f9f..7406e7d2b5 100644 --- a/po/da.po +++ b/po/da.po @@ -10371,7 +10371,6 @@ msgid "" msgstr "" #: server_status.php:1485 -#, fuzzy #| msgid "Restore default value" msgid "Reset to default" msgstr "Gendan standardværdi" From 64069d12e6a68edff6f44ea93f3d311b66111cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:15:53 +0200 Subject: [PATCH 810/971] Translation update done using Pootle. --- po/da.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/da.po b/po/da.po index 7406e7d2b5..d9b620d79a 100644 --- a/po/da.po +++ b/po/da.po @@ -10380,7 +10380,6 @@ msgid "Monitor Instructions" msgstr "Monitorinstruktioner" #: server_status.php:1490 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" From de30e2b1772751ff872cce87cd89ce4add08863e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:16:27 +0200 Subject: [PATCH 811/971] Translation update done using Pootle. --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index d9b620d79a..3c565443bc 100644 --- a/po/da.po +++ b/po/da.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-20 19:15+0200\n" +"PO-Revision-Date: 2011-08-20 19:16+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -10410,10 +10410,9 @@ msgid "" msgstr "" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Sæt monitor på pause" +msgstr "Brug af monitor:" #: server_status.php:1510 #, fuzzy From 606bec110549753beccd8c5c88e39a0edd649e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:17:46 +0200 Subject: [PATCH 812/971] Translation update done using Pootle. --- po/da.po | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/po/da.po b/po/da.po index 3c565443bc..5c0487d4a0 100644 --- a/po/da.po +++ b/po/da.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-20 19:16+0200\n" +"PO-Revision-Date: 2011-08-20 19:17+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -10415,7 +10415,6 @@ msgid "Using the monitor:" msgstr "Brug af monitor:" #: server_status.php:1510 -#, fuzzy #| msgid "" #| "Using the monitor:
    \n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10434,16 +10433,10 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Brug af monitoren:
    \n" " Når du klikker på 'Start monitor' vil din browser opdatere alle " -"viste diagrammer regelmæssigt.\n" -" Du kan tilføje diagrammer og ændre opdateringsfrekvensen under " -"'Indstilinger' eller fjerne diagrammer\n" -" ved at bruge ikonet cog på det relevante diagram.\n" -"

    Når du ser en pludselig forøgelse i aktivitet, så vælg det " -"relevante tidsinterval på et diagram ved at holde venstre museknap\n" -" nede og køre hen over diagrammet. Dette vill hente statistik fra " -"logs og hjælpe dig til at finde årsagen.

    til aktivitetsforøgelsen.

    " +"viste diagrammer regelmæssigt. Du kan tilføje diagrammer og ændre " +"opdateringsfrekvensen under 'Indstilinger' eller fjerne diagrammer ved at " +"bruge ikonet cog på det relevante diagram. " #: server_status.php:1512 #, fuzzy From 5f61885e421fbdaadb08009cbde8852899cfeb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:18:28 +0200 Subject: [PATCH 813/971] Translation update done using Pootle. --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 5c0487d4a0..32eb1325c1 100644 --- a/po/da.po +++ b/po/da.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-20 19:17+0200\n" +"PO-Revision-Date: 2011-08-20 19:18+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -10471,7 +10471,7 @@ msgstr "" #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "Bemærk venligst:" #: server_status.php:1521 #, fuzzy From 72b29ff5ed58b42e3b7c6f9174c124ad74d97d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:19:14 +0200 Subject: [PATCH 814/971] Translation update done using Pootle. --- po/da.po | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/po/da.po b/po/da.po index 32eb1325c1..294274268c 100644 --- a/po/da.po +++ b/po/da.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-20 19:18+0200\n" +"PO-Revision-Date: 2011-08-20 19:19+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -10474,7 +10474,6 @@ msgid "Please note:" msgstr "Bemærk venligst:" #: server_status.php:1521 -#, fuzzy #| msgid "" #| "Please note:\n" #| " Enabling the general_log may increase the server load by 5-15%. " @@ -10489,13 +10488,10 @@ 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 "" -"Bemærk:\n" -" Aktivering af general_log kan forøge server load med 5-15%. Vær også " -"opmærksom på, at statistikgenerering fra logs er en\n" -" krævende opgave, så det tilrådes at vælge kun en lille tidsinterval " -"og at deaktivere general_log og tømme dens tabel, når\n" -" der ikke er behov for den længere.\n" -" " +"Aktivering af general_log kan forøge server load med 5-15%. Vær også " +"opmærksom på, at statistikgenerering fra logs er en krævende opgave, så det " +"tilrådes at vælge kun en lille tidsinterval og at deaktivere general_log og " +"tømme dens tabel, når der ikke er behov for den længere. " #: server_status.php:1533 #, fuzzy From ec74bfda495782c4879cb73c6e5fe2ccae504c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:19:39 +0200 Subject: [PATCH 815/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 294274268c..c63000177a 100644 --- a/po/da.po +++ b/po/da.po @@ -10494,10 +10494,9 @@ msgstr "" "tømme dens tabel, når der ikke er behov for den længere. " #: server_status.php:1533 -#, fuzzy #| msgid "Remove chart" msgid "Preset chart" -msgstr "Fjern diagram" +msgstr "Foruddefineret diagram" #: server_status.php:1537 msgid "Status variable(s)" From 897e8c82c07a18d83a015b66822eaa77a94fe221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:20:14 +0200 Subject: [PATCH 816/971] Translation update done using Pootle. --- po/da.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/po/da.po b/po/da.po index c63000177a..0f59b9ba5a 100644 --- a/po/da.po +++ b/po/da.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-20 19:19+0200\n" +"PO-Revision-Date: 2011-08-20 19:20+0200\n" "Last-Translator: Jørgen Thomsen \n" "Language-Team: danish \n" "Language: da\n" @@ -10555,14 +10555,11 @@ msgid "Remove variable data in INSERT statements for better grouping" msgstr "" #: server_status.php:1608 -#, fuzzy #| msgid "" #| "

    Choose from which log you want the statistics to be generated from. Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"

    Vælg fra hvilken log, du ønsker statistikken genereret fraResultaterne er grupperet af forespørgselstekst." +msgstr "Vælg fra hvilken log, du ønsker statistikken genereret fra." #: server_status.php:1610 msgid "Results are grouped by query text." From ab754d009116a76431a80d33f38c5589b93da977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:20:24 +0200 Subject: [PATCH 817/971] Translation update done using Pootle. --- po/da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/da.po b/po/da.po index 0f59b9ba5a..7344386be3 100644 --- a/po/da.po +++ b/po/da.po @@ -10563,7 +10563,7 @@ msgstr "Vælg fra hvilken log, du ønsker statistikken genereret fra." #: server_status.php:1610 msgid "Results are grouped by query text." -msgstr "" +msgstr "Resultaterne er grupperet af forespørgselstekst." #: server_status.php:1615 #, fuzzy From 62c35f8d0c56939e21f3fc59f94ab12a3a2a2ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Thomsen?= Date: Sat, 20 Aug 2011 19:20:36 +0200 Subject: [PATCH 818/971] Translation update done using Pootle. --- po/da.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index 7344386be3..e93ae36bc9 100644 --- a/po/da.po +++ b/po/da.po @@ -10566,10 +10566,9 @@ msgid "Results are grouped by query text." msgstr "Resultaterne er grupperet af forespørgselstekst." #: server_status.php:1615 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Forespørgselstype" +msgstr "Forespørgselsanalysator" #: server_status.php:1652 #, php-format From d5c3cbf42a1fcb9fc78c06e522088a690b1f8dd8 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 20 Aug 2011 23:38:22 +0530 Subject: [PATCH 819/971] Style improvements for Export_Relation_Schema --- .../schema/Export_Relation_Schema.class.php | 86 +++++++++++++------ 1 file changed, 60 insertions(+), 26 deletions(-) diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index bfdb0636ba..d9ce1ec3db 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -10,7 +10,6 @@ * It contains those methods which are common in them * it works like factory pattern */ - class PMA_Export_Relation_Schema { private $_pageTitle; @@ -27,8 +26,10 @@ class PMA_Export_Relation_Schema /** * Set Page Number * - * @param integer value Page Number of the document to be created + * @param integer $value Page Number of the document to be created + * * @return void + * * @access public */ public function setPageNumber($value) @@ -39,8 +40,10 @@ class PMA_Export_Relation_Schema /** * Set Show Grid * - * @param boolean value show grid of the document or not + * @param boolean $value show grid of the document or not + * * @return void + * * @access public */ public function setShowGrid($value) @@ -48,6 +51,13 @@ class PMA_Export_Relation_Schema $this->showGrid = (isset($value) && $value == 'on') ? 1 : 0; } + /** + * Sets showColor + * + * @param string $value 'on' to set the the variable + * + * @return nothing + */ public function setShowColor($value) { $this->showColor = (isset($value) && $value == 'on') ? 1 : 0; @@ -56,8 +66,10 @@ class PMA_Export_Relation_Schema /** * Set Table Dimension * - * @param boolean value show table co-ordinates or not + * @param boolean $value show table co-ordinates or not + * * @return void + * * @access public */ public function setTableDimension($value) @@ -68,8 +80,10 @@ class PMA_Export_Relation_Schema /** * Set same width of All Tables * - * @param boolean value set same width of all tables or not + * @param boolean $value set same width of all tables or not + * * @return void + * * @access public */ public function setAllTableSameWidth($value) @@ -80,8 +94,10 @@ class PMA_Export_Relation_Schema /** * Set Data Dictionary * - * @param boolean value show selected database data dictionary or not + * @param boolean $value show selected database data dictionary or not + * * @return void + * * @access public */ public function setWithDataDictionary($value) @@ -92,8 +108,10 @@ class PMA_Export_Relation_Schema /** * Set Show only keys * - * @param boolean value show only keys or not + * @param boolean $value show only keys or not + * * @return void + * * @access public */ public function setShowKeys($value) @@ -104,8 +122,10 @@ class PMA_Export_Relation_Schema /** * Set Orientation * - * @param string value Orientation will be portrait or landscape + * @param string $value Orientation will be portrait or landscape + * * @return void + * * @access public */ public function setOrientation($value) @@ -116,8 +136,10 @@ class PMA_Export_Relation_Schema /** * Set type of paper * - * @param string value paper type can be A4 etc + * @param string $value paper type can be A4 etc + * * @return void + * * @access public */ public function setPaper($value) @@ -128,8 +150,10 @@ class PMA_Export_Relation_Schema /** * Set title of the page * - * @param string value title of the page displayed at top of the document + * @param string $title title of the page displayed at top of the document + * * @return void + * * @access public */ public function setPageTitle($title) @@ -140,8 +164,10 @@ class PMA_Export_Relation_Schema /** * Set type of export relational schema * - * @param string value can be pdf,svg,dia,visio,eps etc + * @param string $value can be pdf,svg,dia,visio,eps etc + * * @return void + * * @access public */ public function setExportType($value) @@ -152,22 +178,26 @@ class PMA_Export_Relation_Schema /** * get all tables involved or included in page * - * @param string db name of the database - * @param integer pageNumber page number whose tables will be fetched in an array + * @param string $db name of the database + * @param integer $pageNumber page no. whose tables will be fetched in an array + * * @return Array an array of tables + * * @access public */ - public function getAllTables($db,$pageNumber) + public function getAllTables($db, $pageNumber) { global $cfgRelation; // Get All tables - $tab_sql = 'SELECT table_name FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) - . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' - . ' AND pdf_page_number = ' . $pageNumber; + $tab_sql = 'SELECT table_name FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND pdf_page_number = ' . $pageNumber; $tab_rs = PMA_query_as_controluser($tab_sql, null, PMA_DBI_QUERY_STORE); if (!$tab_rs || !PMA_DBI_num_rows($tab_rs) > 0) { - $this->dieSchema('',__('This page does not contain any tables!')); + $this->dieSchema('', __('This page does not contain any tables!')); } while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) { $alltables[] = PMA_sqlAddSlashes($curr_table['table_name']); @@ -178,12 +208,15 @@ class PMA_Export_Relation_Schema /** * Displays an error message * - * @param integer pageNumber ID of the chosen page - * @param string type Schema Type - * @param string error_message the error mesage + * @param integer $pageNumber ID of the chosen page + * @param string $type Schema Type + * @param string $error_message The error mesage + * * @global array the PMA configuration array * @global string the current database name + * * @access public + * * @return void */ function dieSchema($pageNumber, $type = '', $error_message = '') @@ -191,18 +224,19 @@ class PMA_Export_Relation_Schema global $cfg; global $db; - require_once './libraries/header.inc.php'; - echo "

    " . __("SCHEMA ERROR: ") . $type ."

    " . "\n"; + include_once './libraries/header.inc.php'; + echo "

    " . __("SCHEMA ERROR: ") . $type . "

    " . "\n"; if (!empty($error_message)) { $error_message = htmlspecialchars($error_message); } echo '

    ' . "\n"; echo ' ' . $error_message . "\n"; echo '

    ' . "\n"; - echo '' . __('Back') . ''; + echo '' . __('Back') . ''; echo "\n"; - require_once './libraries/footer.inc.php'; + include_once './libraries/footer.inc.php'; exit(); } } From efbbc52568efa883cfb2cc6c15bf9db3c6605085 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 21 Aug 2011 00:45:47 +0530 Subject: [PATCH 820/971] Coding style improvements for Pdf_Relation_Schema --- .../schema/Pdf_Relation_Schema.class.php | 514 +++++++++++++----- 1 file changed, 387 insertions(+), 127 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ed96efd053..aa08a6a208 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -5,8 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); - +require_once 'Export_Relation_Schema.class.php'; require_once './libraries/PDF.class.php'; /** @@ -32,6 +31,13 @@ class PMA_Schema_PDF extends PMA_PDF var $widths; private $_ff = PMA_PDF_FONT; + /** + * Sets the value for margins + * + * @param float $c_margin margin + * + * @return nothing + */ public function setCMargin($c_margin) { $this->cMargin = $c_margin; @@ -40,12 +46,15 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaling factor, defines minimum coordinates and margins * - * @param float scale The scaling factor - * @param float _xMin The minimum X coordinate - * @param float _yMin The minimum Y coordinate - * @param float leftMargin The left margin - * @param float topMargin The top margin + * @param float $scale The scaling factor + * @param float $xMin The minimum X coordinate + * @param float $yMin The minimum Y coordinate + * @param float $leftMargin The left margin + * @param float $topMargin The top margin + * * @access public + * + * @return nothing */ function PMA_PDF_setScale($scale = 1, $xMin = 0, $yMin = 0, $leftMargin = -1, $topMargin = -1) { @@ -63,14 +72,19 @@ class PMA_Schema_PDF extends PMA_PDF /** * Outputs a scaled cell * - * @param float w The cell width - * @param float h The cell height - * @param string txt The text to output - * @param mixed border Whether to add borders or not - * @param integer ln Where to put the cursor once the output is done - * @param string align Align mode - * @param integer fill Whether to fill the cell with a color or not + * @param float $w The cell width + * @param float $h The cell height + * @param string $txt The text to output + * @param mixed $border Whether to add borders or not + * @param integer $ln Where to put the cursor once the output is done + * @param string $align Align mode + * @param integer $fill Whether to fill the cell with a color or not + * @param string $link Link + * * @access public + * + * @return nothing + * * @see TCPDF::Cell() */ function PMA_PDF_cellScale($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = 0, $link = '') @@ -83,11 +97,15 @@ class PMA_Schema_PDF extends PMA_PDF /** * Draws a scaled line * - * @param float x1 The horizontal position of the starting point - * @param float y1 The vertical position of the starting point - * @param float x2 The horizontal position of the ending point - * @param float y2 The vertical position of the ending point + * @param float $x1 The horizontal position of the starting point + * @param float $y1 The vertical position of the starting point + * @param float $x2 The horizontal position of the ending point + * @param float $y2 The vertical position of the ending point + * * @access public + * + * @return nothing + * * @see TCPDF::Line() */ function PMA_PDF_lineScale($x1, $y1, $x2, $y2) @@ -102,9 +120,13 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets x and y scaled positions * - * @param float x The x position - * @param float y The y position + * @param float $x The x position + * @param float $y The y position + * * @access public + * + * @return nothing + * * @see TCPDF::SetXY() */ function PMA_PDF_setXyScale($x, $y) @@ -117,8 +139,12 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the X scaled positions * - * @param float x The x position + * @param float $x The x position + * * @access public + * + * @return nothing + * * @see TCPDF::SetX() */ function PMA_PDF_setXScale($x) @@ -130,8 +156,12 @@ class PMA_Schema_PDF extends PMA_PDF /** * Sets the scaled font size * - * @param float size The font size (in points) + * @param float $size The font size (in points) + * * @access public + * + * @return nothing + * * @see TCPDF::SetFontSize() */ function PMA_PDF_setFontSizeScale($size) @@ -145,7 +175,11 @@ class PMA_Schema_PDF extends PMA_PDF * Sets the scaled line width * * @param float $width The line width + * * @access public + * + * @return nothing + * * @see TCPDF::SetLineWidth() */ function PMA_PDF_setLineWidthScale($width) @@ -154,6 +188,13 @@ class PMA_Schema_PDF extends PMA_PDF $this->SetLineWidth($width); } + /** + * This method is used to render the page header. + * + * @return nothing + * + * @see TCPDF::Header() + */ function Header() { // We only show this if we find something in the new pdf_pages table @@ -161,9 +202,11 @@ class PMA_Schema_PDF extends PMA_PDF // This function must be named "Header" to work with the TCPDF library global $cfgRelation, $db, $pdf_page_number, $with_doc; if ($with_doc) { - $test_query = 'SELECT * FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' - . ' AND page_nr = \'' . $pdf_page_number . '\''; + $test_query = 'SELECT * FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['pdf_pages']) + . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' + . ' AND page_nr = \'' . $pdf_page_number . '\''; $test_rs = PMA_query_as_controluser($test_query); $pages = @PMA_DBI_fetch_assoc($test_rs); $this->SetFont($this->_ff, 'B', 14); @@ -175,6 +218,10 @@ class PMA_Schema_PDF extends PMA_PDF /** * This function must be named "Footer" to work with the TCPDF library + * + * @return nothing + * + * @see PMA_PDF::Footer() */ function Footer() { @@ -184,6 +231,13 @@ class PMA_Schema_PDF extends PMA_PDF } } + /** + * Sets widths + * + * @param array $w array of widths + * + * @return nothing + */ function SetWidths($w) { // column widths @@ -195,8 +249,9 @@ class PMA_Schema_PDF extends PMA_PDF // line height $nb = 0; $data_cnt = count($data); - for ($i = 0;$i < $data_cnt;$i++) - $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i])); + for ($i = 0;$i < $data_cnt;$i++) { + $nb = max($nb, $this->NbLines($this->widths[$i], $data[$i])); + } $il = $this->FontSize; $h = ($il + 1) * $nb; // page break if necessary @@ -225,8 +280,9 @@ class PMA_Schema_PDF extends PMA_PDF /** * Compute number of lines used by a multicell of width w * - * @param int $w - * @param string $txt + * @param int $w width + * @param string $txt text + * * @return int */ function NbLines($w, $txt) @@ -309,18 +365,22 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string table_name The table name - * @param integer fontSize The font size - * @param integer pageNumber The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) - * @param integer sameWideWidth The max. with among tables - * @param boolean showKeys Whether to display keys or not - * @param boolean showInfo Whether to display table position or not + * @param string $tableName The table name + * @param integer $fontSize The font size + * @param integer $pageNumber The current page number (from the + * $cfg['Servers'][$i]['table_coords'] table) + * @param integer &$sameWideWidth The max. with among tables + * @param boolean $showKeys Whether to display keys or not + * @param boolean $showInfo Whether to display table position or not + * * @global object The current PDF document * @global array The relations settings * @global string The current db name + * + * @return nothing + * * @see PMA_Schema_PDF, Table_Stats::Table_Stats_setWidth, - Table_Stats::Table_Stats_setHeight + * Table_Stats::Table_Stats_setHeight */ function __construct($tableName, $fontSize, $pageNumber, &$sameWideWidth, $showKeys = false, $showInfo = false) { @@ -329,7 +389,7 @@ class Table_Stats $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { + if (! $result || ! PMA_DBI_num_rows($result)) { $pdf->Error(sprintf(__('The %s table doesn\'t exist!'), $tableName)); } // load fields @@ -338,7 +398,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->_tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -358,13 +421,19 @@ class Table_Stats $sameWideWidth = $this->width; } $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $pdf->Error(sprintf(__('Please configure the coordinates for table %s'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $pdf->Error( + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -376,7 +445,10 @@ class Table_Stats /* * index */ - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -400,9 +472,14 @@ class Table_Stats /** * Sets the width of the table * - * @param integer fontSize The font size + * @param integer $fontSize The font size + * * @global object The current PDF document + * * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _setWidth($fontSize) @@ -427,6 +504,8 @@ class Table_Stats /** * Sets the height of the table * + * @return nothing + * * @access private */ private function _setHeight() @@ -437,10 +516,16 @@ class Table_Stats /** * Do draw the table * - * @param integer fontSize The font size - * @param boolean setColor Whether to display color - * @global object The current PDF document + * @param integer $fontSize The font size + * @param boolean $withDoc + * @param boolean $setColor Whether to display color + * + * @global object The current PDF document + * * @access public + * + * @return nothing + * * @see PMA_Schema_PDF */ public function tableDraw($fontSize, $withDoc, $setColor = 0) @@ -459,7 +544,16 @@ class Table_Stats $pdf->PMA_links['doc'][$this->_tableName]['-'] = ''; } - $pdf->PMA_PDF_cellScale($this->width, $this->heightCell, $this->_getTitle(), 1, 1, 'C', $setColor, $pdf->PMA_links['doc'][$this->_tableName]['-']); + $pdf->PMA_PDF_cellScale( + $this->width, + $this->heightCell, + $this->_getTitle(), + 1, + 1, + 'C', + $setColor, + $pdf->PMA_links['doc'][$this->_tableName]['-'] + ); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($this->_ff, '', $fontSize); $pdf->SetTextColor(0); @@ -480,12 +574,23 @@ class Table_Stats $pdf->PMA_links['doc'][$this->_tableName][$field] = ''; } - $pdf->PMA_PDF_cellScale($this->width, $this->heightCell, ' ' . $field, 1, 1, 'L', $setColor, $pdf->PMA_links['doc'][$this->_tableName][$field]); + $pdf->PMA_PDF_cellScale( + $this->width, + $this->heightCell, + ' ' . $field, + 1, + 1, + 'L', + $setColor, + $pdf->PMA_links['doc'][$this->_tableName][$field] + ); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFillColor(255); } /*if ($pdf->PageNo() > 1) { - $pdf->PMA_PDF_die(__('The scale factor is too small to fit the schema on one page')); + $pdf->PMA_PDF_die( + __('The scale factor is too small to fit the schema on one page') + ); } */ } } @@ -499,7 +604,8 @@ class Table_Stats * in PDF document. * * @name Relation_Stats - * @see PMA_Schema_PDF::SetDrawColor,PMA_Schema_PDF::PMA_PDF_setLineWidthScale,PMA_Schema_PDF::PMA_PDF_lineScale + * @see PMA_Schema_PDF::SetDrawColor, PMA_Schema_PDF::PMA_PDF_setLineWidthScale, + * PMA_Schema_PDF::PMA_PDF_lineScale */ class Relation_Stats { @@ -515,10 +621,13 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * + * @return nothing + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -569,9 +678,11 @@ class Relation_Stats /** * Gets arrows coordinates * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Arrows coordinates + * * @access private */ private function _getXy($table, $column) @@ -582,13 +693,17 @@ class Relation_Stats } /** - * draws relation links and arrows - * shows foreign key relations + * draws relation links and arrows shows foreign key relations + * + * @param boolean $changeColor Whether to use one color per relation or not + * @param integer $i The id of the link to draw * - * @param boolean changeColor Whether to use one color per relation or not - * @param integer i The id of the link to draw * @global object The current PDF document + * * @access public + * + * @return nothing + * * @see PMA_Schema_PDF */ public function relationDraw($changeColor, $i) @@ -607,7 +722,7 @@ class Relation_Stats array(1, 1, 0), array(1, 0, 1), array(0, 1, 1) - ); + ); list ($a, $b, $c) = $case[$d]; $e = (1 - ($j - 1) / 6); $pdf->SetDrawColor($a * 255 * $e, $b * 255 * $e, $c * 255 * $e); @@ -615,19 +730,54 @@ class Relation_Stats $pdf->SetDrawColor(0); } $pdf->PMA_PDF_setLineWidthScale(0.2); - $pdf->PMA_PDF_lineScale($this->xSrc, $this->ySrc, $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc); - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick, $this->yDest, $this->xDest, $this->yDest); + $pdf->PMA_PDF_lineScale( + $this->xSrc, + $this->ySrc, + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc + ); + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick, + $this->yDest, + $this->xDest, + $this->yDest + ); $pdf->PMA_PDF_setLineWidthScale(0.1); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, $this->xDest + $this->destDir * $this->wTick, $this->yDest); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick, + $this->ySrc, + $this->xDest + $this->destDir * $this->wTick, + $this->yDest + ); /* * Draws arrows -> */ $root2 = 2 * sqrt(2); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, $this->ySrc + $this->wTick / $root2); - $pdf->PMA_PDF_lineScale($this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, $this->ySrc - $this->wTick / $root2); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc + $this->wTick / $root2 + ); + $pdf->PMA_PDF_lineScale( + $this->xSrc + $this->srcDir * $this->wTick * 0.75, + $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc - $this->wTick / $root2 + ); - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, $this->yDest + $this->wTick / $root2); - $pdf->PMA_PDF_lineScale($this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, $this->yDest - $this->wTick / $root2); + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest + $this->wTick / $root2 + ); + $pdf->PMA_PDF_lineScale( + $this->xDest + $this->destDir * $this->wTick / 2, + $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest - $this->wTick / $root2 + ); $pdf->SetDrawColor(0); } } @@ -688,11 +838,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // Initializes a new document $pdf = new PMA_Schema_PDF($this->orientation, 'mm', $this->paper); - $pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $this->pageNumber)); + $pdf->SetTitle( + sprintf( + __('Schema of the %s database - Page %s'), + $GLOBALS['db'], + $this->pageNumber + ) + ); $pdf->setCMargin(0); $pdf->Open(); $pdf->SetAutoPageBreak('auto'); - $alltables = $this->getAllTables($db,$this->pageNumber); + $alltables = $this->getAllTables($db, $this->pageNumber); if ($this->withDoc) { $pdf->SetAutoPageBreak('auto', 15); @@ -707,7 +863,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema if ($this->withDoc) { $pdf->SetLink($pdf->PMA_links['RT']['-'], -1); $pdf->Bookmark(__('Relational schema')); - $pdf->SetAlias('{00}', $pdf->PageNo()) ; + $pdf->SetAlias('{00}', $pdf->PageNo()); $this->topMargin = 28; $this->bottomMargin = 28; } @@ -715,7 +871,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /* snip */ foreach ($alltables as $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); + $this->tables[$table] = new Table_Stats( + $table, $this->_ff, + $this->pageNumber, + $this->_tablewidth, + $this->showKeys, + $this->tableDimension + ); } if ($this->sameWide) { $this->tables[$table]->width = $this->_tablewidth; @@ -727,10 +889,17 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $this->scale = ceil( max( ($this->_xMax - $this->_xMin) / ($pdf->getPageWidth() - $this->rightMargin - $this->leftMargin), - ($this->_yMax - $this->_yMin) / ($pdf->getPageHeight() - $this->topMargin - $this->bottomMargin)) - * 100) / 100; + ($this->_yMax - $this->_yMin) / ($pdf->getPageHeight() - $this->topMargin - $this->bottomMargin) + ) * 100 + ) / 100; - $pdf->PMA_PDF_setScale($this->scale, $this->_xMin, $this->_yMin, $this->leftMargin, $this->topMargin); + $pdf->PMA_PDF_setScale( + $this->scale, + $this->_xMin, + $this->_yMin, + $this->leftMargin, + $this->topMargin + ); // Builds and save the PDF document $pdf->PMA_PDF_setLineWidthScale(0.1); @@ -753,7 +922,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // (do not use array_search() because we would have to // to do a === false and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); + $this->_addRelation( + $one_table, + $master_field, + $rel['foreign_table'], + $rel['foreign_field'], + $this->tableDimension + ); } } // end while } // end if @@ -770,7 +945,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Sets X and Y minimum and maximum for a table cell * - * @param string table The table name of which sets XY co-ordinates + * @param string $table The table name of which sets XY co-ordinates + * + * @return nothing + * * @access private */ private function _setMinMax($table) @@ -784,32 +962,49 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines relation objects * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreign_field The relation field in the foreign table - * @param boolean show_info Whether to display table position or not + * @param string $masterTable The master table name + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param boolean $showInfo Whether to display table position or not + * * @access private + * + * @return nothing + * * @see _setMinMax */ private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $this->_ff, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$masterTable]); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $this->_ff, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$foreignTable]); } - $this->relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** * Draws the grid * * @global object the current PMA_Schema_PDF instance + * * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _strokeGrid() @@ -831,19 +1026,35 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines for ($l = 0; $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace) / $gridSize); $l++) { - $pdf->line(0, $l * $gridSize + $topSpace, $pdf->getPageWidth(), $l * $gridSize + $topSpace); + $pdf->line( + 0, $l * $gridSize + $topSpace, + $pdf->getPageWidth(), $l * $gridSize + $topSpace + ); // Avoid duplicates - if ($l > 0 && $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace - $labelHeight) / $gridSize)) { + if ($l > 0 + && $l <= intval(($pdf->getPageHeight() - $topSpace - $bottomSpace - $labelHeight) / $gridSize) + ) { $pdf->SetXY(0, $l * $gridSize + $topSpace); - $label = (string) sprintf('%.0f', ($l * $gridSize + $topSpace - $this->topMargin) * $this->scale + $this->_yMin); + $label = (string) sprintf( + '%.0f', + ($l * $gridSize + $topSpace - $this->topMargin) * $this->scale + $this->_yMin + ); $pdf->Cell($labelWidth, $labelHeight, ' ' . $label); } // end if } // end for // Draws vertical lines for ($j = 0; $j <= intval($pdf->getPageWidth() / $gridSize); $j++) { - $pdf->line($j * $gridSize, $topSpace, $j * $gridSize, $pdf->getPageHeight() - $bottomSpace); + $pdf->line( + $j * $gridSize, + $topSpace, + $j * $gridSize, + $pdf->getPageHeight() - $bottomSpace + ); $pdf->SetXY($j * $gridSize, $topSpace); - $label = (string) sprintf('%.0f', ($j * $gridSize - $this->leftMargin) * $this->scale + $this->_xMin); + $label = (string) sprintf( + '%.0f', + ($j * $gridSize - $this->leftMargin) * $this->scale + $this->_xMin + ); $pdf->Cell($labelWidth, $labelHeight, $label); } } @@ -851,8 +1062,12 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws relation arrows * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * * @access private + * + * @return nothing + * * @see Relation_Stats::relationdraw() */ private function _drawRelations($changeColor) @@ -867,8 +1082,12 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws tables * - * @param boolean changeColor Whether to display table position or not + * @param boolean $changeColor Whether to display table position or not + * * @access private + * + * @return nothing + * * @see Table_Stats::tableDraw() */ private function _drawTables($changeColor = 0) @@ -882,11 +1101,16 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Ouputs the PDF document to a file * or sends the output to browser * + * @param integer $pageNumber page number + * * @global object The current PDF document * @global string The current database name * @global integer The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) + * $cfg['Servers'][$i]['table_coords'] table) * @access private + * + * @return nothing + * * @see PMA_Schema_PDF */ private function _showOutput($pageNumber) @@ -894,8 +1118,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema global $pdf, $db, $cfgRelation; // Get the name of this pdfpage to use as filename - $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) - . ' WHERE page_nr = ' . $pageNumber; + $_name_sql = 'SELECT page_descr FROM ' + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['pdf_pages']) + . ' WHERE page_nr = ' . $pageNumber; $_name_rs = PMA_query_as_controluser($_name_sql); if ($_name_rs) { $_name_row = PMA_DBI_fetch_row($_name_rs); @@ -919,36 +1145,54 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell( + 0, 6, __('Page number:') . ' {' . sprintf("%02d", $i) . '}', 0, 0, + 'R', 0, $pdf->PMA_links['doc'][$table]['-'] + ); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell( + 0, 6, $i . ' ' . $table, 0, 1, + 'L', 0, $pdf->PMA_links['doc'][$table]['-'] + ); // $pdf->Ln(1); $fields = PMA_DBI_get_columns($GLOBALS['db'], $table); - foreach($fields as $row) { + foreach ($fields as $row) { $pdf->SetX(20); $field_name = $row['Field']; $pdf->PMA_links['doc'][$table][$field_name] = $pdf->AddLink(); - // $pdf->Cell(0, 6, $field_name,0,1,'L',0, $pdf->PMA_links['doc'][$table][$field_name]); + //$pdf->Cell( + // 0, 6, $field_name, 0, 1, + // 'L', 0, $pdf->PMA_links['doc'][$table][$field_name] + //); } $lasttable = $table; $i++; } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, __('Page number:') . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell( + 0, 6, __('Page number:') . ' {00}', 0, 0, + 'R', 0, $pdf->PMA_links['RT']['-'] + ); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell( + 0, 6, $i . ' ' . __('Relational schema'), 0, 1, + 'L', 0, $pdf->PMA_links['RT']['-'] + ); $z = 0; foreach ($alltables as $table) { $z++; $pdf->SetAutoPageBreak(true, 15); $pdf->addpage($GLOBALS['orientation']); $pdf->Bookmark($table); - $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()) ; + $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()); $pdf->PMA_links['RT'][$table]['-'] = $pdf->AddLink(); $pdf->SetLink($pdf->PMA_links['doc'][$table]['-'], -1); $pdf->SetFont($this->_ff, 'B', 18); - $pdf->Cell(0, 8, $z . ' ' . $table, 1, 1, 'C', 0, $pdf->PMA_links['RT'][$table]['-']); + $pdf->Cell( + 0, 8, $z . ' ' . $table, 1, 1, + 'C', 0, $pdf->PMA_links['RT'][$table]['-'] + ); $pdf->SetFont($this->_ff, '', 8); $pdf->ln(); @@ -962,11 +1206,21 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Gets table informations */ $showtable = PMA_Table::sGetStatusInfo($db, $table); - $num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); - $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); - $create_time = (isset($showtable['Create_time']) ? PMA_localisedDate(strtotime($showtable['Create_time'])) : ''); - $update_time = (isset($showtable['Update_time']) ? PMA_localisedDate(strtotime($showtable['Update_time'])) : ''); - $check_time = (isset($showtable['Check_time']) ? PMA_localisedDate(strtotime($showtable['Check_time'])) : ''); + $num_rows = isset($showtable['Rows']) + ? $showtable['Rows'] + : 0; + $show_comment = isset($showtable['Comment']) + ? $showtable['Comment'] + : ''; + $create_time = isset($showtable['Create_time']) + ? PMA_localisedDate(strtotime($showtable['Create_time'])) + : ''; + $update_time = isset($showtable['Update_time']) + ? PMA_localisedDate(strtotime($showtable['Update_time'])) + : ''; + $check_time = isset($showtable['Check_time']) + ? PMA_localisedDate(strtotime($showtable['Check_time'])) + : ''; /** * Gets table keys and retains them @@ -996,7 +1250,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $indexes_info[$row['Key_name']]['Cardinality'] = $row['Cardinality']; } // I don't know what does following column mean.... - // $indexes_info[$row['Key_name']]['Packed'] = $row['Packed']; + // $indexes_info[$row['Key_name']]['Packed'] = $row['Packed']; $indexes_info[$row['Key_name']]['Comment'] = $row['Comment']; $indexes_data[$row['Key_name']][$row['Seq_in_index']]['Column_name'] = $row['Column_name']; @@ -1032,22 +1286,22 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ $break = false; - if (!empty($show_comment)) { + if (! empty($show_comment)) { $pdf->Cell(0, 3, __('Table comments') . ' : ' . $show_comment, 0, 1); $break = true; } - if (!empty($create_time)) { + if (! empty($create_time)) { $pdf->Cell(0, 3, __('Creation') . ': ' . $create_time, 0, 1); $break = true; } - if (!empty($update_time)) { + if (! empty($update_time)) { $pdf->Cell(0, 3, __('Last update') . ': ' . $update_time, 0, 1); $break = true; } - if (!empty($check_time)) { + if (! empty($check_time)) { $pdf->Cell(0, 3, __('Last check') . ': ' . $check_time, 0, 1); $break = true; } @@ -1095,8 +1349,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema foreach ($columns as $row) { $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); - $type = $extracted_fieldspec['print_type']; - $attribute = $extracted_fieldspec['attribute']; + $type = $extracted_fieldspec['print_type']; + $attribute = $extracted_fieldspec['attribute']; if (! isset($row['Default'])) { if ($row['Null'] != '' && $row['Null'] != 'NO') { $row['Default'] = 'NULL'; @@ -1107,22 +1361,28 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->PMA_links['RT'][$table][$field_name] = $pdf->AddLink(); $pdf->Bookmark($field_name, 1, -1); $pdf->SetLink($pdf->PMA_links['doc'][$table][$field_name], -1); - $pdf_row = array($field_name, + $pdf_row = array( + $field_name, $type, $attribute, ($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'), - ((isset($row['Default'])) ? $row['Default'] : ''), + (isset($row['Default']) ? $row['Default'] : ''), $row['Extra'], - ((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''), - ((isset($comments[$field_name])) ? $comments[$field_name] : ''), - ((isset($mime_map) && isset($mime_map[$field_name])) ? str_replace('_', '/', $mime_map[$field_name]['mimetype']) : '') - ); + (isset($res_rel[$field_name]) + ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] + : ''), + (isset($comments[$field_name]) + ? $comments[$field_name] + : ''), + (isset($mime_map) && isset($mime_map[$field_name]) + ? str_replace('_', '/', $mime_map[$field_name]['mimetype']) + : '') + ); $links[0] = $pdf->PMA_links['RT'][$table][$field_name]; - if (isset($res_rel[$field_name]['foreign_table']) AND - isset($res_rel[$field_name]['foreign_field']) AND - isset($pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]) - ) - { + if (isset($res_rel[$field_name]['foreign_table']) + AND isset($res_rel[$field_name]['foreign_field']) + AND isset($pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]) + ) { $links[6] = $pdf->PMA_links['doc'][$res_rel[$field_name]['foreign_table']][$res_rel[$field_name]['foreign_field']]; } else { unset($links[6]); From c052a0203ba0850fa44205e65c5b1584dde0fb65 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 21 Aug 2011 00:47:29 +0530 Subject: [PATCH 821/971] More instances of coding style violations in Eps_Relation_Schema --- libraries/schema/Eps_Relation_Schema.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php index be70889ea4..ffb117efff 100644 --- a/libraries/schema/Eps_Relation_Schema.class.php +++ b/libraries/schema/Eps_Relation_Schema.class.php @@ -111,13 +111,13 @@ class PMA_EPS * font can be set whenever needed in EPS * * @param string $value sets the font name e.g Arial - * @param integer $value sets the size of the font e.g 10 + * @param integer $size sets the size of the font e.g 10 * * @return void * * @access public */ - function setFont($value,$size) + function setFont($value, $size) { $this->font = $value; $this->fontSize = $size; From a62aa22ad5dfe90191f9186dcf3bd7c18c2a021a Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 21 Aug 2011 00:51:36 +0530 Subject: [PATCH 822/971] Replace tab characters with spaces --- js/tbl_zoom_plot.js | 630 ++++++++++++++++++++++---------------------- 1 file changed, 315 insertions(+), 315 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index e773175d7a..b8c4259640 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -60,14 +60,14 @@ function isEmpty(obj) { **/ function getDate(val,type) { if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) - } + return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val) + } else if(type.toString().search(/time/i) != -1) { return Highcharts.dateFormat('%H:%M:%S', val) - } + } else if (type.toString().search(/date/i) != -1) { return Highcharts.dateFormat('%Y-%m-%e', val) - } + } } /** @@ -77,14 +77,14 @@ function getDate(val,type) { **/ function getTimeStamp(val,type) { if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) - } + return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val) + } else if(type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') - } + return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss') + } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val,'yyyy-MM-dd') - } + return getDateFromFormat(val,'yyyy-MM-dd') + } } /** @@ -92,12 +92,12 @@ function getTimeStamp(val,type) { ** @param field: field type (as in database structure) **/ function getType(field) { - if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) - return 'numeric'; - else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) - return 'time'; - else - return 'text'; + if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + return 'numeric'; + else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + return 'time'; + else + return 'text'; } /** ** Converts a categorical array into numeric array @@ -140,29 +140,29 @@ function includePan(currentChart) { $('#querychart').mousemove(function(e) { if (mouseDown == 1) { if (e.pageX > lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (e.pageX - lastX) * (xExtremes.max - xExtremes.min) / chartWidth; currentChart.xAxis[0].setExtremes(xExtremes.min - diff, xExtremes.max - diff); } else if (e.pageX < lastX) { - var xExtremes = currentChart.xAxis[0].getExtremes(); + var xExtremes = currentChart.xAxis[0].getExtremes(); var diff = (lastX - e.pageX) * (xExtremes.max - xExtremes.min) / chartWidth; - currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); + currentChart.xAxis[0].setExtremes(xExtremes.min + diff, xExtremes.max + diff); } if (e.pageY > lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (e.pageY - lastY) * (yExtremes.max - yExtremes.min) / chartHeight; - currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); + currentChart.yAxis[0].setExtremes(yExtremes.min + ydiff, yExtremes.max + ydiff); } else if (e.pageY < lastY) { - var yExtremes = currentChart.yAxis[0].getExtremes(); + var yExtremes = currentChart.yAxis[0].getExtremes(); var ydiff = 1.0 * (lastY - e.pageY) * (yExtremes.max - yExtremes.min) / chartHeight; - currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); + currentChart.yAxis[0].setExtremes(yExtremes.min - ydiff, yExtremes.max - ydiff); } } - lastX = e.pageX; - lastY = e.pageY; + lastX = e.pageX; + lastY = e.pageY; }); } @@ -216,8 +216,8 @@ $(document).ready(function() { **/ $('#inputFormSubmitId').click(function() { if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0) - PMA_ajaxShowMessage(PMA_messages['strInputNull']); - else if (xLabel == yLabel) + PMA_ajaxShowMessage(PMA_messages['strInputNull']); + else if (xLabel == yLabel) PMA_ajaxShowMessage(PMA_messages['strSameInputs']); }); @@ -240,16 +240,16 @@ $(document).ready(function() { } else { $link.text(PMA_messages['strHideSearchCriteria']); } - // avoid default click action - return false; - }); + // avoid default click action + return false; + }); /** ** Set dialog properties for the data display form **/ $("#dataDisplay").dialog({ autoOpen: false, - title: 'Data point content', + title: 'Data point content', modal: false, //false otherwise other dialogues like timepicker may not function properly height: $('#dataDisplay').height() + 80, width: $('#dataDisplay').width() + 80 @@ -260,152 +260,152 @@ $(document).ready(function() { */ $("#submitForm").click(function(event) { - + //Prevent default submission of form event.preventDefault(); - - //Find changed values by comparing form values with selectedRow Object - var newValues = new Array();//Stores the values changed from original + + //Find changed values by comparing form values with selectedRow Object + var newValues = new Array();//Stores the values changed from original var it = 4; var xChange = false; var yChange = false; - for (key in selectedRow) { - if (key != 'where_clause'){ - var oldVal = selectedRow[key]; - var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); - if (oldVal != newVal){ - selectedRow[key] = newVal; - newValues[key] = newVal; - if(key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } - else if(key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; - } - } - } - it++ - }//End data update + for (key in selectedRow) { + if (key != 'where_clause'){ + var oldVal = selectedRow[key]; + var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (oldVal != newVal){ + selectedRow[key] = newVal; + newValues[key] = newVal; + if(key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } + else if(key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; + } + } + } + it++ + }//End data update - //Update the chart series and replot + //Update the chart series and replot if (xChange || yChange) { - var newSeries = new Array(); - newSeries[0] = new Object(); + var newSeries = new Array(); + newSeries[0] = new Object(); newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary if(xChange) { - xCord[currentData] = selectedRow[xLabel]; - if(xType == 'numeric') { - currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); - currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); + xCord[currentData] = selectedRow[xLabel]; + if(xType == 'numeric') { + currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); + currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6); } - else if(xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; + else if(xType == 'time') { + currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; - $.each(data,function(key,value) { + $.each(data,function(key,value) { if(yType != 'text') - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } + } - } + } if(yChange) { - yCord[currentData] = selectedRow[yLabel]; - if(yType == 'numeric') { - currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); - currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); + yCord[currentData] = selectedRow[yLabel]; + if(yType == 'numeric') { + currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); + currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6); } - else if(yType =='time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); - } - else { - var tempX = getCord(xCord); - var tempY = getCord(yCord); - var i = 0; - newSeries[0].data = new Array(); - xCord = tempX[2]; - yCord = tempY[2]; + else if(yType =='time') { + currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())}); + } + else { + var tempX = getCord(xCord); + var tempY = getCord(yCord); + var i = 0; + newSeries[0].data = new Array(); + xCord = tempX[2]; + yCord = tempY[2]; - $.each(data,function(key,value) { - if(xType != 'text' ) + $.each(data,function(key,value) { + if(xType != 'text' ) newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - else + else newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); - i++; + i++; }); - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } } - currentSettings.series = newSeries; + currentSettings.series = newSeries; currentChart = PMA_createChart(currentSettings); - } - } - currentChart.series[0].data[currentData].select(); } - //End plot update + } + currentChart.series[0].data[currentData].select(); + } + //End plot update - //Generate SQL query for update - if (!isEmpty(newValues)) { + //Generate SQL query for update + if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; - for (key in newValues) { - if(key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; - if(!isNumeric(value) && value != null) - sql_query += '\'' + value + '\' ,'; - else - sql_query += value + ' ,'; - } - } - sql_query = sql_query.substring(0, sql_query.length - 1); - sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); - - //Post SQL query to sql.php - $.post('sql.php', { + for (key in newValues) { + if(key != 'where_clause') { + sql_query += '`' + key + '`=' ; + var value = newValues[key]; + if(!isNumeric(value) && value != null) + sql_query += '\'' + value + '\' ,'; + else + sql_query += value + ' ,'; + } + } + sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); + + //Post SQL query to sql.php + $.post('sql.php', { 'token' : window.parent.token, 'db' : window.parent.db, 'ajax_request' : true, 'sql_query' : sql_query, - 'inline_edit' : false - }, function(data) { - if(data.success == true) { - $('#sqlqueryresults').html(data.sql_query); - $("#sqlqueryresults").trigger('appendAnchor'); - } - else - PMA_ajaxShowMessage(data.error); - })//End $.post - }//End database update - $("#dataDisplay").dialog("close"); + 'inline_edit' : false + }, function(data) { + if(data.success == true) { + $('#sqlqueryresults').html(data.sql_query); + $("#sqlqueryresults").trigger('appendAnchor'); + } + else + PMA_ajaxShowMessage(data.error); + })//End $.post + }//End database update + $("#dataDisplay").dialog("close"); });//End submit handler /* @@ -418,14 +418,14 @@ $(document).ready(function() { .hide(); $('#togglesearchformlink') .text(PMA_messages['strShowSearchCriteria']) - $('#togglesearchformdiv').show(); + $('#togglesearchformdiv').show(); var selectedRow; - var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; - var series = new Array(); - var xCord = new Array(); - var yCord = new Array(); - var tempX, tempY; - var it = 0; + var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF']; + var series = new Array(); + var xCord = new Array(); + var yCord = new Array(); + var tempX, tempY; + var it = 0; var xMax; // xAxis extreme max var xMin; // xAxis extreme min var yMax; // yAxis extreme max @@ -434,33 +434,33 @@ $(document).ready(function() { // Set the basic plot settings var currentSettings = { chart: { - renderTo: 'querychart', - type: 'scatter', - //zoomType: 'xy', - width:$('#resizer').width() -3, - height:$('#resizer').height()-20 - }, - credits: { + renderTo: 'querychart', + type: 'scatter', + //zoomType: 'xy', + width:$('#resizer').width() -3, + height:$('#resizer').height()-20 + }, + credits: { enabled: false }, - exporting: { enabled: false }, + exporting: { enabled: false }, label: { text: $('#dataLabel').val() }, - plotOptions: { - series: { - allowPointSelect: true, + plotOptions: { + series: { + allowPointSelect: true, cursor: 'pointer', - showInLegend: false, + showInLegend: false, dataLabels: { enabled: false, }, - point: { + point: { events: { click: function() { - var id = this.id; - var fid = 4; - currentData = id; - // Make AJAX request to tbl_zoom_select.php for getting the complete row info - var post_params = { + var id = this.id; + var fid = 4; + currentData = id; + // Make AJAX request to tbl_zoom_select.php for getting the complete row info + var post_params = { 'ajax_request' : true, 'get_data_row' : true, 'db' : window.parent.db, @@ -469,33 +469,33 @@ $(document).ready(function() { 'token' : window.parent.token, } $.post('tbl_zoom_select.php', post_params, function(data) { - // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { - if (data.row_info[key] == null) - $('#fields_null_id_' + fid).attr('checked', true); - else - $('#fieldID_' + fid).val(data.row_info[key]); - fid++; - } - selectedRow = new Object(); - selectedRow = data.row_info; + // Row is contained in data.row_info, now fill the displayResultForm with row values + for ( key in data.row_info) { + if (data.row_info[key] == null) + $('#fields_null_id_' + fid).attr('checked', true); + else + $('#fieldID_' + fid).val(data.row_info[key]); + fid++; + } + selectedRow = new Object(); + selectedRow = data.row_info; }); - $("#dataDisplay").dialog("open"); + $("#dataDisplay").dialog("open"); }, } - } - } - }, - tooltip: { - formatter: function() { - return this.point.name; - } - }, + } + } + }, + tooltip: { + formatter: function() { + return this.point.name; + } + }, title: { text: 'Query Results' }, - xAxis: { - title: { text: $('#tableid_0').val() }, - events: { + xAxis: { + title: { text: $('#tableid_0').val() }, + events: { setExtremes: function(e){ this.resetZoom.show(); } @@ -503,16 +503,16 @@ $(document).ready(function() { }, yAxis: { - min: null, - title: { text: $('#tableid_1').val() }, - endOnTick: false, + min: null, + title: { text: $('#tableid_1').val() }, + endOnTick: false, startOnTick: false, - events: { + events: { setExtremes: function(e){ this.resetZoom.show(); } } - }, + }, } $('#resizer').resizable({ @@ -525,159 +525,159 @@ $(document).ready(function() { } }); - // Classify types as either numeric,time,text - xType = getType(xType); - yType = getType(yType); + // Classify types as either numeric,time,text + xType = getType(xType); + yType = getType(yType); - //Set the axis type based on the field - currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; - currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; + //Set the axis type based on the field + currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear'; + currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear'; // Formulate series data for plot series[0] = new Object(); series[0].data = new Array(); - series[0].marker = { + series[0].marker = { symbol: 'circle' }; - if (xType != 'text' && yType != 'text') { - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + if (xType != 'text' && yType != 'text') { + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - it++; + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } } - - else if (xType =='text' && yType !='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - - tempX = getCord(xCord); - $.each(data,function(key,value) { - var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); + + else if (xType =='text' && yType !='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + + tempX = getCord(xCord); + $.each(data,function(key,value) { + var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val()); series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; + + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } } - if(yType == 'numeric') { - currentSettings.yAxis.max = Array.max(yCord) + 6 - currentSettings.yAxis.min = Array.min(yCord) - 6 - } - else { - currentSettings.yAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_1').val()); - }} + if(yType == 'numeric') { + currentSettings.yAxis.max = Array.max(yCord) + 6 + currentSettings.yAxis.min = Array.min(yCord) - 6 + } + else { + currentSettings.yAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_1').val()); + }} } - xCord = tempX[2]; - } - - else if (xType !='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempY = getCord(yCord); - $.each(data,function(key,value) { - var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); + xCord = tempX[2]; + } + + else if (xType !='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempY = getCord(yCord); + $.each(data,function(key,value) { + var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val()); series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - if(xType == 'numeric') { - currentSettings.xAxis.max = Array.max(xCord) + 6 - currentSettings.xAxis.min = Array.min(xCord) - 6 - } - else { - currentSettings.xAxis.labels = { formatter : function() { - return getDate(this.value, $('#types_0').val()); - }} + if(xType == 'numeric') { + currentSettings.xAxis.max = Array.max(xCord) + 6 + currentSettings.xAxis.min = Array.min(xCord) - 6 + } + else { + currentSettings.xAxis.labels = { formatter : function() { + return getDate(this.value, $('#types_0').val()); + }} } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; } - yCord = tempY[2]; - } - - else if (xType =='text' && yType =='text') { - $.each(data,function(key,value) { - xCord.push(value[xLabel]); - yCord.push(value[yLabel]); - }); - tempX = getCord(xCord); - tempY = getCord(yCord); - $.each(data,function(key,value) { + } + yCord = tempY[2]; + } + + else if (xType =='text' && yType =='text') { + $.each(data,function(key,value) { + xCord.push(value[xLabel]); + yCord.push(value[yLabel]); + }); + tempX = getCord(xCord); + tempY = getCord(yCord); + $.each(data,function(key,value) { series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); - it++; + it++; }); - currentSettings.xAxis.labels = { formatter : function() { - if(tempX[1][this.value] && tempX[1][this.value].length > 10) - return tempX[1][this.value].substring(0,10) - else - return tempX[1][this.value]; - } + currentSettings.xAxis.labels = { formatter : function() { + if(tempX[1][this.value] && tempX[1][this.value].length > 10) + return tempX[1][this.value].substring(0,10) + else + return tempX[1][this.value]; } - currentSettings.yAxis.labels = { formatter : function() { - if(tempY[1][this.value] && tempY[1][this.value].length > 10) - return tempY[1][this.value].substring(0,10) - else - return tempY[1][this.value]; - } - } - xCord = tempX[2]; - yCord = tempY[2]; + } + currentSettings.yAxis.labels = { formatter : function() { + if(tempY[1][this.value] && tempY[1][this.value].length > 10) + return tempY[1][this.value].substring(0,10) + else + return tempY[1][this.value]; + } + } + xCord = tempX[2]; + yCord = tempY[2]; - } + } - currentSettings.series = series; + currentSettings.series = series; currentChart = PMA_createChart(currentSettings); - xMin = currentChart.xAxis[0].getExtremes().min; - xMax = currentChart.xAxis[0].getExtremes().max; - yMin = currentChart.yAxis[0].getExtremes().min; - yMax = currentChart.yAxis[0].getExtremes().max; - includePan(currentChart); //Enable panning feature + xMin = currentChart.xAxis[0].getExtremes().min; + xMax = currentChart.xAxis[0].getExtremes().max; + yMin = currentChart.yAxis[0].getExtremes().min; + yMax = currentChart.yAxis[0].getExtremes().max; + includePan(currentChart); //Enable panning feature var setZoom = function() { - var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; - var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; - var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; - var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; + var newxm = xMin + (xMax - xMin) * (1 - zoomRatio) / 2; + var newxM = xMax - (xMax - xMin) * (1 - zoomRatio) / 2; + var newym = yMin + (yMax - yMin) * (1 - zoomRatio) / 2; + var newyM = yMax - (yMax - yMin) * (1 - zoomRatio) / 2; currentChart.xAxis[0].setExtremes(newxm,newxM); currentChart.yAxis[0].setExtremes(newym,newyM); - }; - //Enable zoom feature - $("#querychart").mousewheel(function(objEvent, intDelta) { + }; + //Enable zoom feature + $("#querychart").mousewheel(function(objEvent, intDelta) { if (intDelta > 0) { if (zoomRatio > 0.1) { zoomRatio = zoomRatio - 0.1; @@ -703,6 +703,6 @@ $(document).ready(function() { currentChart.yAxis[0].setExtremes(null, null) this.style.display = 'none' }); - scrollToChart(); + scrollToChart(); } }); From ddc856ae04f0312e296fd3f5f0d559ffe2048af8 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:32:33 +0200 Subject: [PATCH 823/971] 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 a52668dab2..4bb7452e77 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-20 08:39+0200\n" +"PO-Revision-Date: 2011-08-20 22:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12454,6 +12454,9 @@ msgid "" "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." msgstr "" +"{key_buffer_size} boyutunu azaltmanız gerekebilir, eğer indeksler " +"kaldırılmışsa, görmek için tablolarınızı yeniden gözden geçirin ya da " +"kullanılan indekslerle ilgili beklentileri ve sorguları gözden geçirin." #: po/advisory_rules.php:163 #, php-format From ad0999a264a8c245eaec21bdf09fb2e7c67b2856 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:42:42 +0200 Subject: [PATCH 824/971] 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 4bb7452e77..15f5cbec16 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-20 22:32+0200\n" +"PO-Revision-Date: 2011-08-20 22:42+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12462,6 +12462,8 @@ msgstr "" #, php-format msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" msgstr "" +"Şimdiye kadar kullanılan en fazla %% MyISAM anahtar arabelleği: %s, bu değer " +"%%95'in üzerinde olmalıdır" #: po/advisory_rules.php:165 msgid "Percentage of MyISAM key buffer used" From d1c9bbb5607703e5cdccaef85b2ec5d5229c202e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:42:51 +0200 Subject: [PATCH 825/971] 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 15f5cbec16..3b356a59f7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12385,7 +12385,8 @@ msgid "" "%s%% of all temporary tables are being written to disk, this value should be " "below 25%%" msgstr "" -"Tüm geçici tabloların %%%s diske yazılıyor, bu değer %%25'in altında olmalı" +"Tüm geçici tabloların %%%s diske yazılıyor, bu değer %%25'in altında " +"olmalıdır" #: po/advisory_rules.php:150 msgid "Temp disk rate" From 9919af252f9ec1c750c1ab3602b01166ed032c0d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:43:49 +0200 Subject: [PATCH 826/971] 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 3b356a59f7..6095058947 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-20 22:42+0200\n" +"PO-Revision-Date: 2011-08-20 22:43+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12474,6 +12474,8 @@ msgstr "Kullanılan MyISAM anahtar arabellek yüzdesi" #, php-format msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" msgstr "" +"Kullanılan %% MyISAM anahtar arabelleği: %s, bu değer %%95'in üzerinde " +"olmalıdır" #: po/advisory_rules.php:170 msgid "Percentage of index reads from memory" From bb13bb64c245b8d37deb7eda1401a32e5514de24 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:44:27 +0200 Subject: [PATCH 827/971] 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 6095058947..f98e1dfbd6 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-20 22:43+0200\n" +"PO-Revision-Date: 2011-08-20 22:44+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12479,7 +12479,7 @@ msgstr "" #: po/advisory_rules.php:170 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Bellekten indeks okumaları yüzdesi" #: po/advisory_rules.php:171 #, php-format From 4055585dd16307a6424f1a7d345b1c3f9c5101e8 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:45:48 +0200 Subject: [PATCH 828/971] 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 f98e1dfbd6..6ff3a06dab 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-20 22:44+0200\n" +"PO-Revision-Date: 2011-08-20 22:45+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12484,7 +12484,7 @@ msgstr "Bellekten indeks okumaları yüzdesi" #: po/advisory_rules.php:171 #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." -msgstr "" +msgstr "MyISAM anahtar arabelleği kullanan indekslerin %% düşük." #: po/advisory_rules.php:172 msgid "You may need to increase {key_buffer_size}." From cd1a291323185b42faa511a445492070fcdb92dc Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:46:16 +0200 Subject: [PATCH 829/971] 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 6ff3a06dab..73c4688cdf 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-20 22:45+0200\n" +"PO-Revision-Date: 2011-08-20 22:46+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12488,7 +12488,7 @@ msgstr "MyISAM anahtar arabelleği kullanan indekslerin %% düşük." #: po/advisory_rules.php:172 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "{key_buffer_size} değerini arttırmanız gerekebilir." #: po/advisory_rules.php:173 #, php-format From acb2e373072e14cb0bd216cdbbe8452c4380f08a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:46:54 +0200 Subject: [PATCH 830/971] 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 73c4688cdf..e40aee7e11 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12493,7 +12493,7 @@ msgstr "{key_buffer_size} değerini arttırmanız gerekebilir." #: po/advisory_rules.php:173 #, php-format msgid "Index reads from memory: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Bellekten indeks okumaları: %%%s, bu değer %%95'in üzerinde olmalıdır" #: po/advisory_rules.php:175 msgid "Rate of table open" From c66b7a19ece9021ec37fb869abf7b85508ffdd0e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:49:30 +0200 Subject: [PATCH 831/971] 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 e40aee7e11..3a4d58383c 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-20 22:46+0200\n" +"PO-Revision-Date: 2011-08-20 22:49+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12508,6 +12508,8 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" +"Açık tablolar pahalı disk G/Ç gerektirir. {table_open_cache} değerini " +"arttırmak bunu önleyebilir." #: po/advisory_rules.php:178 #, php-format From f5a2bd8ec5268c22a6ba8c328474b3496d0619bf Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:49:51 +0200 Subject: [PATCH 832/971] 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 3a4d58383c..b0d0ca76e7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12508,7 +12508,7 @@ msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." msgstr "" -"Açık tablolar pahalı disk G/Ç gerektirir. {table_open_cache} değerini " +"Açılan tablolar pahalı disk G/Ç gerektirir. {table_open_cache} değerini " "arttırmak bunu önleyebilir." #: po/advisory_rules.php:178 From 176aad653f463d810970d69fb0e46361939e6b87 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:50:44 +0200 Subject: [PATCH 833/971] 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 b0d0ca76e7..c906c73a79 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-20 22:49+0200\n" +"PO-Revision-Date: 2011-08-20 22:50+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12514,7 +12514,7 @@ msgstr "" #: po/advisory_rules.php:178 #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" -msgstr "" +msgstr "Açık tablo oranı: %s, bu değer saat başına 10'dan az olmalıdır" #: po/advisory_rules.php:180 msgid "Percentage of used open files limit" From fbe91e64ed2559c2647a22577f44f831a4383177 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 20 Aug 2011 22:53:43 +0200 Subject: [PATCH 834/971] 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 c906c73a79..b75a0267ca 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-20 22:50+0200\n" +"PO-Revision-Date: 2011-08-20 22:53+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12525,6 +12525,8 @@ msgid "" "The number of open files is approaching the max number of open files. You " "may get a \\\"Too many open files\\\" error." msgstr "" +"Açık dosyaların sayısı en fazla açık dosyaların sayısına yaklaşıyor. \\\"Çok " +"fazla dosya açık\\\" hatası alabilirsiniz." #: po/advisory_rules.php:182 po/advisory_rules.php:187 msgid "" From ad2996053b5d3f2755ca42d4541b14fe740f2831 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:09:54 +0200 Subject: [PATCH 835/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 799c966fe3..78933ba42b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-17 02:56+0200\n" +"PO-Revision-Date: 2011-08-21 03:09+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10274,10 +10274,9 @@ msgid "Chart columns" msgstr "1 段のグラフ数" #: server_status.php:1484 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "管理エラー:" +msgstr "モニタ環境設定" #: server_status.php:1484 msgid "" From b05ec4fd4623fa46afd4e68a610f7cff35fe2612 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:42:56 +0200 Subject: [PATCH 836/971] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 78933ba42b..59ebbbda33 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:09+0200\n" +"PO-Revision-Date: 2011-08-21 03:42+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10282,7 +10282,7 @@ msgstr "モニタ環境設定" msgid "" "The arrangement of the charts is stored to the browsers local storage. You " "may want to export it if you have a complicated set up." -msgstr "" +msgstr "モニタの環境設定をローカルに保存します。変更されているモニタ環境をエクスポートできます。" #: server_status.php:1485 msgid "Reset to default" From ce6d7c629facd414f27a3c2c38e8beb6c3237f96 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:44:42 +0200 Subject: [PATCH 837/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 59ebbbda33..9148e329e9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:42+0200\n" +"PO-Revision-Date: 2011-08-21 03:44+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10319,10 +10319,9 @@ msgstr "" "タ機能は使用することができます。" #: server_status.php:1508 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "モニタ一時中断" +msgstr "モニタの使い方" #: server_status.php:1510 #, fuzzy From 5d8af343c423f347b697b2551f76aadd16ddf53f Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:44:55 +0200 Subject: [PATCH 838/971] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 9148e329e9..f777c42f27 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10321,7 +10321,7 @@ msgstr "" #: server_status.php:1508 #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "モニタの使い方" +msgstr "モニタの使い方：" #: server_status.php:1510 #, fuzzy From 19dd680cf1b5febaa6a24d427f78714df022d062 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:47:14 +0200 Subject: [PATCH 839/971] Translation update done using Pootle. --- po/ja.po | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/po/ja.po b/po/ja.po index f777c42f27..52218b0eb3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:44+0200\n" +"PO-Revision-Date: 2011-08-21 03:47+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10324,7 +10324,6 @@ msgid "Using the monitor:" msgstr "モニタの使い方：" #: server_status.php:1510 -#, fuzzy #| msgid "" #| "Using the monitor:
    Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10341,14 +10340,8 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"モニタの使い方：
    「モニタ開始」をクリックすると、ブラウザは一定間" -"隔で表示されている全てのグラフを更新します。「設定」のところよりグラフを追加" -"や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を" -"行えます。

    ログからクエリ分析を行うには、グラフで該当期間を選択します。マウ" -"スの左ボタンを押したままグラフの上をドラッグするように移動させてください。こ" -"うすることで、グラフの任意の期間を選択できます。グループ毎に分類されたクエリ" -"が読み込まれ表示されますので、実行されたクエリを確認することができます。" -"SELECT 文の部分をクリックすることで、更なるクエリ解析が可能です。

    " +"「モニタ開始」をクリックすると、ブラウザは一定間隔で表示されている全てのグラフを更新します。「設定」のところよりグラフを追加や再描画間隔の変更が行え、そ" +"れぞれのグラフにある歯車のアイコンを通じて削除を行えます。" #: server_status.php:1512 #, fuzzy From 0cb72f7e07425923905bcdff6682b64c8b80c0d9 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:49:00 +0200 Subject: [PATCH 840/971] Translation update done using Pootle. --- po/ja.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ja.po b/po/ja.po index 52218b0eb3..fac0614eee 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:47+0200\n" +"PO-Revision-Date: 2011-08-21 03:49+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10344,7 +10344,6 @@ msgstr "" "れぞれのグラフにある歯車のアイコンを通じて削除を行えます。" #: server_status.php:1512 -#, fuzzy #| msgid "" #| "Using the monitor:
    Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10361,14 +10360,9 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"モニタの使い方：
    「モニタ開始」をクリックすると、ブラウザは一定間" -"隔で表示されている全てのグラフを更新します。「設定」のところよりグラフを追加" -"や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を" -"行えます。

    ログからクエリ分析を行うには、グラフで該当期間を選択します。マウ" -"スの左ボタンを押したままグラフの上をドラッグするように移動させてください。こ" -"うすることで、グラフの任意の期間を選択できます。グループ毎に分類されたクエリ" -"が読み込まれ表示されますので、実行されたクエリを確認することができます。" -"SELECT 文の部分をクリックすることで、更なるクエリ解析が可能です。

    " +"ログからクエリ分析を行うには、グラフで該当期間を選択します。マウスの左ボタンを押したままグラフの上をドラッグするように移動させてください。こうすることで" +"、グラフの任意の期間を選択できます。グループ毎に分類されたクエリが読み込まれ表示されますので、実行されたクエリを確認することができます。SELECT " +"文の部分をクリックすることで、更なるクエリ解析が可能です。" #: server_status.php:1519 msgid "Please note:" From c8b9a4313812e6e9ef222643f2126b44203df54f Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:49:15 +0200 Subject: [PATCH 841/971] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index fac0614eee..2192807085 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10366,7 +10366,7 @@ msgstr "" #: server_status.php:1519 msgid "Please note:" -msgstr "" +msgstr "注意事項：" #: server_status.php:1521 #, fuzzy From 917d1e8cbe2fd9ada1d378942d056165709044cd Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:50:49 +0200 Subject: [PATCH 842/971] Translation update done using Pootle. --- po/ja.po | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2192807085..1b8bee7dfc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:49+0200\n" +"PO-Revision-Date: 2011-08-21 03:50+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10369,7 +10369,6 @@ msgid "Please note:" msgstr "注意事項：" #: 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 " @@ -10382,10 +10381,8 @@ 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 "" -"注意事項：general_log を有効にすると、5～15% サーバの負荷が増加するこ" -"とがあります。ログから生成される統計は、負荷が集中する作業であることを認識し" -"ておいてください。ですから、テーブルのモニタで必要としないのであれば、しばら" -"くの間 general_log を無効にして空にしておくのが望ましいです。" +"general_log を有効にすると、5～15% サーバの負荷が増加することがあります。ログから生成される統計は、負荷が集中する作業であることを認識し" +"ておいてください。ですから、テーブルのモニタで必要としないのであれば、しばらくの間 general_log を無効にして空にしておくのが望ましいです。" #: server_status.php:1533 #, fuzzy From ef3587c23a5d23647948eb599968160a433b574f Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:56:04 +0200 Subject: [PATCH 843/971] Translation update done using Pootle. --- po/ja.po | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1b8bee7dfc..1bd44e5fe5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:50+0200\n" +"PO-Revision-Date: 2011-08-21 03:56+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10449,14 +10449,11 @@ msgid "Remove variable data in INSERT statements for better grouping" msgstr "結果を扱いやすくするために INSERT 文におけるデータ部を同一のように扱う" #: server_status.php:1608 -#, fuzzy #| msgid "" #| "

    Choose from which log you want the statistics to be generated from. Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"

    ログの統計元を選択することができます。

    結果はクエリ文でグループ化されま" -"す。" +msgstr "ログの統計元を選択することができます。" #: server_status.php:1610 msgid "Results are grouped by query text." From d17f5b50b484804bacbb07371349403031e3c901 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 03:57:12 +0200 Subject: [PATCH 844/971] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1bd44e5fe5..bb9cec8c14 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:56+0200\n" +"PO-Revision-Date: 2011-08-21 03:57+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10457,7 +10457,7 @@ msgstr "ログの統計元を選択することができます。" #: server_status.php:1610 msgid "Results are grouped by query text." -msgstr "" +msgstr "結果はクエリ文でグループ化されます。" #: server_status.php:1615 msgid "Query analyzer" From c16eaf4689c93b30538072dc315f5462b0afbf46 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 04:00:44 +0200 Subject: [PATCH 845/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index bb9cec8c14..5d2aa83343 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 03:57+0200\n" +"PO-Revision-Date: 2011-08-21 04:00+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1212,10 +1212,9 @@ msgid "Query statistics" msgstr "クエリの統計" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "設定ファイルの読み込みに失敗しました" +msgstr "ローカルのモニタ環境設定は互換性がありません。" #: js/messages.php:94 msgid "" From 21a1b25436f702546e8a60c56a2ee268c7fcbbf0 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Sun, 21 Aug 2011 04:03:04 +0200 Subject: [PATCH 846/971] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5d2aa83343..5321e3c8f4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 04:00+0200\n" +"PO-Revision-Date: 2011-08-21 04:03+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1214,7 +1214,7 @@ msgstr "クエリの統計" #: js/messages.php:93 #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "ローカルのモニタ環境設定は互換性がありません。" +msgstr "ローカルのモニタ環境設定に互換性なし" #: js/messages.php:94 msgid "" From 4f4ab7dc6951ad3537c9e3578cf0601effa4c688 Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Sun, 21 Aug 2011 10:47:20 +0530 Subject: [PATCH 847/971] Fixed: 'Browse foreign values' not working properly --- libraries/tbl_select.lib.php | 4 ++-- tbl_zoom_select.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 755322ec4f..07c5883e2e 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -179,12 +179,12 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie } elseif ($foreignData['foreign_link'] == true) { if(isset($fields[$i]) && is_string($fields[$i])){ - $str .= '' ; } else{ - $str .= '' ; } diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 518121d95a..a565768a31 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -127,7 +127,7 @@ if(isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) */ ?> -
    > +> From 72c6c399844d320b8d5c1a6460278a6222ce8b90 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:14:01 +0200 Subject: [PATCH 848/971] 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 b75a0267ca..4c6a2b47c3 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-20 22:53+0200\n" +"PO-Revision-Date: 2011-08-21 11:14+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12533,6 +12533,8 @@ msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing open_files_limit." msgstr "" +"{open_files_limit} artışını dikkate alın ve open_files_limit değerini " +"değiştirdikten sonra yeniden başlatıldığında hata günlüğünü kontrol edin." #: po/advisory_rules.php:183 #, php-format From 44dba97cf148dfd4a814b072119e791f639d6c85 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:14:42 +0200 Subject: [PATCH 849/971] 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 4c6a2b47c3..c2d4c05fe4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12001,7 +12001,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 {query_cache_limit} artışı." +msgstr "{query_cache_limit} artışını dikkate alın." #: po/advisory_rules.php:78 #, php-format From 05df9adcb0930ea3c32dfc668743a36cef30e795 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:15:26 +0200 Subject: [PATCH 850/971] 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 c2d4c05fe4..b1b08ab2e0 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-21 11:14+0200\n" +"PO-Revision-Date: 2011-08-21 11:15+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12172,7 +12172,7 @@ 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 " +"sort_buffer_size ve/veya read_rnd_buffer_size artışını dikkate alın, sistem " "bellek sınırlarınıza bağlıdır" #: po/advisory_rules.php:108 From 69608b60dd26642885696b114d60b0fde8653790 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:20:56 +0200 Subject: [PATCH 851/971] 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 b1b08ab2e0..1543eb36a2 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-21 11:15+0200\n" +"PO-Revision-Date: 2011-08-21 11:20+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12540,7 +12540,7 @@ msgstr "" #, php-format msgid "" "The number of opened files is at %s%% of the limit. It should be below 85%%" -msgstr "" +msgstr "Açık dosya sayısı sınıra %%%s kaldı. Değer %%85'in altında olmalıdır" #: po/advisory_rules.php:185 msgid "Rate of open files" From 90ebccb5fe8dc63f42a758335701cf6087766737 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:21:43 +0200 Subject: [PATCH 852/971] 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 1543eb36a2..45420ca34c 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-21 11:20+0200\n" +"PO-Revision-Date: 2011-08-21 11:21+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12553,7 +12553,7 @@ msgstr "Açılan dosyaların oranı yüksek." #: po/advisory_rules.php:188 #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" -msgstr "" +msgstr "Açık dosya oranı: %s, bu değer saat başına 5'ten az olmalıdır" #: po/advisory_rules.php:190 #, php-format From 6861077f4fced201cc3b1c5ca8cc4330e551aa6d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:23:49 +0200 Subject: [PATCH 853/971] 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 45420ca34c..617767f90c 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-21 11:21+0200\n" +"PO-Revision-Date: 2011-08-21 11:23+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12567,6 +12567,7 @@ msgstr "Çok fazla tablo kilidi acilen onaylanmadı." #: po/advisory_rules.php:192 po/advisory_rules.php:197 msgid "Optimize queries and/or use InnoDB to reduce lock wait." msgstr "" +"Sorguları uyarlayın ve/veya kilit beklemesini azaltmak için InnoDB kullanın." #: po/advisory_rules.php:193 #, php-format From 004bd64ab1c0a2ed262331757b745e373428e328 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:26:08 +0200 Subject: [PATCH 854/971] 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 617767f90c..54b133e6e2 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-21 11:23+0200\n" +"PO-Revision-Date: 2011-08-21 11:26+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12572,7 +12572,7 @@ msgstr "" #: po/advisory_rules.php:193 #, php-format msgid "Immediate table locks: %s%%, this value should be above 95%%" -msgstr "" +msgstr "Ani tablo kilitleri: %%%s, bu değer %%95'in üzerinde olmalıdır" #: po/advisory_rules.php:195 msgid "Table lock wait rate" From 3526847260e5073fef2ca6aceb8d87ee9e8f1878 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:26:24 +0200 Subject: [PATCH 855/971] 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 54b133e6e2..0e4d1800f8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12576,7 +12576,7 @@ msgstr "Ani tablo kilitleri: %%%s, bu değer %%95'in üzerinde olmalıdır" #: po/advisory_rules.php:195 msgid "Table lock wait rate" -msgstr "" +msgstr "Tablo kilit bekleme oranı" #: po/advisory_rules.php:198 #, php-format From dec7e1c5309540ec68850cf89b8d80da09ee8129 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:26:58 +0200 Subject: [PATCH 856/971] 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 0e4d1800f8..f246066a92 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12581,7 +12581,7 @@ msgstr "Tablo kilit bekleme oranı" #: po/advisory_rules.php:198 #, php-format msgid "Table lock wait rate: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "Tablo kilit bekleme oranı: %s, bu değer saat başına 1'den az olmalıdır" #: po/advisory_rules.php:200 msgid "Thread cache" From 56859fd0c74e1078fa82c42beab0e588b53fd247 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:34:55 +0200 Subject: [PATCH 857/971] 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 f246066a92..71457b707d 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-21 11:26+0200\n" +"PO-Revision-Date: 2011-08-21 11:34+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12592,6 +12592,8 @@ msgid "" "Thread cache is disabled, resulting in more overhead from new connections to " "MySQL." msgstr "" +"İşlem önbelleği etkisizleştirildi, yeni bağlantılardan MySQL'e daha fazla ek " +"yük olarak sonuçlanır." #: po/advisory_rules.php:202 msgid "Enable the thread cache by setting {thread_cache_size} > 0." From c668db615241185cb7fcc4e2efbd1e18a5976b9d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:35:56 +0200 Subject: [PATCH 858/971] 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 71457b707d..686bf3479a 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-21 11:34+0200\n" +"PO-Revision-Date: 2011-08-21 11:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12597,7 +12597,7 @@ msgstr "" #: po/advisory_rules.php:202 msgid "Enable the thread cache by setting {thread_cache_size} > 0." -msgstr "" +msgstr "{thread_cache_size} > 0 ayarlayarak işlem önbelleğini etkinleştirin." #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" From 8e753258163c8e86479a53c295c1be6b83903b15 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:36:47 +0200 Subject: [PATCH 859/971] 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 686bf3479a..a9770784f3 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-21 11:35+0200\n" +"PO-Revision-Date: 2011-08-21 11:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12601,7 +12601,7 @@ msgstr "{thread_cache_size} > 0 ayarlayarak işlem önbelleğini etkinleştirin. #: po/advisory_rules.php:203 msgid "The thread cache is set to 0" -msgstr "" +msgstr "İşlem önbelleği 0'a ayarlı" #: po/advisory_rules.php:205 #, php-format From 2bd01b3e6b528fb337b102c419b33c2c95fa2913 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:37:30 +0200 Subject: [PATCH 860/971] 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 a9770784f3..96692faa9a 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-21 11:36+0200\n" +"PO-Revision-Date: 2011-08-21 11:37+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12614,7 +12614,7 @@ msgstr "İşlem önbelleği verimli değil." #: po/advisory_rules.php:207 msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "{thread_cache_size} değerini arttır." #: po/advisory_rules.php:208 #, php-format From 4dbe6287e02e033515a57769dbdf2706c31797e7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:38:06 +0200 Subject: [PATCH 861/971] 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 96692faa9a..c0cf435084 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-21 11:37+0200\n" +"PO-Revision-Date: 2011-08-21 11:38+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12619,7 +12619,7 @@ msgstr "{thread_cache_size} değerini arttır." #: po/advisory_rules.php:208 #, php-format msgid "Thread cache hitrate: %s%%, this value should be above 80%%" -msgstr "" +msgstr "İşlem önbelleği tavan oranı: %%%s, bu değer %%80'in üzerinde olmalıdır" #: po/advisory_rules.php:210 msgid "Threads that are slow to launch" From 75503073a8d0484f836d7a58c935b43f9f113008 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:38:33 +0200 Subject: [PATCH 862/971] 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 c0cf435084..d9990a54b9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12623,7 +12623,7 @@ msgstr "İşlem önbelleği tavan oranı: %%%s, bu değer %%80'in üzerinde olma #: po/advisory_rules.php:210 msgid "Threads that are slow to launch" -msgstr "" +msgstr "İşlemler çalıştırmak için yavaş" #: po/advisory_rules.php:211 msgid "There are too many threads that are slow to launch." From 4a5c8797e82c92c95de51697988774a7567d69e1 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:43:23 +0200 Subject: [PATCH 863/971] 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 d9990a54b9..802e5a7ebb 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-21 11:38+0200\n" +"PO-Revision-Date: 2011-08-21 11:43+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12634,6 +12634,8 @@ msgid "" "This generally happens in case of general system overload as it is pretty " "simple operations. You might want to monitor your system load carefully." msgstr "" +"Bu, genel sistem aşırı yükü durumunda oldukça basit işlemlerde olsa genel " +"olarak olur. Sistem yükünüzü dikkatlice izlemek isteyebilirsiniz." #: po/advisory_rules.php:213 #, php-format From acdc02684cba0ef574be0ee22f69bab0c9b27e28 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:46:14 +0200 Subject: [PATCH 864/971] 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 802e5a7ebb..9abe9a497f 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-21 11:43+0200\n" +"PO-Revision-Date: 2011-08-21 11:46+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12641,6 +12641,7 @@ msgstr "" #, php-format msgid "%s thread(s) took longer than %s seconds to start, it should be 0" msgstr "" +"%s işlem başlamak için %s saniyeden daha uzun zaman aldı, bu 0 olmalıdır" #: po/advisory_rules.php:215 msgid "Slow launch time" From f91a46bab20a9f4fd0910ad21151073dbb7caecd Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:46:42 +0200 Subject: [PATCH 865/971] 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 9abe9a497f..e64477413b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12645,7 +12645,7 @@ msgstr "" #: po/advisory_rules.php:215 msgid "Slow launch time" -msgstr "" +msgstr "Yavaş çalıştırma zamanı" #: po/advisory_rules.php:216 msgid "Slow_launch_threads is above 2s" From 941d6cc62427ae01d89560a179a8cc9f110af751 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:47:16 +0200 Subject: [PATCH 866/971] 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 e64477413b..a3a27ff28f 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-21 11:46+0200\n" +"PO-Revision-Date: 2011-08-21 11:47+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12649,7 +12649,7 @@ msgstr "Yavaş çalıştırma zamanı" #: po/advisory_rules.php:216 msgid "Slow_launch_threads is above 2s" -msgstr "" +msgstr "Slow_launch_threads 2s üzerinde" #: po/advisory_rules.php:217 msgid "" From 5c0870e5c78072846c76940814c97f2d5017410c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:50:10 +0200 Subject: [PATCH 867/971] 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 a3a27ff28f..b6f746f420 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-21 11:47+0200\n" +"PO-Revision-Date: 2011-08-21 11:50+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12656,6 +12656,8 @@ msgid "" "Set slow_launch_time to 1s or 2s to correctly count threads that are slow to " "launch" msgstr "" +"Çalıştırması yavaş olan işlemleri doğru olarak saymak için slow_launch_time " +"değerini 1s veya 2s olarak ayarlayın" #: po/advisory_rules.php:218 #, php-format From c8bd3fd1c86c89b4ee7de27bd5b5ec812ad29606 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 11:52:37 +0200 Subject: [PATCH 868/971] 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 b6f746f420..864d4c5a07 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-21 11:50+0200\n" +"PO-Revision-Date: 2011-08-21 11:52+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12673,6 +12673,8 @@ msgid "" "The maximum amount of used connections is getting close to the value of " "max_connections." msgstr "" +"Kullanılan bağlantıların en fazla miktarı max_connections değerine " +"yaklaşıyor." #: po/advisory_rules.php:222 msgid "" From c4ae77cab453d190c0e6d1327bed02b972a272ea Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:11:27 +0200 Subject: [PATCH 869/971] 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 864d4c5a07..78af248e65 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-21 11:52+0200\n" +"PO-Revision-Date: 2011-08-21 12:11+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12682,6 +12682,10 @@ msgid "" "do not close database handlers properly get killed sooner. Make sure the " "code closes database handlers properly." msgstr "" +"max_connections değerini arttırmayla veya wait_timeout değerini azaltmayla " +"daha çabuk sonlandırmak düzgün bir şekilde veritabanı işleyicilerini " +"kapatmaz. Kodun veritabanı işleyicilerini düzgün bir şekilde kapattığından " +"emin olun." #: po/advisory_rules.php:223 #, php-format From a460e25880d9347f6be1d5597838f1322c54e70d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:13:52 +0200 Subject: [PATCH 870/971] 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 78af248e65..c327208443 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-21 12:11+0200\n" +"PO-Revision-Date: 2011-08-21 12:13+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12692,6 +12692,8 @@ msgstr "" msgid "" "Max_used_connections is at %s%% of max_connections, it should be below 80%%" msgstr "" +"Max_used_connections, max_connections'ın %%%s değerinde, değer %%80'in " +"altında olmalıdır" #: po/advisory_rules.php:225 msgid "Percentage of aborted connections" From 5138696d407e2c7283f735540034524f27a71c4d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:14:14 +0200 Subject: [PATCH 871/971] 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 c327208443..611a018305 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-21 12:13+0200\n" +"PO-Revision-Date: 2011-08-21 12:14+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12701,7 +12701,7 @@ msgstr "Durdurulan bağlantıların yüzdesi" #: po/advisory_rules.php:226 msgid "Too many connections are aborted." -msgstr "" +msgstr "Çok fazla bağlantı sonlandırıldı." #: po/advisory_rules.php:227 po/advisory_rules.php:232 msgid "" From bc179f0f5f93204f92cb38a9264bd62ee619d7e7 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:18:59 +0200 Subject: [PATCH 872/971] 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 611a018305..130baf37b0 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-21 12:14+0200\n" +"PO-Revision-Date: 2011-08-21 12:18+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12710,6 +12710,10 @@ msgid "" "source-of-aborted_connects/\\\">This article might help you track down " "the source." msgstr "" +"Bağlantılar genellikle izin verilmediklerinde durdurulur. Bu makale kaynağın izini aramakta yardımcı " +"olabilir." #: po/advisory_rules.php:228 #, php-format From e689007b37edd24b1ffb0fcfcfcf035c4ec84acc Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:19:17 +0200 Subject: [PATCH 873/971] 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 130baf37b0..126f5eb6a1 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-21 12:18+0200\n" +"PO-Revision-Date: 2011-08-21 12:19+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12701,7 +12701,7 @@ msgstr "Durdurulan bağlantıların yüzdesi" #: po/advisory_rules.php:226 msgid "Too many connections are aborted." -msgstr "Çok fazla bağlantı sonlandırıldı." +msgstr "Çok fazla bağlantı durduruldu." #: po/advisory_rules.php:227 po/advisory_rules.php:232 msgid "" From 3e881043d42fb5de057f4958e96aa7cbc4eba0e9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:22:06 +0200 Subject: [PATCH 874/971] 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 126f5eb6a1..06cd920f67 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-21 12:19+0200\n" +"PO-Revision-Date: 2011-08-21 12:22+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12718,7 +12718,7 @@ msgstr "" #: po/advisory_rules.php:228 #, php-format msgid "%s%% of all connections are aborted. This value should be below 1%%" -msgstr "" +msgstr "Tüm bağlantıların %%%s'i durduruldu. Bu değer %%1'in altında olmalıdır" #: po/advisory_rules.php:230 msgid "Rate of aborted connections" From e0c9c143f1eb3602f8a984f69c12980ef2fbb97b Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:23:15 +0200 Subject: [PATCH 875/971] 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 06cd920f67..bf08159d75 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-21 12:22+0200\n" +"PO-Revision-Date: 2011-08-21 12:23+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12733,6 +12733,7 @@ msgstr "Çok fazla bağlantı durduruldu" msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"Durdurulan bağlantıların oranı %s, bu değer saat başına 1'den az olmalıdır" #: po/advisory_rules.php:235 msgid "Percentage of aborted clients" From a9cc428fd2e4248cb07cc4be8d79193df59ed5d2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:23:40 +0200 Subject: [PATCH 876/971] 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 bf08159d75..9b2cb6c556 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12741,7 +12741,7 @@ msgstr "Durdurulan istemcilerin yüzdesi" #: po/advisory_rules.php:236 po/advisory_rules.php:241 msgid "Too many clients are aborted." -msgstr "" +msgstr "Çok fazla istemci durduruldu." #: po/advisory_rules.php:237 po/advisory_rules.php:242 msgid "" From ebb52e863acb9a5cf686ab27dffa991738179ca0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:30:07 +0200 Subject: [PATCH 877/971] 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 9b2cb6c556..f22eab90ba 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-21 12:23+0200\n" +"PO-Revision-Date: 2011-08-21 12:30+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12749,6 +12749,9 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"İstemciler genellikle bağlantıları MySQL'e düzgün bir şekilde " +"yaklaşmadıklarında durdurulurlar. Bu ağ sorunlarından veya kodun veritabanı " +"işleyicisine düzgün bir şekilde yaklaşmadığından dolayı olabilir." #: po/advisory_rules.php:238 #, php-format From 4a6b600b011df442d657cb40e34e24044ac5b890 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:30:23 +0200 Subject: [PATCH 878/971] 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 f22eab90ba..78efb83238 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12710,7 +12710,7 @@ msgid "" "source-of-aborted_connects/\\\">This article might help you track down " "the source." msgstr "" -"Bağlantılar genellikle izin verilmediklerinde durdurulur. Bu makale kaynağın izini aramakta yardımcı " "olabilir." From 0086fc9ee34d1e7431bf79d54e6e8afe67358ede Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:31:27 +0200 Subject: [PATCH 879/971] 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 78efb83238..59ad841b23 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-21 12:30+0200\n" +"PO-Revision-Date: 2011-08-21 12:31+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12756,7 +12756,7 @@ msgstr "" #: po/advisory_rules.php:238 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "Tüm istemcilerin %%%s'i durduruldu. Bu değer %%2'nin altında olmalıdır" #: po/advisory_rules.php:240 msgid "Rate of aborted clients" From b2a57eadf13257ba197b4b7c075861796dfb71be Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:32:29 +0200 Subject: [PATCH 880/971] 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 59ad841b23..ae890d5a0c 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-21 12:31+0200\n" +"PO-Revision-Date: 2011-08-21 12:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12766,6 +12766,7 @@ msgstr "Durdurulan istemcilerin oranı" #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" msgstr "" +"Durdurulan istemcilerin oranı %s, bu değer saat başına 1'den az olmalıdır" #: po/advisory_rules.php:245 msgid "Is InnoDB disabled?" From 4eccebde356797cc87b411d30bd1149665619712 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:32:55 +0200 Subject: [PATCH 881/971] 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 ae890d5a0c..09188ff70b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12770,7 +12770,7 @@ msgstr "" #: po/advisory_rules.php:245 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "InnoDB etkisizleştirildi mi?" #: po/advisory_rules.php:246 msgid "You do not have InnoDB enabled." From 865428d2005bc913f24841a99e8ae1e1d9e8fb26 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:33:52 +0200 Subject: [PATCH 882/971] 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 09188ff70b..c5f9a7f830 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-21 12:32+0200\n" +"PO-Revision-Date: 2011-08-21 12:33+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12778,7 +12778,7 @@ msgstr "Etkinleştirilmiş InnoDB'ye sahip değilsiniz." #: po/advisory_rules.php:247 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "InnoDB genellikle tablo motorları için en iyi seçimdir." #: po/advisory_rules.php:248 msgid "have_innodb is set to 'value'" From 94d348de1665be01a4409f787213692f03b4051d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 12:34:12 +0200 Subject: [PATCH 883/971] 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 c5f9a7f830..ba6e7ac094 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-21 12:33+0200\n" +"PO-Revision-Date: 2011-08-21 12:34+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12782,7 +12782,7 @@ msgstr "InnoDB genellikle tablo motorları için en iyi seçimdir." #: po/advisory_rules.php:248 msgid "have_innodb is set to 'value'" -msgstr "" +msgstr "have_innodb 'value'ya ayarlı" #: po/advisory_rules.php:250 msgid "InnoDB log size" From 701478eb666a4d95deec283a59875acaf3c10bc5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:14:26 +0200 Subject: [PATCH 884/971] Translation update done using Pootle. --- po/tr.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index ba6e7ac094..916e0ae3e4 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-21 12:34+0200\n" +"PO-Revision-Date: 2011-08-21 13:14+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12810,6 +12810,17 @@ msgid "" "com/2007/01/increase-innodblogfilesize-proper-way.html\\\">this blog entry" msgstr "" +"Özellikle InnoDB tablolarına çok fazla yazmalı bir sistemde, " +"innodb_log_file_size değerini {innodb_buffer_pool_size} değerinin %%25'ine " +"ayarlamalısınız. Ancak bu değeri daha büyütmek, veritabanı çökmelerinde " +"kurtarma zamanı daha uzun olacaktır bu yüzden bu değer 256 MiB'tan çok daha " +"yükseğe ayarlanmamalıdır. Lütfen unutmayın bununla birlikte bu değişkenin " +"değerini basitçe değiştiremezsiniz. Sunucuyu kapatmanız, InnoDB günlük " +"dosyalarını kaldırmanız, my.cnf içindeki yeni değeri ayarlamanız, sunucuyu " +"başlatmanız gerekir, sonrada herşeyin iyi gittiğini anlamak için hata " +"günlüklerini kontrol etmelisiniz. Aynı zamanda bu blog girişine bakın" #: po/advisory_rules.php:253 #, php-format From 5d8cb6afa0de50493ac61fffc52143d53aa5a008 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:17:47 +0200 Subject: [PATCH 885/971] 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 916e0ae3e4..88f49cb523 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-21 13:14+0200\n" +"PO-Revision-Date: 2011-08-21 13:17+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12828,6 +12828,8 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"InnoDB arabellek havuzu boyutuyla ilgili olan InnoDB günlük boyutunuz %%%s, " +"bu %%20'nin altında olmamalıdır." #: po/advisory_rules.php:255 msgid "Max InnoDB log size" From 7c96aae65127225448712e453edaadfe160eb1ad Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:18:09 +0200 Subject: [PATCH 886/971] 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 88f49cb523..a292bb8976 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-21 13:17+0200\n" +"PO-Revision-Date: 2011-08-21 13:18+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12833,7 +12833,7 @@ msgstr "" #: po/advisory_rules.php:255 msgid "Max InnoDB log size" -msgstr "" +msgstr "En fazla InnoDB günlük boyutu" #: po/advisory_rules.php:256 msgid "The InnoDB log file size is inadequately large." From dbc13ae4d696387d0bd2bf0cdfb4229b7b318098 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:18:16 +0200 Subject: [PATCH 887/971] 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 a292bb8976..bd81d660b7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12829,7 +12829,7 @@ msgid "" "it should not be below 20%%" msgstr "" "InnoDB arabellek havuzu boyutuyla ilgili olan InnoDB günlük boyutunuz %%%s, " -"bu %%20'nin altında olmamalıdır." +"bu %%20'nin altında olmamalıdır" #: po/advisory_rules.php:255 msgid "Max InnoDB log size" From 542dff3758bdbecea3b104e2b26177c8a3020c6a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:19:31 +0200 Subject: [PATCH 888/971] 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 bd81d660b7..1a958ec6cb 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-21 13:18+0200\n" +"PO-Revision-Date: 2011-08-21 13:19+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12837,7 +12837,7 @@ msgstr "En fazla InnoDB günlük boyutu" #: po/advisory_rules.php:256 msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "InnoDB günlük dosyası boyutu yetersiz şekilde büyük." #: po/advisory_rules.php:257 #, php-format From e2dbf68f97676859da4e439a650d769ce8a55e3e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:34:23 +0200 Subject: [PATCH 889/971] Translation update done using Pootle. --- po/tr.po | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 1a958ec6cb..d606970265 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-21 13:19+0200\n" +"PO-Revision-Date: 2011-08-21 13:34+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12852,6 +12852,16 @@ msgid "" "\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" "innodblogfilesize-proper-way.html\\\">this blog entry" msgstr "" +"Genellikle innodb_log_file_size değerini {innodb_buffer_pool_size} boyutunun " +"%%25'ine ayarlamak yeterlidir. Çok innodb_log_file_size, veritabanı " +"çökmesinden sonra kurtarma zamanı oldukça yavaşlar. Aynı zamanda bu Makaleye bakın. Sunucuyu kapatmanız, InnoDB " +"günlük dosyalarını kaldırmanız, my.cnf içindeki yeni değeri ayarlamanız, " +"sunucuyu başlatmanız gerekir, sonrada herşeyin iyi gittiğini anlamak için " +"hata günlüklerini kontrol etmelisiniz. Aynı zamanda bu blog girişine bakın" #: po/advisory_rules.php:258 #, php-format From fad2d553eba042d2bbac9099c2cdc30ec293ee81 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:35:12 +0200 Subject: [PATCH 890/971] 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 d606970265..e2e091f589 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-21 13:34+0200\n" +"PO-Revision-Date: 2011-08-21 13:35+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12866,7 +12866,7 @@ msgstr "" #: po/advisory_rules.php:258 #, php-format msgid "Your absolute InnoD log size is %s MiB" -msgstr "" +msgstr "Kesin InnoD günlük boyutunuz %s MiB" #: po/advisory_rules.php:260 msgid "InnoDB buffer pool size" From 3bdbf1303ac0143233f41b2886f083625c80464c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 13:36:22 +0200 Subject: [PATCH 891/971] 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 e2e091f589..a4619373ac 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-21 13:35+0200\n" +"PO-Revision-Date: 2011-08-21 13:36+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12874,7 +12874,7 @@ msgstr "InnoDB arabellek havuzu boyutu" #: po/advisory_rules.php:261 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "InnoD arabellek havuzunuz oldukça küçük." #: po/advisory_rules.php:262 #, php-format From fa881ba965d580e1054c211dcd6e84aac27c4f1c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 14:32:34 +0200 Subject: [PATCH 892/971] Translation update done using Pootle. --- po/tr.po | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index a4619373ac..905aeef358 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-21 13:36+0200\n" +"PO-Revision-Date: 2011-08-21 14:32+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12890,6 +12890,16 @@ msgid "" "\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" "innodb_buffer_pool_size/\\\">this article" msgstr "" +"InnoDB arabellek havuzu InnoDB tabloları için performansta derin etki yapar. " +"Tüm kalan belleğinizi bu arabelleğe atayın. Veritabanı sunucuları için " +"depolama motoru olarak sadece InnoDB kullanın ve başka çalışan hizmetler " +"(örng. web sunucusu) olmasın, bunu kullanılabilir belleğin %%80'nine kadar " +"ayarlayabilirsiniz. Eğer durum bu değilse, diğer hizmetlerinizin ve InnoDB-" +"Tabloları olmayanların bellek tüketimini dikkatlice değerlendirmeniz ve " +"dolayısıyla bu değişkeni ayarlamanız gerekir. Eğer çok yükseğe ayarlanırsa, " +"sisteminiz önemli derecede performansı düşüren değiş tokuşa başlayacaktır. " +"Aynı zamanda bu makaleye bakın." #: po/advisory_rules.php:263 #, php-format From 1c68f1525332c1f120bd6f7f15dd4d3d48928d03 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 15:15:10 +0200 Subject: [PATCH 893/971] 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 905aeef358..e2189a1a8f 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-21 14:32+0200\n" +"PO-Revision-Date: 2011-08-21 15:15+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12909,6 +12909,10 @@ msgid "" "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" +"Şu an InnoDB arabellek havuzu için belleğinizin %%%s'ini kullanıyorsunuz. " +"Eğer %%60'tan az atadıysanız bu kural işe yaramaz, ancak eğer fazla InnoDB " +"tablolara sahip değilseniz ya da aynı makinede diğer hizmetler çalışıyorsa " +"bu sisteminiz için tamamen yeterli olabilir." #: po/advisory_rules.php:265 msgid "MyISAM concurrent inserts" From 6f20ebf5cfb1fa47fb84cb14729b5000449955de Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Sun, 21 Aug 2011 17:58:30 +0300 Subject: [PATCH 894/971] Fix: Monitor broken from a change by michal --- libraries/core.lib.php | 9 +++++++-- server_status.php | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index a277f29629..fbc111002f 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -724,11 +724,16 @@ function PMA_AddJSCode($str) * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings + * @param string $escaping Handle value as-is, don't use PMA_formatJsVal() on it * */ -function PMA_AddJSVar($key, $value) +function PMA_AddJSVar($key, $value, $escaping = true) { - PMA_AddJsCode(PMA_getJsValue($key, $value)); + if($escaping) { + PMA_AddJsCode($key . '=' . PMA_formatJsVal($value) . ';'); + } else { + PMA_AddJsCode($key . '=' . $value . ';'); + } } ?> diff --git a/server_status.php b/server_status.php index 1dd4852369..8d8ecf267b 100644 --- a/server_status.php +++ b/server_status.php @@ -683,7 +683,8 @@ PMA_AddJSVar( ); PMA_AddJSVar( 'server_time_diff', - 'new Date().getTime() - ' . (microtime(true) * 1000) + 'new Date().getTime() - ' . (microtime(true) * 1000), + false ); PMA_AddJSVar( 'server_os', From 047cb6845fb1a7cbd4e8adf4d68cfc46eec7804f Mon Sep 17 00:00:00 2001 From: Ammar Yasir Date: Sun, 21 Aug 2011 23:04:13 +0530 Subject: [PATCH 895/971] Fixed: Not selecting a datalabel used to issue a notice(undefined offset) --- tbl_zoom_select.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index a565768a31..2352fc1fb7 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -369,8 +369,10 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' & $row['where_clause'] = $uniqueCondition[0]; if($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]); - else + else if($dataLabel) $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]); + else + $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]); } ?> From a12822404ba2f51e0431c8c6e27225914181cc97 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 20:29:53 +0200 Subject: [PATCH 896/971] Translation update done using Pootle. --- po/sl.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 360c1511fd..81f3cc2e5f 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-20 01:33+0200\n" +"PO-Revision-Date: 2011-08-21 20:29+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11943,6 +11943,10 @@ msgid "" "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" +"Predpomnjenje poizvedb lahko izredno izboljša zmogljivost, če je " +"konfigurirano pravilno. Omogočite ga tako, da nastavite {query_cache_size} " +"na dvomestno vrednost MiB in nastavite {query_cache_type} na 'ON'. " +"Pomnite: Če uporabljate memcached, to priporočilo prezrite." #: po/advisory_rules.php:68 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" From 972cf7a2777190f3460e262db1aaa6492d2a1b7a Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 20:55:13 +0200 Subject: [PATCH 897/971] 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 81f3cc2e5f..ac49d037bc 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-21 20:29+0200\n" +"PO-Revision-Date: 2011-08-21 20:55+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11951,6 +11951,8 @@ msgstr "" #: po/advisory_rules.php:68 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" msgstr "" +"query_cache_size je nastavljen na 0 ali pa je query_cache_type nastavljen na " +"'OFF'" #: po/advisory_rules.php:71 msgid "Suboptimal caching method." From 2a1a204bd607396e24f5ce741d4fa994377a5ddc Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sun, 21 Aug 2011 21:06:07 +0200 Subject: [PATCH 898/971] Fix notice about undefined variable --- pmd_general.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index cf8d842d69..1a7d3df67c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -32,7 +32,7 @@ echo ' var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; echo "\n"; - if ($_REQUEST['query']) { + if (isset($_REQUEST['query'])) { echo ' $(document).ready(function() { $(".trigger").click(function() { @@ -103,7 +103,7 @@ echo $script_tabs . $script_contr . $script_display_field; >key - '; echo 'keystartDocument('1.0','UTF-8'); - $this->startDtd('svg','-//W3C//DTD SVG 1.1//EN','http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'); + $this->startDocument('1.0', 'UTF-8'); + $this->startDtd( + 'svg', '-//W3C//DTD SVG 1.1//EN', + 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' + ); $this->endDtd(); } /** * Set document title * - * @param string value sets the title text + * @param string $value sets the title text + * * @return void * @access public */ @@ -64,7 +67,8 @@ class PMA_SVG extends XMLWriter /** * Set document author * - * @param string value sets the author + * @param string $value sets the author + * * @return void * @access public */ @@ -76,7 +80,8 @@ class PMA_SVG extends XMLWriter /** * Set document font * - * @param string value sets the font e.g Arial, Sans-serif etc + * @param string $value sets the font e.g Arial, Sans-serif etc + * * @return void * @access public */ @@ -99,7 +104,8 @@ class PMA_SVG extends XMLWriter /** * Set document font size * - * @param string value sets the font size in pixels + * @param string $value sets the font size in pixels + * * @return void * @access public */ @@ -126,10 +132,12 @@ class PMA_SVG extends XMLWriter * which contains all the attributes and namespace that needed * to define the svg document * - * @param integer width total width of the Svg document - * @param integer height total height of the Svg document + * @param integer $width total width of the Svg document + * @param integer $height total height of the Svg document + * * @return void * @access public + * * @see XMLWriter::startElement(),XMLWriter::writeAttribute() */ function startSvgDoc($width,$height) @@ -161,6 +169,8 @@ class PMA_SVG extends XMLWriter * Svg document saved in .svg extension and can be * easily changeable by using any svg IDE * + * @param string $fileName file name + * * @return void * @access public * @see XMLWriter::startElement(),XMLWriter::writeAttribute() @@ -180,31 +190,32 @@ class PMA_SVG extends XMLWriter * and other elements who have x,y co-ordinates are drawn. * specify their width and height and can give styles too. * - * @param string name Svg element name - * @param integer x The x attribute defines the left position of the element - (e.g. x="0" places the element 0 pixels from the left of - the browser window) - * @param integer y The y attribute defines the top position of the element - (e.g. y="0" places the element 0 pixels from the top of - the browser window) - * @param integer width The width attribute defines the width the element - * @param integer height The height attribute defines the height the element - * @param string text The text attribute defines the text the element - * @param string styles The style attribute defines the style the element - styles can be defined like CSS styles + * @param string $name Svg element name + * @param integer $x The x attr defines the left position of the element + * (e.g. x="0" places the element 0 pixels from the left of the browser window) + * @param integer $y The y attribute defines the top position of the element + * (e.g. y="0" places the element 0 pixels from the top of the browser window) + * @param integer $width The width attribute defines the width the element + * @param integer $height The height attribute defines the height the element + * @param string $text The text attribute defines the text the element + * @param string $styles The style attribute defines the style the element + * styles can be defined like CSS styles + * * @return void * @access public - * @see XMLWriter::startElement(),XMLWriter::writeAttribute(),XMLWriter::text(),XMLWriter::endElement() + * + * @see XMLWriter::startElement(), XMLWriter::writeAttribute(), + * XMLWriter::text(), XMLWriter::endElement() */ - function printElement($name,$x,$y,$width = '',$height = '',$text = '',$styles = '') + function printElement($name, $x, $y, $width = '', $height = '', $text = '', $styles = '') { $this->startElement($name); - $this->writeAttribute('width',$width); - $this->writeAttribute('height',$height); + $this->writeAttribute('width', $width); + $this->writeAttribute('height', $height); $this->writeAttribute('x', $x); $this->writeAttribute('y', $y); $this->writeAttribute('style', $styles); - if(isset($text)){ + if (isset($text)) { $this->writeAttribute('font-family', $this->font); $this->writeAttribute('font-size', $this->fontSize); $this->text($text); @@ -219,22 +230,25 @@ class PMA_SVG extends XMLWriter * arrows are also drawn by specify its start and ending * co-ordinates * - * @param string name Svg element name i.e line - * @param integer x1 The x1 attribute defines the start of the line on the x-axis - * @param integer y1 The y1 attribute defines the start of the line on the y-axis - * @param integer x2 The x2 attribute defines the end of the line on the x-axis - * @param integer y2 The y2 attribute defines the end of the line on the y-axis - * @param string styles The style attribute defines the style the element - styles can be defined like CSS styles + * @param string $name Svg element name i.e line + * @param integer $x1 Defines the start of the line on the x-axis + * @param integer $y1 Defines the start of the line on the y-axis + * @param integer $x2 Defines the end of the line on the x-axis + * @param integer $y2 Defines the end of the line on the y-axis + * @param string $styles The style attribute defines the style the element + * styles can be defined like CSS styles + * * @return void * @access public - * @see XMLWriter::startElement(),XMLWriter::writeAttribute(),XMLWriter::endElement() + * + * @see XMLWriter::startElement(), XMLWriter::writeAttribute(), + * XMLWriter::endElement() */ function printElementLine($name,$x1,$y1,$x2,$y2,$styles) { $this->startElement($name); - $this->writeAttribute('x1',$x1); - $this->writeAttribute('y1',$y1); + $this->writeAttribute('x1', $x1); + $this->writeAttribute('y1', $y1); $this->writeAttribute('x2', $x2); $this->writeAttribute('y2', $y2); $this->writeAttribute('style', $styles); @@ -250,9 +264,10 @@ class PMA_SVG extends XMLWriter * * This is a bit hardcore method. I didn't found any other than this. * - * @param string text string that width will be calculated - * @param integer font name of the font like Arial,sans-serif etc - * @param integer fontSize size of font + * @param string $text string that width will be calculated + * @param integer $font name of the font like Arial,sans-serif etc + * @param integer $fontSize size of font + * * @return integer width of the text * @access public */ @@ -262,22 +277,22 @@ class PMA_SVG extends XMLWriter * Start by counting the width, giving each character a modifying value */ $count = 0; - $count = $count + ((strlen($text) - strlen(str_replace(array("i","j","l"),"",$text)))*0.23);//ijl - $count = $count + ((strlen($text) - strlen(str_replace(array("f"),"",$text)))*0.27);//f - $count = $count + ((strlen($text) - strlen(str_replace(array("t","I"),"",$text)))*0.28);//tI - $count = $count + ((strlen($text) - strlen(str_replace(array("r"),"",$text)))*0.34);//r - $count = $count + ((strlen($text) - strlen(str_replace(array("1"),"",$text)))*0.49);//1 - $count = $count + ((strlen($text) - strlen(str_replace(array("c","k","s","v","x","y","z","J"),"",$text)))*0.5);//cksvxyzJ - $count = $count + ((strlen($text) - strlen(str_replace(array("a","b","d","e","g","h","n","o","p","q","u","L","0","2","3","4","5","6","7","8","9"),"",$text)))*0.56);//abdeghnopquL023456789 - $count = $count + ((strlen($text) - strlen(str_replace(array("F","T","Z"),"",$text)))*0.61);//FTZ - $count = $count + ((strlen($text) - strlen(str_replace(array("A","B","E","K","P","S","V","X","Y"),"",$text)))*0.67);//ABEKPSVXY - $count = $count + ((strlen($text) - strlen(str_replace(array("w","C","D","H","N","R","U"),"",$text)))*0.73);//wCDHNRU - $count = $count + ((strlen($text) - strlen(str_replace(array("G","O","Q"),"",$text)))*0.78);//GOQ - $count = $count + ((strlen($text) - strlen(str_replace(array("m","M"),"",$text)))*0.84);//mM - $count = $count + ((strlen($text) - strlen(str_replace("W","",$text)))*.95);//W - $count = $count + ((strlen($text) - strlen(str_replace(" ","",$text)))*.28);//" " - $text = str_replace(" ","",$text);//remove the " "'s - $count = $count + (strlen(preg_replace("/[a-z0-9]/i","",$text))*0.3); //all other chrs + $count = $count + ((strlen($text) - strlen(str_replace(array("i", "j", "l"), "", $text))) * 0.23);//ijl + $count = $count + ((strlen($text) - strlen(str_replace(array("f"), "", $text))) * 0.27);//f + $count = $count + ((strlen($text) - strlen(str_replace(array("t", "I"), "", $text))) * 0.28);//tI + $count = $count + ((strlen($text) - strlen(str_replace(array("r"), "", $text))) * 0.34);//r + $count = $count + ((strlen($text) - strlen(str_replace(array("1"), "", $text))) * 0.49);//1 + $count = $count + ((strlen($text) - strlen(str_replace(array("c", "k", "s", "v", "x", "y", "z", "J"), "", $text))) * 0.5);//cksvxyzJ + $count = $count + ((strlen($text) - strlen(str_replace(array("a", "b", "d", "e", "g", "h", "n", "o", "p", "q", "u", "L", "0", "2", "3", "4", "5", "6", "7", "8", "9"), "", $text))) * 0.56);//abdeghnopquL023456789 + $count = $count + ((strlen($text) - strlen(str_replace(array("F", "T", "Z"), "", $text))) * 0.61);//FTZ + $count = $count + ((strlen($text) - strlen(str_replace(array("A", "B", "E", "K", "P", "S", "V", "X", "Y"), "", $text))) * 0.67);//ABEKPSVXY + $count = $count + ((strlen($text) - strlen(str_replace(array("w", "C", "D", "H", "N", "R", "U"), "", $text))) * 0.73);//wCDHNRU + $count = $count + ((strlen($text) - strlen(str_replace(array("G", "O", "Q"), "", $text))) * 0.78);//GOQ + $count = $count + ((strlen($text) - strlen(str_replace(array("m", "M"), "", $text))) * 0.84);//mM + $count = $count + ((strlen($text) - strlen(str_replace("W", "", $text))) * .95);//W + $count = $count + ((strlen($text) - strlen(str_replace(" ", "", $text))) * .28);//" " + $text = str_replace(" ", "", $text);//remove the " "'s + $count = $count + (strlen(preg_replace("/[a-z0-9]/i", "", $text)) * 0.3); //all other chrs $modifier = 1; $font = strtolower($font); @@ -287,7 +302,7 @@ class PMA_SVG extends XMLWriter */ case 'arial': case 'sans-serif': - break; + break; /* * .92 modifer for time, serif, brushscriptstd, and californian fb */ @@ -296,13 +311,13 @@ class PMA_SVG extends XMLWriter case 'brushscriptstd': case 'californian fb': $modifier = .92; - break; + break; /* * 1.23 modifier for broadway */ case 'broadway': $modifier = 1.23; - break; + break; } $textWidth = $count*$fontSize; return ceil($textWidth*$modifier); @@ -338,29 +353,39 @@ class Table_Stats /** * The "Table_Stats" constructor * - * @param string table_name The table name - * @param integer ff The font size - * @param integer samewidth The max. with among tables - * @param boolean show_keys Whether to display keys or not - * @param boolean show_info Whether to display table position or not + * @param string $tableName The table name + * @param string $font Font face + * @param integer $fontSize The font size + * @param integer $pageNumber Page number + * @param integer &$same_wide_width The max. with among tables + * @param boolean $showKeys Whether to display keys or not + * @param boolean $showInfo Whether to display table position or not + * * @global object The current SVG image document * @global integer The current page number (from the - * $cfg['Servers'][$i]['table_coords'] table) + * $cfg['Servers'][$i]['table_coords'] table) * @global array The relations settings * @global string The current db name + * * @access private + * * @see PMA_SVG, Table_Stats::Table_Stats_setWidth, - Table_Stats::Table_Stats_setHeight + * Table_Stats::Table_Stats_setHeight */ - function __construct($tableName, $font, $fontSize, $pageNumber, &$same_wide_width, $showKeys = false, $showInfo = false) + function __construct($tableName, $font, $fontSize, $pageNumber, + &$same_wide_width, $showKeys = false, $showInfo = false) { global $svg, $cfgRelation, $db; $this->_tableName = $tableName; $sql = 'DESCRIBE ' . PMA_backquote($tableName); $result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE); - if (!$result || !PMA_DBI_num_rows($result)) { - $svg->dieSchema($pageNumber,"SVG",sprintf(__('The %s table doesn\'t exist!'), $tableName)); + if (! $result || ! PMA_DBI_num_rows($result)) { + $svg->dieSchema( + $pageNumber, + "SVG", + sprintf(__('The %s table doesn\'t exist!'), $tableName) + ); } /* @@ -372,7 +397,10 @@ class Table_Stats $indexes = PMA_Index::getFromTable($this->_tableName, $db); $all_columns = array(); foreach ($indexes as $index) { - $all_columns = array_merge($all_columns, array_flip(array_keys($index->getColumns()))); + $all_columns = array_merge( + $all_columns, + array_flip(array_keys($index->getColumns())) + ); } $this->fields = array_keys($all_columns); } else { @@ -388,21 +416,29 @@ class Table_Stats // setWidth must me after setHeight, because title // can include table height which changes table width - $this->_setWidthTable($font,$fontSize); + $this->_setWidthTable($font, $fontSize); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } // x and y $sql = 'SELECT x, y FROM ' - . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['table_coords']) + . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' + . PMA_backquote($cfgRelation['table_coords']) . ' WHERE db_name = \'' . PMA_sqlAddSlashes($db) . '\'' . ' AND table_name = \'' . PMA_sqlAddSlashes($tableName) . '\'' . ' AND pdf_page_number = ' . $pageNumber; $result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE); if (!$result || !PMA_DBI_num_rows($result)) { - $svg->dieSchema($pageNumber,"SVG",sprintf(__('Please configure the coordinates for table %s'), $tableName)); + $svg->dieSchema( + $pageNumber, + "SVG", + sprintf( + __('Please configure the coordinates for table %s'), + $tableName + ) + ); } list($this->x, $this->y) = PMA_DBI_fetch_row($result); $this->x = (double) $this->x; @@ -410,7 +446,11 @@ class Table_Stats // displayfield $this->displayfield = PMA_getDisplayField($db, $tableName); // index - $result = PMA_DBI_query('SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query( + 'SHOW INDEX FROM ' . PMA_backquote($tableName) . ';', + null, + PMA_DBI_QUERY_STORE + ); if (PMA_DBI_num_rows($result) > 0) { while ($row = PMA_DBI_fetch_assoc($result)) { if ($row['Key_name'] == 'PRIMARY') { @@ -428,16 +468,23 @@ class Table_Stats */ private function _getTitle() { - return ($this->_showInfo ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) : '') . ' ' . $this->_tableName; + return ($this->_showInfo + ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->heightCell) + : '' + ) . ' ' . $this->_tableName; } /** * Sets the width of the table * - * @param string font The font size - * @param integer fontSize The font size + * @param string $font The font size + * @param integer $fontSize The font size + * * @global object The current SVG image document + * + * @return nothing * @access private + * * @see PMA_SVG */ private function _setWidthTable($font,$fontSize) @@ -445,14 +492,18 @@ class Table_Stats global $svg; foreach ($this->fields as $field) { - $this->width = max($this->width, $svg->getStringWidth($field,$font,$fontSize)); + $this->width = max( + $this->width, + $svg->getStringWidth($field, $font, $fontSize) + ); } - $this->width += $svg->getStringWidth(' ',$font,$fontSize); + $this->width += $svg->getStringWidth(' ', $font, $fontSize); + /* * it is unknown what value must be added, because * table title is affected by the tabe width value */ - while ($this->width < $svg->getStringWidth($this->_getTitle(),$font,$fontSize)) { + while ($this->width < $svg->getStringWidth($this->_getTitle(), $font, $fontSize)) { $this->width += 7; } } @@ -460,6 +511,9 @@ class Table_Stats /** * Sets the height of the table * + * @param integer $fontSize font size + * + * @return nothing * @access private */ function _setHeightTable($fontSize) @@ -471,45 +525,46 @@ class Table_Stats /** * draw the table * - * @param boolean showColor Whether to display color + * @param boolean $showColor Whether to display color + * * @global object The current SVG image document + * * @access public + * @return nothing + * * @see PMA_SVG,PMA_SVG::printElement */ public function tableDraw($showColor) { global $svg; //echo $this->_tableName.'
    '; - $svg->printElement('rect',$this->x,$this->y, - $this->width,$this->heightCell, - NULL,'fill:red;stroke:black;' - ); - $svg->printElement('text',$this->x + 5,$this->y+ 14, - $this->width,$this->heightCell, - $this->_getTitle(), - 'fill:none;stroke:black;' - ); + $svg->printElement( + 'rect', $this->x, $this->y, $this->width, + $this->heightCell, null, 'fill:red;stroke:black;' + ); + $svg->printElement( + 'text', $this->x + 5, $this->y+ 14, $this->width, $this->heightCell, + $this->_getTitle(), 'fill:none;stroke:black;' + ); foreach ($this->fields as $field) { - $this->currentCell += $this->heightCell; - $showColor = 'none'; - if ($showColor) { - if (in_array($field, $this->primary)) { - $showColor = '#0c0'; - } - if ($field == $this->displayfield) { - $showColor = 'none'; - } + $this->currentCell += $this->heightCell; + $showColor = 'none'; + if ($showColor) { + if (in_array($field, $this->primary)) { + $showColor = '#0c0'; } - $svg->printElement('rect', $this->x,$this->y + $this->currentCell, - $this->width, $this->heightCell, - NULL, - 'fill:'.$showColor.';stroke:black;' - ); - $svg->printElement('text', $this->x + 5, $this->y + 14 + $this->currentCell, - $this->width, $this->heightCell, - $field, - 'fill:none;stroke:black;' - ); + if ($field == $this->displayfield) { + $showColor = 'none'; + } + } + $svg->printElement( + 'rect', $this->x, $this->y + $this->currentCell, $this->width, + $this->heightCell, null, 'fill:'.$showColor.';stroke:black;' + ); + $svg->printElement( + 'text', $this->x + 5, $this->y + 14 + $this->currentCell, + $this->width, $this->heightCell, $field, 'fill:none;stroke:black;' + ); } } } @@ -540,10 +595,13 @@ class Relation_Stats /** * The "Relation_Stats" constructor * - * @param string master_table The master table name - * @param string master_field The relation field in the master table - * @param string foreign_table The foreign table name - * @param string foreigh_field The relation field in the foreign table + * @param string $master_table The master table name + * @param string $master_field The relation field in the master table + * @param string $foreign_table The foreign table name + * @param string $foreign_field The relation field in the foreign table + * + * @return nothing + * * @see Relation_Stats::_getXy */ function __construct($master_table, $master_field, $foreign_table, $foreign_field) @@ -594,8 +652,9 @@ class Relation_Stats /** * Gets arrows coordinates * - * @param string table The current table name - * @param string column The relation column name + * @param string $table The current table name + * @param string $column The relation column name + * * @return array Arrows coordinates * @access private */ @@ -603,16 +662,23 @@ class Relation_Stats { $pos = array_search($column, $table->fields); // x_left, x_right, y - return array($table->x, $table->x + $table->width, $table->y + ($pos + 1.5) * $table->heightCell); + return array( + $table->x, + $table->x + $table->width, + $table->y + ($pos + 1.5) * $table->heightCell + ); } /** - * draws relation links and arrows - * shows foreign key relations + * draws relation links and arrows shows foreign key relations * - * @param boolean changeColor Whether to use one color per relation or not - * @global object The current SVG image document + * @param boolean $changeColor Whether to use one color per relation or not + * + * @global object The current SVG image document + * + * @return nothing * @access public + * * @see PMA_SVG */ public function relationDraw($changeColor) @@ -635,38 +701,46 @@ class Relation_Stats $color = 'black'; } - $svg->printElementLine('line',$this->xSrc,$this->ySrc, - $this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick, $this->yDest, - $this->xDest, $this->yDest, - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick,$this->ySrc, + $svg->printElementLine( + 'line', $this->xSrc, $this->ySrc, + $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick, + $this->yDest, $this->xDest, $this->yDest, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick, $this->ySrc, $this->xDest + $this->destDir * $this->wTick, $this->yDest, - 'fill:'.$color.';stroke:'.$color.';stroke-width:1;' - ); + 'fill:' . $color . ';stroke:' . $color . ';stroke-width:1;' + ); $root2 = 2 * sqrt(2); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc + $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, - $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick , - $this->ySrc - $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick / 2 , $this->yDest , + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc + $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xSrc + $this->srcDir * $this->wTick * 0.75, $this->ySrc, + $this->xSrc + $this->srcDir * (0.75 - 1 / $root2) * $this->wTick, + $this->ySrc - $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, - $this->yDest + $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;'); - $svg->printElementLine('line',$this->xDest + $this->destDir * $this->wTick / 2 , - $this->yDest , $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick , - $this->yDest - $this->wTick / $root2 , - 'fill:'.$color.';stroke:black;stroke-width:2;' - ); + $this->yDest + $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); + $svg->printElementLine( + 'line', $this->xDest + $this->destDir * $this->wTick / 2, $this->yDest, + $this->xDest + $this->destDir * (0.5 + 1 / $root2) * $this->wTick, + $this->yDest - $this->wTick / $root2, + 'fill:' . $color . ';stroke:black;stroke-width:2;' + ); } } /* @@ -724,22 +798,31 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); $svg = new PMA_SVG(); - $svg->setTitle(sprintf(__('Schema of the %s database - Page %s'), $db, $this->pageNumber)); + $svg->setTitle( + sprintf( + __('Schema of the %s database - Page %s'), + $db, + $this->pageNumber + ) + ); $svg->SetAuthor('phpMyAdmin ' . PMA_VERSION); $svg->setFont('Arial'); $svg->setFontSize('16px'); - $svg->startSvgDoc('1000px','1000px'); - $alltables = $this->getAllTables($db,$this->pageNumber); + $svg->startSvgDoc('1000px', '1000px'); + $alltables = $this->getAllTables($db, $this->pageNumber); foreach ($alltables AS $table) { if (! isset($this->tables[$table])) { - $this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension); + $this->tables[$table] = new Table_Stats( + $table, $svg->getFont(), $svg->getFontSize(), $this->pageNumber, + $this->_tablewidth, $this->showKeys, $this->tableDimension + ); } if ($this->sameWide) { $this->tables[$table]->width = $this->_tablewidth; } - $this->_setMinMax($this->tables[$table]); + $this->_setMinMax($this->tables[$table]); } $seen_a_relation = false; foreach ($alltables as $one_table) { @@ -753,7 +836,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema * to do a === false and this is not PHP3 compatible) */ if (in_array($rel['foreign_table'], $alltables)) { - $this->_addRelation($one_table,$svg->getFont(),$svg->getFontSize(), $master_field, $rel['foreign_table'], $rel['foreign_field'], $this->tableDimension); + $this->_addRelation( + $one_table, $svg->getFont(), $svg->getFontSize(), + $master_field, $rel['foreign_table'], + $rel['foreign_field'], $this->tableDimension + ); } } } @@ -771,7 +858,9 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Sets X and Y minimum and maximum for a table cell * - * @param string table The table name + * @param string $table The table name + * + * @return nothing * @access private */ private function _setMinMax($table) @@ -785,25 +874,40 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Defines relation objects * - * @param string masterTable The master table name - * @param string masterField The relation field in the master table - * @param string foreignTable The foreign table name - * @param string foreignField The relation field in the foreign table - * @param boolean showInfo Whether to display table position or not + * @param string $masterTable The master table name + * @param string $font The font face + * @param int $fontSize Font size + * @param string $masterField The relation field in the master table + * @param string $foreignTable The foreign table name + * @param string $foreignField The relation field in the foreign table + * @param boolean $showInfo Whether to display table position or not + * * @access private + * @return nothing + * * @see _setMinMax,Table_Stats::__construct(),Relation_Stats::__construct() */ - private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo) + private function _addRelation($masterTable,$font,$fontSize, $masterField, + $foreignTable, $foreignField, $showInfo) { if (! isset($this->tables[$masterTable])) { - $this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$masterTable] = new Table_Stats( + $masterTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$masterTable]); } if (! isset($this->tables[$foreignTable])) { - $this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo); + $this->tables[$foreignTable] = new Table_Stats( + $foreignTable, $font, $fontSize, $this->pageNumber, + $this->_tablewidth, false, $showInfo + ); $this->_setMinMax($this->tables[$foreignTable]); } - $this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField); + $this->_relations[] = new Relation_Stats( + $this->tables[$masterTable], $masterField, + $this->tables[$foreignTable], $foreignField + ); } /** @@ -811,8 +915,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema * connects master table's master field to * foreign table's forein field * - * @param boolean changeColor Whether to use one color per relation or not + * @param boolean $changeColor Whether to use one color per relation or not + * + * @return nothing * @access private + * * @see Relation_Stats::relationDraw() */ private function _drawRelations($changeColor) @@ -825,8 +932,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema /** * Draws tables * - * @param boolean changeColor Whether to show color for primary fields or not + * @param boolean $changeColor Whether to show color for primary fields or not + * + * @return nothing * @access private + * * @see Table_Stats::Table_Stats_tableDraw() */ private function _drawTables($changeColor) From a3a939d18f41590ed865443d76fb3e64dd21cb8d Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:24:28 +0200 Subject: [PATCH 900/971] Translation update done using Pootle. --- po/sl.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index ac49d037bc..d378295b54 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-21 20:55+0200\n" +"PO-Revision-Date: 2011-08-21 21:24+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11965,6 +11965,11 @@ msgid "" "refman/5.1/en/ha-memcached.html\\\">memcached instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" +"Uporabljate predpomnjenje poizvedb MySQL s precej prometno zbirko podatkov. " +"Morda bi bilo koristno razmisliti o uporabi memcached namesto predpomnjenja poizvedb MySQL, še " +"posebej, če imate več podrejencev." #: po/advisory_rules.php:73 #, php-format From 211902876599eddfb0af9ed80a1c7157694488c9 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:25:43 +0200 Subject: [PATCH 901/971] 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 d378295b54..3e7c3a1f4d 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-21 21:24+0200\n" +"PO-Revision-Date: 2011-08-21 21:25+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11977,6 +11977,8 @@ msgid "" "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." msgstr "" +"Predpomnjenje poizvedb je omogočeno in strežnik prejema %d poizvedb na " +"sekundo. To pravilo se sproži, če je več kot 100 poizvedb na sekundo." #: po/advisory_rules.php:75 msgid "Query cache efficiency (%)" From 0e31082396b195cf3b2943f0c1d3f6309077fa33 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:26:24 +0200 Subject: [PATCH 902/971] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 3e7c3a1f4d..c2311417ac 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-21 21:25+0200\n" +"PO-Revision-Date: 2011-08-21 21:26+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11982,7 +11982,7 @@ msgstr "" #: po/advisory_rules.php:75 msgid "Query cache efficiency (%)" -msgstr "" +msgstr "Učinkovitost predpomnjenja poizvedb (%)" #: po/advisory_rules.php:76 msgid "Query cache not running efficiently, it has a low hit rate." From 958e94d869618dc00a5f489f3161b6ec12e8a61a Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:46:42 +0200 Subject: [PATCH 903/971] Translation update done using Pootle. --- po/sl.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index c2311417ac..5c0f0e4c38 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-21 21:26+0200\n" +"PO-Revision-Date: 2011-08-21 21:46+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11987,6 +11987,7 @@ msgstr "Učinkovitost predpomnjenja poizvedb (%)" #: po/advisory_rules.php:76 msgid "Query cache not running efficiently, it has a low hit rate." msgstr "" +"Predpomnjenje poizvedb ne teče učinkovito, saj ima nizek delež zadetkov." #: po/advisory_rules.php:77 msgid "Consider increasing {query_cache_limit}." From 6771df55213a9dfc5c092386b85c97ad858c4f0e Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:47:27 +0200 Subject: [PATCH 904/971] Translation update done using Pootle. --- po/sl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sl.po b/po/sl.po index 5c0f0e4c38..56afa64d26 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-21 21:46+0200\n" +"PO-Revision-Date: 2011-08-21 21:47+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -11996,7 +11996,7 @@ msgstr "Razmislite o povečanju {query_cache_limit}." #: po/advisory_rules.php:78 #, php-format msgid "The current query cache hit rate of %s%% is below 20%%" -msgstr "" +msgstr "Trenutni delež zadetkov predpomnilnika poizvedb %s %% je pod 20 %%" #: po/advisory_rules.php:80 msgid "Query Cache usage" From ce13afede89bc2ac1cfed37639ec6513b58b17d9 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 21:47:50 +0200 Subject: [PATCH 905/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 56afa64d26..459d08e4e5 100644 --- a/po/sl.po +++ b/po/sl.po @@ -12005,7 +12005,7 @@ msgstr "Uporaba predpomnilnika poizvedb" #: po/advisory_rules.php:81 #, php-format msgid "Less than 80%% of the query cache is being utilized." -msgstr "" +msgstr "Izkoriščanega je manj kot 80 %% predpomnilnika poizvedb." #: po/advisory_rules.php:82 msgid "" From afaa9f24343ff6179d59640a25057affa6d86469 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 22:05:03 +0200 Subject: [PATCH 906/971] 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 e2189a1a8f..0afd5fa742 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-21 15:15+0200\n" +"PO-Revision-Date: 2011-08-21 22:05+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12920,7 +12920,7 @@ msgstr "MyISAM eşzamanlı eklemeler" #: po/advisory_rules.php:266 msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "concurrent_insert'ü 1'e ayarlayarak bunu etkinleştirin" #: po/advisory_rules.php:267 msgid "" From 1f735c93076538c052c5328d979f695f28ad5df1 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 22:10:02 +0200 Subject: [PATCH 907/971] 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 0afd5fa742..a029683442 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-21 22:05+0200\n" +"PO-Revision-Date: 2011-08-21 22:10+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12928,6 +12928,10 @@ msgid "" "writers for a given table. See also MySQL Documentation" msgstr "" +"{concurrent_insert} 1'e ayarlamak verilen bir tablo için okuyucular ve " +"yazıcılar arasındaki bağlantıyı azaltır. Aynı zamanda MySQL Belgesine bakın" #: po/advisory_rules.php:268 msgid "concurrent_insert is set to 0" From 5d6bcfeb996c5d497e9168e99e65d852beea9480 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 22:10:37 +0200 Subject: [PATCH 908/971] 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 a029683442..95a7f90e49 100644 --- a/po/tr.po +++ b/po/tr.po @@ -12935,7 +12935,7 @@ msgstr "" #: po/advisory_rules.php:268 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "concurrent_insert 0'a ayarlı" #~ msgid "" #~ "The Advisor system can provide recommendations on server variables by " From 3b1ec986fc8563e451cd1b70543066132afe342e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 21 Aug 2011 22:12:35 +0200 Subject: [PATCH 909/971] 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 95a7f90e49..8ca7e10860 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-21 22:10+0200\n" +"PO-Revision-Date: 2011-08-21 22:12+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -12899,7 +12899,7 @@ msgstr "" "dolayısıyla bu değişkeni ayarlamanız gerekir. Eğer çok yükseğe ayarlanırsa, " "sisteminiz önemli derecede performansı düşüren değiş tokuşa başlayacaktır. " "Aynı zamanda bu makaleye bakın." +"/choosing-innodb_buffer_pool_size/\\\">bu makaleye bakın" #: po/advisory_rules.php:263 #, php-format From c423adc906877855b0ca80b90c50a1dd0ec19fc7 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 22:16:26 +0200 Subject: [PATCH 910/971] 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 459d08e4e5..11f6c25a78 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-21 21:47+0200\n" +"PO-Revision-Date: 2011-08-21 22:16+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12012,6 +12012,8 @@ msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." msgstr "" +"To morda povzroča prenizek {query_cache_limit}. Izplaknitev predpomnilnika " +"poizvedb bo morda prav tako pomagala." #: po/advisory_rules.php:83 #, php-format From 76ebdaa5fd33949f38de044ba6b6f5676d21b16a Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 22:26:22 +0200 Subject: [PATCH 911/971] 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 11f6c25a78..0f2c1a4bdd 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-21 22:16+0200\n" +"PO-Revision-Date: 2011-08-21 22:26+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12021,6 +12021,8 @@ msgid "" "The current ratio of free query cache memory to total query cache size is %s" "%%. It should be above 80%%" msgstr "" +"Trenutni delež prostega pomnilnika predpomnilnika poizvedb je v primerjavi s " +"skupnim pomnilnikom predpomnilnima poizvedb %s %%. Moral bi biti nad 80 %%" #: po/advisory_rules.php:85 msgid "Query cache fragmentation" From 5e306826192f193dd4909b8d63b83f56f3b26b10 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 22:26:44 +0200 Subject: [PATCH 912/971] Translation update done using Pootle. --- po/sl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sl.po b/po/sl.po index 0f2c1a4bdd..1ada9e97ab 100644 --- a/po/sl.po +++ b/po/sl.po @@ -12030,7 +12030,7 @@ msgstr "Razdrobljenost predpomnilnika poizvedb" #: po/advisory_rules.php:86 msgid "The query cache is considerably fragmented." -msgstr "" +msgstr "Predpomnilnik poizvedb je precej razdrobljen." #: po/advisory_rules.php:87 msgid "" From 155037773875aceed61f9bce1c44f3c9cf74b122 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 21 Aug 2011 22:29:12 +0200 Subject: [PATCH 913/971] 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 1ada9e97ab..27017142d3 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-21 22:26+0200\n" +"PO-Revision-Date: 2011-08-21 22:29+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" @@ -12051,6 +12051,9 @@ msgid "" "that the query cache is an alternating pattern of free and used blocks. This " "value should be below 20%%." msgstr "" +"Predpomnilnik je trenutno %s-%% razdrobljen, pri čemer 100-%% razdrobljenost " +"pomeni, da je predpomnilnik poizvedb izmeničen vzorec prostih in " +"uporabljenih blokov. Ta vrednost bi morala biti pod 20 %%." #: po/advisory_rules.php:90 msgid "Query cache low memory prunes" From ded7b7065ccf124e8b48b87fc5569fddaa08df0f Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 21 Aug 2011 22:53:43 +0200 Subject: [PATCH 914/971] coding style, wrapping long lines --- libraries/Config.class.php | 332 +++++++++++++++++++++++++++---------- 1 file changed, 248 insertions(+), 84 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f3908564d2..9c8266a1da 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -9,7 +9,7 @@ /** * Load vendor configuration. */ -require('./libraries/vendor_config.php'); +require './libraries/vendor_config.php'; /** * Configuration class @@ -75,7 +75,7 @@ class PMA_Config /** * constructor * - * @param string source to read config from + * @param string $source source to read config from */ function __construct($source = null) { @@ -93,6 +93,8 @@ class PMA_Config /** * sets system and application settings + * + * @return nothing */ function checkSystem() { @@ -118,6 +120,8 @@ class PMA_Config /** * whether to use gzip output compression or not + * + * @return nothing */ function checkOutputCompression() { @@ -130,8 +134,9 @@ class PMA_Config // disable output-buffering (if set to 'auto') for IE6, else enable it. if (strtolower($this->get('OBGzip')) == 'auto') { if ($this->get('PMA_USR_BROWSER_AGENT') == 'IE' - && $this->get('PMA_USR_BROWSER_VER') >= 6 - && $this->get('PMA_USR_BROWSER_VER') < 7) { + && $this->get('PMA_USR_BROWSER_VER') >= 6 + && $this->get('PMA_USR_BROWSER_VER') < 7 + ) { $this->set('OBGzip', false); } else { $this->set('OBGzip', true); @@ -142,7 +147,10 @@ class PMA_Config /** * Determines platform (OS), browser and version of the user * Based on a phpBuilder article: + * * @see http://www.phpbuilder.net/columns/tim20000821.php + * + * @return nothing */ function checkClient() { @@ -170,28 +178,51 @@ class PMA_Config // 2. browser and version // (must check everything else before Mozilla) - if (preg_match('@Opera(/| )([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + if (preg_match( + '@Opera(/| )([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); - } elseif (preg_match('@MSIE ([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@MSIE ([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); - } elseif (preg_match('@OmniWeb/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@OmniWeb/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'OMNIWEB'); // Konqueror 2.2.2 says Konqueror/2.2.2 // Konqueror 3.0.3 says Konqueror/3 - } elseif (preg_match('@(Konqueror/)(.*)(;)@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match( + '@(Konqueror/)(.*)(;)@', + $HTTP_USER_AGENT, + $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'KONQUEROR'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version) - && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2)) { + } elseif (preg_match( + '@Mozilla/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) + && preg_match('@Safari/([0-9]*)@', $HTTP_USER_AGENT, $log_version2) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1] . '.' . $log_version2[1]); $this->set('PMA_USR_BROWSER_AGENT', 'SAFARI'); } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) { $this->set('PMA_USR_BROWSER_VER', '1.9'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version)) { + } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@' + , $HTTP_USER_AGENT + , $log_version) + ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); } else { @@ -202,6 +233,8 @@ class PMA_Config /** * Whether GD2 is present + * + * @return nothing */ function checkGd2() { @@ -243,14 +276,17 @@ class PMA_Config /** * Whether the Web server php is running on is IIS + * + * @return nothing */ function checkWebServer() { if (PMA_getenv('SERVER_SOFTWARE') - // some versions return Microsoft-IIS, some Microsoft/IIS - // we could use a preg_match() but it's slower - && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft') - && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS')) { + // some versions return Microsoft-IIS, some Microsoft/IIS + // we could use a preg_match() but it's slower + && stristr(PMA_getenv('SERVER_SOFTWARE'), 'Microsoft') + && stristr(PMA_getenv('SERVER_SOFTWARE'), 'IIS') + ) { $this->set('PMA_IS_IIS', 1); } else { $this->set('PMA_IS_IIS', 0); @@ -259,6 +295,8 @@ class PMA_Config /** * Whether the os php is running on is windows or not + * + * @return nothing */ function checkWebServerOs() { @@ -278,14 +316,22 @@ class PMA_Config /** * detects PHP version + * + * @return nothing */ function checkPhpVersion() { $match = array(); - if (! preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', - phpversion(), $match)) { - preg_match('@([0-9]{1,2}).([0-9]{1,2})@', - phpversion(), $match); + if (! preg_match( + '@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', + phpversion(), + $match) + ) { + preg_match( + '@([0-9]{1,2}).([0-9]{1,2})@', + phpversion(), + $match + ); } if (isset($match) && ! empty($match[1])) { if (! isset($match[2])) { @@ -294,8 +340,13 @@ class PMA_Config if (! isset($match[3])) { $match[3] = 0; } - $this->set('PMA_PHP_INT_VERSION', - (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3])); + $this->set( + 'PMA_PHP_INT_VERSION', + (int) sprintf('%d%02d%02d', + $match[1], + $match[2], + $match[3]) + ); } else { $this->set('PMA_PHP_INT_VERSION', 0); } @@ -333,7 +384,8 @@ class PMA_Config * loads configuration from $source, usally the config file * should be called on object creation * - * @param string $source config file + * @param string $source config file + * * @return bool */ function load($source = null) @@ -369,10 +421,26 @@ class PMA_Config * Backward compatibility code */ if (!empty($cfg['DefaultTabTable'])) { - $cfg['DefaultTabTable'] = str_replace('_properties', '', str_replace('tbl_properties.php', 'tbl_sql.php', $cfg['DefaultTabTable'])); + $cfg['DefaultTabTable'] = str_replace( + '_properties', + '', + str_replace( + 'tbl_properties.php', + 'tbl_sql.php', + $cfg['DefaultTabTable'] + ) + ); } if (!empty($cfg['DefaultTabDatabase'])) { - $cfg['DefaultTabDatabase'] = str_replace('_details', '', str_replace('db_details.php', 'db_sql.php', $cfg['DefaultTabDatabase'])); + $cfg['DefaultTabDatabase'] = str_replace( + '_details', + '', + str_replace( + 'db_details.php', + 'db_sql.php', + $cfg['DefaultTabDatabase'] + ) + ); } $this->settings = PMA_array_merge_recursive($this->settings, $cfg); @@ -424,16 +492,20 @@ class PMA_Config $config_mtime = max($this->default_source_mtime, $this->source_mtime); // cache user preferences, use database only when needed if (! isset($_SESSION['cache'][$cache_key]['userprefs']) - || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) { + || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime + ) { // load required libraries require_once './libraries/user_preferences.lib.php'; $prefs = PMA_load_userprefs(); - $_SESSION['cache'][$cache_key]['userprefs'] = PMA_apply_userprefs($prefs['config_data']); + $_SESSION['cache'][$cache_key]['userprefs'] + = PMA_apply_userprefs($prefs['config_data']); $_SESSION['cache'][$cache_key]['userprefs_mtime'] = $prefs['mtime']; $_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type']; $_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime; } - } else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) { + } elseif ($server == 0 + || ! isset($_SESSION['cache'][$cache_key]['userprefs']) + ) { $this->set('user_preferences', false); return; } @@ -458,30 +530,45 @@ class PMA_Config // save theme $tmanager = $_SESSION['PMA_Theme_Manager']; if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) { - if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original') - || isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) { + if ((! isset($config_data['ThemeDefault']) + && $tmanager->theme->getId() != 'original') + || isset($config_data['ThemeDefault']) + && $config_data['ThemeDefault'] != $tmanager->theme->getId() + ) { // new theme was set in common.inc.php - $this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original'); + $this->setUserValue( + null, + 'ThemeDefault', + $tmanager->theme->getId(), + 'original' + ); } } else { // no cookie - read default from settings if ($this->settings['ThemeDefault'] != $tmanager->theme->getId() - && $tmanager->checkTheme($this->settings['ThemeDefault'])) { + && $tmanager->checkTheme($this->settings['ThemeDefault']) + ) { $tmanager->setActiveTheme($this->settings['ThemeDefault']); $tmanager->setThemeCookie(); } } // save font size - if ((! isset($config_data['fontsize']) && $org_fontsize != '82%') - || isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) { + if ((! isset($config_data['fontsize']) + && $org_fontsize != '82%') + || isset($config_data['fontsize']) + && $org_fontsize != $config_data['fontsize'] + ) { $this->setUserValue(null, 'fontsize', $org_fontsize, '82%'); } // save language if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) { - if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en') - || isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) { + if ((! isset($config_data['lang']) + && $GLOBALS['lang'] != 'en') + || isset($config_data['lang']) + && $GLOBALS['lang'] != $config_data['lang'] + ) { $this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en'); } } else { @@ -492,16 +579,30 @@ class PMA_Config } // save connection collation - if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) { - if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') - || isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) { - $this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci'); + if (isset($_COOKIE['pma_collation_connection']) + || isset($_POST['collation_connection']) + ) { + if ((! isset($config_data['collation_connection']) + && $GLOBALS['collation_connection'] != 'utf8_general_ci') + || isset($config_data['collation_connection']) + && $GLOBALS['collation_connection'] != $config_data['collation_connection'] + ) { + $this->setUserValue( + null, + 'collation_connection', + $GLOBALS['collation_connection'], + 'utf8_general_ci' + ); } } else { // read collation from settings if (isset($config_data['collation_connection'])) { - $GLOBALS['collation_connection'] = $config_data['collation_connection']; - $this->setCookie('pma_collation_connection', $GLOBALS['collation_connection']); + $GLOBALS['collation_connection'] + = $config_data['collation_connection']; + $this->setCookie( + 'pma_collation_connection', + $GLOBALS['collation_connection'] + ); } } } @@ -516,13 +617,15 @@ class PMA_Config * @param string $cfg_path * @param mixed $new_cfg_value * @param mixed $default_value + * + * @return nothing */ function setUserValue($cookie_name, $cfg_path, $new_cfg_value, $default_value = null) { // use permanent user preferences if possible $prefs_type = $this->get('user_preferences'); if ($prefs_type) { - require_once './libraries/user_preferences.lib.php'; + include_once './libraries/user_preferences.lib.php'; if ($default_value === null) { $default_value = PMA_array_read($cfg_path, $this->default); } @@ -544,6 +647,7 @@ class PMA_Config * * @param string $cookie_name * @param mixed $cfg_value + * * @return mixed */ function getUserValue($cookie_name, $cfg_value) @@ -565,6 +669,8 @@ class PMA_Config /** * set source * @param string $source + * + * @return nothing */ function setSource($source) { @@ -573,6 +679,8 @@ class PMA_Config /** * checks if the config folder still exists and terminates app if true + * + * @return nothing */ function checkConfigFolder() { @@ -608,7 +716,10 @@ class PMA_Config if (! is_readable($this->getSource())) { $this->source_mtime = 0; - die('Existing configuration file (' . $this->getSource() . ') is not readable.'); + die( + 'Existing configuration file (' + . $this->getSource() . ') is not readable.' + ); } return true; @@ -617,6 +728,8 @@ class PMA_Config /** * verifies the permissions on config file (if asked by configuration) * (must be called after config.inc.php has been merged) + * + * @return nothing */ function checkPermissions() { @@ -636,7 +749,9 @@ class PMA_Config /** * returns specific config setting + * * @param string $setting + * * @return mixed value */ function get($setting) @@ -650,12 +765,16 @@ class PMA_Config /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option + * + * @return nothing */ function set($setting, $value) { - if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) { + if (! isset($this->settings[$setting]) + || $this->settings[$setting] != $value + ) { $this->settings[$setting] = $value; $this->set_mtime = time(); } @@ -663,6 +782,7 @@ class PMA_Config /** * returns source for current config + * * @return string config source */ function getSource() @@ -675,7 +795,9 @@ class PMA_Config * or the theme changes * must also check the pma_fontsize cookie in case there is no * config file - * @return int Summary of unix timestamps and fontsize, to be unique on theme parameters change + * + * @return int Summary of unix timestamps and fontsize, + * to be unique on theme parameters change */ function getThemeUniqueValue() { @@ -731,16 +853,19 @@ class PMA_Config if (PMA_getenv('HTTP_SCHEME')) { $url['scheme'] = PMA_getenv('HTTP_SCHEME'); } else { - $url['scheme'] = - PMA_getenv('HTTPS') && strtolower(PMA_getenv('HTTPS')) != 'off' + $url['scheme'] = PMA_getenv('HTTPS') + && strtolower(PMA_getenv('HTTPS')) != 'off' ? 'https' : 'http'; } // Host and port if (PMA_getenv('HTTP_HOST')) { - // Prepend the scheme before using parse_url() since this is not part of the RFC2616 Host request-header - $parsed_url = parse_url($url['scheme'] . '://' . PMA_getenv('HTTP_HOST')); + // Prepend the scheme before using parse_url() since this + // is not part of the RFC2616 Host request-header + $parsed_url = parse_url( + $url['scheme'] . '://' . PMA_getenv('HTTP_HOST') + ); if (!empty($parsed_url['host'])) { $url = $parsed_url; } else { @@ -789,8 +914,9 @@ class PMA_Config $pma_absolute_uri .= $url['host']; // Add port, if it not the default one if (! empty($url['port']) - && (($url['scheme'] == 'http' && $url['port'] != 80) - || ($url['scheme'] == 'https' && $url['port'] != 443))) { + && (($url['scheme'] == 'http' && $url['port'] != 80) + || ($url['scheme'] == 'https' && $url['port'] != 443)) + ) { $pma_absolute_uri .= ':' . $url['port']; } // And finally path, without script name, the 'a' is there not to @@ -814,7 +940,8 @@ class PMA_Config } } - // PHP's dirname function would have returned a dot when $path contains no slash + // PHP's dirname function would have returned a dot + // when $path contains no slash if ($path == '.') { $path = ''; } @@ -843,7 +970,8 @@ class PMA_Config // If URI doesn't start with http:// or https://, we will add // this. if (substr($pma_absolute_uri, 0, 7) != 'http://' - && substr($pma_absolute_uri, 0, 8) != 'https://') { + && substr($pma_absolute_uri, 0, 8) != 'https://' + ) { $pma_absolute_uri = ($is_https ? 'https' : 'http') . ':' . (substr($pma_absolute_uri, 0, 2) == '//' ? '' : '//') @@ -855,19 +983,25 @@ class PMA_Config /** * check selected collation_connection + * * @todo check validity of $_REQUEST['collation_connection'] + * + * @return nothing */ function checkCollationConnection() { if (! empty($_REQUEST['collation_connection'])) { - $this->set('collation_connection', - strip_tags($_REQUEST['collation_connection'])); + $this->set( + 'collation_connection', + strip_tags($_REQUEST['collation_connection']) + ); } } /** * checks for font size configuration, and sets font size as requested by user * + * @return nothing */ function checkFontsize() { @@ -895,8 +1029,8 @@ class PMA_Config /** * checks if upload is enabled * + * @return nothing */ - function checkUpload() { if (ini_get('file_uploads')) { @@ -916,6 +1050,8 @@ class PMA_Config * Used with permission from Moodle (http://moodle.org) by Martin Dougiamas * * this section generates $max_upload_size in bytes + * + * @return nothing */ function checkUploadSize() { @@ -924,8 +1060,10 @@ class PMA_Config } if ($postsize = ini_get('post_max_size')) { - $this->set('max_upload_size', - min(PMA_get_real_size($filesize), PMA_get_real_size($postsize))); + $this->set( + 'max_upload_size', + min(PMA_get_real_size($filesize), PMA_get_real_size($postsize)) + ); } else { $this->set('max_upload_size', PMA_get_real_size($filesize)); } @@ -933,6 +1071,8 @@ class PMA_Config /** * check for https + * + * @return nothing */ function checkIsHttps() { @@ -952,8 +1092,7 @@ class PMA_Config $url = parse_url($this->get('PmaAbsoluteUri')); - if (isset($url['scheme']) - && $url['scheme'] == 'https') { + if (isset($url['scheme']) && $url['scheme'] == 'https') { $is_https = true; } else { $is_https = false; @@ -978,7 +1117,8 @@ class PMA_Config // At first we try to parse REQUEST_URI, it might contain full URL, if (PMA_getenv('REQUEST_URI')) { - $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' + // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' + $url = @parse_url(PMA_getenv('REQUEST_URI')); if ($url === false) { $url = array(); } @@ -998,8 +1138,7 @@ class PMA_Config } } - if (isset($url['scheme']) - && $url['scheme'] == 'https') { + if (isset($url['scheme']) && $url['scheme'] == 'https') { $is_https = true; } else { $is_https = false; @@ -1010,6 +1149,8 @@ class PMA_Config /** * detect correct cookie path + * + * @return nothing */ function checkCookiePath() { @@ -1036,6 +1177,8 @@ class PMA_Config /** * enables backward compatibility + * + * @return nothing */ function enableBc() { @@ -1071,6 +1214,8 @@ class PMA_Config /** * @todo finish + * + * @return nothing */ function save() { @@ -1080,8 +1225,9 @@ class PMA_Config * returns options for font size selection * * @static - * @param string $current_size current selected font size with unit - * @return array selectable font sizes + * @param string $current_size current selected font size with unit + * + * @return array selectable font sizes */ static protected function _getFontsizeOptions($current_size = '82%') { @@ -1127,7 +1273,8 @@ class PMA_Config $option_inc += $factor; $option_dec -= $factor; if (isset($factors[$key + 1]) - && $option_inc >= $value + $factors[$key + 1]) { + && $option_inc >= $value + $factors[$key + 1] + ) { break; } } @@ -1140,8 +1287,9 @@ class PMA_Config * returns html selectbox for font sizes * * @static - * @param string $current_size currently slected font size with unit - * @return string html selectbox + * @param string $current_size currently slected font size with unit + * + * @return string html selectbox */ static protected function _getFontsizeSelection() { @@ -1174,8 +1322,9 @@ class PMA_Config * return complete font size selection form * * @static - * @param string $current_size currently slected font size with unit - * @return string html selectbox + * @param string $current_size currently slected font size with unit + * + * @return string html selectbox */ static public function getFontsizeForm() { @@ -1192,25 +1341,33 @@ class PMA_Config /** * removes cookie * - * @param string $cookie name of cookie to remove - * @return boolean result of setcookie() + * @param string $cookie name of cookie to remove + * + * @return boolean result of setcookie() */ function removeCookie($cookie) { - return setcookie($cookie, '', time() - 3600, - $this->getCookiePath(), '', $this->isHttps()); + return setcookie( + $cookie, + '', + time() - 3600, + $this->getCookiePath(), + '', + $this->isHttps() + ); } /** * sets cookie if value is different from current cokkie value, * or removes if value is equal to default * - * @param string $cookie name of cookie to remove - * @param mixed $value new cookie value - * @param string $default default value - * @param int $validity validity of cookie in seconds (default is one month) - * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) - * @return boolean result of setcookie() + * @param string $cookie name of cookie to remove + * @param mixed $value new cookie value + * @param string $default default value + * @param int $validity validity of cookie in seconds (default is one month) + * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) + * + * @return boolean result of setcookie() */ function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true) { @@ -1239,8 +1396,15 @@ class PMA_Config } else { $v = time() + $validity; } - return setcookie($cookie, $value, $v, - $this->getCookiePath(), '', $this->isHttps(), $httponly); + return setcookie( + $cookie, + $value, + $v, + $this->getCookiePath(), + '', + $this->isHttps(), + $httponly + ); } // cookie has already $value as value From 2f1443c637a1799ff338a37957501448b5976053 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 21 Aug 2011 22:54:38 +0200 Subject: [PATCH 915/971] fix typo --- libraries/Config.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9c8266a1da..46cf41c93f 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1365,7 +1365,7 @@ class PMA_Config * @param mixed $value new cookie value * @param string $default default value * @param int $validity validity of cookie in seconds (default is one month) - * @param bool $httponlt whether cookie is only for HTTP (and not for scripts) + * @param bool $httponly whether cookie is only for HTTP (and not for scripts) * * @return boolean result of setcookie() */ From 20a6232173e08810211412c8ed7cfe84b9561b82 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 21 Aug 2011 22:57:23 +0200 Subject: [PATCH 916/971] remove unused code --- libraries/Config.class.php | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 46cf41c93f..fe240099a2 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -703,13 +703,6 @@ class PMA_Config } if (! file_exists($this->getSource())) { - // do not trigger error here - // https://sf.net/tracker/?func=detail&aid=1370269&group_id=23067&atid=377408 - /* - trigger_error( - 'phpMyAdmin-ERROR: unkown configuration source: ' . $source, - E_USER_WARNING); - */ $this->source_mtime = 0; return false; } @@ -834,18 +827,6 @@ class PMA_Config if (strlen($pma_absolute_uri) < 5) { $url = array(); - // At first we try to parse REQUEST_URI, it might contain full URL - /** - * REQUEST_URI contains PATH_INFO too, this is not what we want - * script-php/pathinfo/ - if (PMA_getenv('REQUEST_URI')) { - $url = @parse_url(PMA_getenv('REQUEST_URI')); // produces E_WARNING if it cannot get parsed, e.g. '/foobar:/' - if ($url === false) { - $url = array('path' => $_SERVER['REQUEST_URI']); - } - } - */ - // If we don't have scheme, we didn't have full URL so we need to // dig deeper if (empty($url['scheme'])) { @@ -885,17 +866,7 @@ class PMA_Config // And finally the path could be already set from REQUEST_URI if (empty($url['path'])) { - /** - * REQUEST_URI contains PATH_INFO too, this is not what we want - * script-php/pathinfo/ - if (PMA_getenv('PATH_INFO')) { - $path = parse_url(PMA_getenv('PATH_INFO')); - } else { - // PHP_SELF in CGI often points to cgi executable, so use it - // as last choice - */ - $path = parse_url($GLOBALS['PMA_PHP_SELF']); - //} + $path = parse_url($GLOBALS['PMA_PHP_SELF']); $url['path'] = $path['path']; } } From 0c6dbb530d4d1b594a72c1f99bf384a46d6f7c92 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 21 Aug 2011 23:19:30 +0200 Subject: [PATCH 917/971] coding style --- libraries/Config.class.php | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index fe240099a2..7beb4ccbe5 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -219,9 +219,10 @@ class PMA_Config } elseif (preg_match('@rv:1.9(.*)Gecko@', $HTTP_USER_AGENT)) { $this->set('PMA_USR_BROWSER_VER', '1.9'); $this->set('PMA_USR_BROWSER_AGENT', 'GECKO'); - } elseif (preg_match('@Mozilla/([0-9].[0-9]{1,2})@' - , $HTTP_USER_AGENT - , $log_version) + } elseif ( + preg_match('@Mozilla/([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); @@ -342,10 +343,7 @@ class PMA_Config } $this->set( 'PMA_PHP_INT_VERSION', - (int) sprintf('%d%02d%02d', - $match[1], - $match[2], - $match[3]) + (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3]) ); } else { $this->set('PMA_PHP_INT_VERSION', 0); @@ -495,7 +493,7 @@ class PMA_Config || $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime ) { // load required libraries - require_once './libraries/user_preferences.lib.php'; + include_once './libraries/user_preferences.lib.php'; $prefs = PMA_load_userprefs(); $_SESSION['cache'][$cache_key]['userprefs'] = PMA_apply_userprefs($prefs['config_data']); @@ -668,6 +666,7 @@ class PMA_Config /** * set source + * * @param string $source * * @return nothing @@ -743,9 +742,9 @@ class PMA_Config /** * returns specific config setting * - * @param string $setting + * @param string $setting * - * @return mixed value + * @return mixed value */ function get($setting) { @@ -758,8 +757,8 @@ class PMA_Config /** * sets configuration variable * - * @param string $setting configuration option - * @param string $value new value for configuration option + * @param string $setting configuration option + * @param string $value new value for configuration option * * @return nothing */ From e82d3c7136425fbe51ed26f8bf95cf932740ddd8 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 21 Aug 2011 23:36:10 +0200 Subject: [PATCH 918/971] require/include are statements not functions; no parentheses are required --- index.php | 2 +- libraries/Advisor.class.php | 2 +- libraries/PDF.class.php | 4 ++-- libraries/core.lib.php | 2 +- libraries/display_import_ajax.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- libraries/schema/User_Schema.class.php | 2 +- libraries/schema/Visio_Relation_Schema.class.php | 2 +- main.php | 2 +- schema_export.php | 4 ++-- server_status.php | 6 +++--- test/selenium/PmaSeleniumLoginTest.php | 2 +- test/selenium/PmaSeleniumPrivilegesTest.php | 2 +- test/selenium/PmaSeleniumXssTest.php | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/index.php b/index.php index 5e0fa3619a..9add876131 100644 --- a/index.php +++ b/index.php @@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // start output -include ('./libraries/header_http.inc.php'); +include './libraries/header_http.inc.php'; ?> diff --git a/libraries/Advisor.class.php b/libraries/Advisor.class.php index b681155ac6..12fdcad2c9 100644 --- a/libraries/Advisor.class.php +++ b/libraries/Advisor.class.php @@ -22,7 +22,7 @@ class Advisor PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1) ); // Add total memory to variables as well - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); $memory = $sysinfo->memory(); $this->variables['system_memory'] = $memory['MemTotal']; diff --git a/libraries/PDF.class.php b/libraries/PDF.class.php index 3f4f2f1c65..0be899767c 100644 --- a/libraries/PDF.class.php +++ b/libraries/PDF.class.php @@ -77,9 +77,9 @@ class PMA_PDF extends TCPDF */ function Error($error_message = '') { - include('./libraries/header.inc.php'); + include './libraries/header.inc.php'; PMA_Message::error(__('Error while creating PDF:') . ' ' . $error_message)->display(); - include('./libraries/footer.inc.php'); + include './libraries/footer.inc.php'; } /** diff --git a/libraries/core.lib.php b/libraries/core.lib.php index a277f29629..29d2f439e2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -223,7 +223,7 @@ function PMA_fatalError($error_message, $message_args = null) $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']); } - require('./libraries/error.inc.php'); + require './libraries/error.inc.php'; if (!defined('TESTSUITE')) { exit; diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index f0c271df7f..3495a5288f 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -38,7 +38,7 @@ foreach ($plugins as $plugin) { if ($check()) { $_SESSION[$SESSION_KEY]["handler"] = $plugin; - include_once("import/upload/" . $plugin . ".php"); + include_once "import/upload/" . $plugin . ".php"; break; } } diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 3339aafed3..6a165417c3 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -47,7 +47,7 @@ if (! empty($submit_mult) break; case 'export': unset($submit_mult); - require('db_export.php'); + require 'db_export.php'; exit; break; } // end switch diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 41a2b9e6fe..538ceedac5 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -585,7 +585,7 @@ class PMA_User_Schema PMA_DBI_select_db($db); - include("./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php"); + include "./libraries/schema/".ucfirst($export_type)."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".ucfirst($export_type)."_Relation_Schema();"); } diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php index cf7bab266a..be5028d5d7 100644 --- a/libraries/schema/Visio_Relation_Schema.class.php +++ b/libraries/schema/Visio_Relation_Schema.class.php @@ -5,7 +5,7 @@ * @package phpMyAdmin */ -include_once("Export_Relation_Schema.class.php"); +include_once "Export_Relation_Schema.class.php"; /** * This Class inherits the XMLwriter class and diff --git a/main.php b/main.php index fd4d4480e7..2ba3267f31 100644 --- a/main.php +++ b/main.php @@ -354,7 +354,7 @@ if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning * The data file is created while creating release by ./scripts/remove-incomplete-mo */ if (file_exists('./libraries/language_stats.inc.php')) { - include('./libraries/language_stats.inc.php'); + include './libraries/language_stats.inc.php'; /* * This message is intentionally not translated, because we're * handling incomplete translations here and focus on english diff --git a/schema_export.php b/schema_export.php index 2abe91f9e6..30384e861e 100644 --- a/schema_export.php +++ b/schema_export.php @@ -21,7 +21,7 @@ $cfgRelation = PMA_getRelationsParam(); require_once './libraries/transformations.lib.php'; require_once './libraries/Index.class.php'; -include_once("./libraries/schema/Export_Relation_Schema.class.php"); +include_once "./libraries/schema/Export_Relation_Schema.class.php"; /** * get all the export options and verify @@ -38,5 +38,5 @@ $path = PMA_securePath(ucfirst($export_type)); if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) { PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist')); } -include("./libraries/schema/".$path."_Relation_Schema.class.php"); +include "./libraries/schema/".$path."_Relation_Schema.class.php"; $obj_schema = eval("new PMA_".$path."_Relation_Schema();"); diff --git a/server_status.php b/server_status.php index 1dd4852369..5490400bc8 100644 --- a/server_status.php +++ b/server_status.php @@ -123,7 +123,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'cpu': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$cpuload) { @@ -140,7 +140,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { case 'memory': if (!$sysinfo) { - require_once('libraries/sysinfo.lib.php'); + require_once 'libraries/sysinfo.lib.php'; $sysinfo = getSysInfo(); } if (!$memory) { @@ -379,7 +379,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } if (isset($_REQUEST['advisor'])) { - include('libraries/Advisor.class.php'); + include 'libraries/Advisor.class.php'; $advisor = new Advisor(); exit(json_encode($advisor->run())); } diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php index 8f14fce8e6..dc0fc802d6 100644 --- a/test/selenium/PmaSeleniumLoginTest.php +++ b/test/selenium/PmaSeleniumLoginTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumLoginTest extends PmaSeleniumTestCase diff --git a/test/selenium/PmaSeleniumPrivilegesTest.php b/test/selenium/PmaSeleniumPrivilegesTest.php index a325347113..7eddf7a94e 100644 --- a/test/selenium/PmaSeleniumPrivilegesTest.php +++ b/test/selenium/PmaSeleniumPrivilegesTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumPrivilegesTest extends PmaSeleniumTestCase diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php index 4f551a0b83..06f960e362 100644 --- a/test/selenium/PmaSeleniumXssTest.php +++ b/test/selenium/PmaSeleniumXssTest.php @@ -7,7 +7,7 @@ * @group Selenium */ -require_once('PmaSeleniumTestCase.php'); +require_once 'PmaSeleniumTestCase.php'; class PmaSeleniumXSSTest extends PmaSeleniumTestCase { From 05e78b2778830b29b3919fd742658d8d82851e7b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Aug 2011 06:46:39 +0530 Subject: [PATCH 919/971] Proper coding style for multi line if statements --- libraries/common.lib.php | 47 ++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f232b985cb..6c34c84839 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2254,7 +2254,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, } else { $selected = ''; } - $gotopage .= ' ' . "\n"; } @@ -3485,21 +3485,31 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) $query = "SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.`%s` " . "WHERE GRANTEE='%s' AND PRIVILEGE_TYPE='%s'"; // Check global privileges first. - if (PMA_DBI_fetch_value(sprintf($query, - 'USER_PRIVILEGES', - $username, - $priv))) { + if (PMA_DBI_fetch_value( + sprintf( + $query, + 'USER_PRIVILEGES', + $username, + $priv + ) + ) + ) { return true; } // If a database name was provided and user does not have the // required global privilege, try database-wise permissions. if ($db !== null) { $query .= " AND TABLE_SCHEMA='%s'"; - if (PMA_DBI_fetch_value(sprintf($query, - 'SCHEMA_PRIVILEGES', - $username, - $priv, - PMA_sqlAddSlashes($db)))) { + if (PMA_DBI_fetch_value( + sprintf( + $query, + 'SCHEMA_PRIVILEGES', + $username, + $priv, + PMA_sqlAddSlashes($db) + ) + ) + ) { return true; } } else { @@ -3511,12 +3521,17 @@ function PMA_currentUserHasPrivilege($priv, $db = null, $tbl = null) // find any valid privileges, try table-wise privileges. if ($tbl !== null) { $query .= " AND TABLE_NAME='%s'"; - if ($retval = PMA_DBI_fetch_value(sprintf($query, - 'TABLE_PRIVILEGES', - $username, - $priv, - PMA_sqlAddSlashes($db), - PMA_sqlAddSlashes($tbl)))) { + if ($retval = PMA_DBI_fetch_value( + sprintf( + $query, + 'TABLE_PRIVILEGES', + $username, + $priv, + PMA_sqlAddSlashes($db), + PMA_sqlAddSlashes($tbl) + ) + ) + ) { return true; } } From c726d423fef601ed7b8222e46e3dbcfc698d0d5c Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Aug 2011 07:28:37 +0530 Subject: [PATCH 920/971] Fix doc blocks --- libraries/common.lib.php | 349 +++++++++++++++++++++------------------ 1 file changed, 189 insertions(+), 160 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 6c34c84839..2e74489303 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -76,7 +76,8 @@ function PMA_pow($base, $exp, $use_function = false) * @param string $icon name of icon file * @param string $alternate alternate text * @param boolean $force_text whether to force alternate text to be displayed - * @param boolean $noSprite If true, the image source will be not replaced with a CSS Sprite + * @param boolean $noSprite If true, the image source will be not replaced + * with a CSS Sprite * * @return html img tag */ @@ -153,13 +154,13 @@ function PMA_generateHiddenMaxFileSize($max_size) * Add slashes before "'" and "\" characters so a value containing them can * be used in a sql comparison. * - * @param string $a_string the string to slash - * @param bool $is_like whether the string will be used in a 'LIKE' clause - * (it then requires two more escaped sequences) or not - * @param bool $crlf whether to treat cr/lfs as escape-worthy entities - * (converts \n to \\n, \r to \\r) - * @param bool $php_code whether this function is used as part of the - * "Create PHP code" dialog + * @param string $a_string the string to slash + * @param bool $is_like whether the string will be used in a 'LIKE' clause + * (it then requires two more escaped sequences) or not + * @param bool $crlf whether to treat cr/lfs as escape-worthy entities + * (converts \n to \\n, \r to \\r) + * @param bool $php_code whether this function is used as part of the + * "Create PHP code" dialog * * @return string the slashed string * @@ -210,7 +211,7 @@ function PMA_escape_mysql_wildcards($name) * removes slashes before "_" and "%" characters * Note: This function does not unescape backslashes! * - * @param string $name the string to escape + * @param string $name the string to escape * * @return string the escaped string * @@ -262,7 +263,6 @@ function PMA_unQuote($quoted_string, $quote = null) /** * format sql strings * - * @todo move into PMA_Sql * @param mixed $parsed_sql pre-parsed SQL structure * @param string $unparsed_sql raw SQL string * @@ -272,7 +272,7 @@ function PMA_unQuote($quoted_string, $quote = null) * @global boolean whether the current statement is a multiple one or not * * @access public - * + * @todo move into PMA_Sql */ function PMA_formatSql($parsed_sql, $unparsed_sql = '') { @@ -419,7 +419,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju /** * Displays a link to the phpMyAdmin documentation * - * @param string $anchor anchor in documentation + * @param string $anchor anchor in documentation * * @return string the html link * @@ -437,7 +437,7 @@ function PMA_showDocu($anchor) /** * Displays a link to the PHP documentation * - * @param string $target anchor in documentation + * @param string $target anchor in documentation * * @return string the html link * @@ -457,9 +457,9 @@ function PMA_showPHPDocu($target) /** * returns HTML for a footnote marker and add the messsage to the footnotes * - * @param string $message the error message - * @param bool $bbcode - * @param string $type + * @param string $message the error message + * @param bool $bbcode + * @param string $type message types * * @return string html code for a footnote marker * @@ -500,11 +500,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') /** * Displays a MySQL error message in the right frame. * - * @param string $error_message the error message - * @param string $the_query the sql query that failed - * @param bool $is_modify_link whether to show a "modify" link or not - * @param string $back_url the "back" link url (full path is not required) - * @param bool $exit EXIT the page? + * @param string $error_message the error message + * @param string $the_query the sql query that failed + * @param bool $is_modify_link whether to show a "modify" link or not + * @param string $back_url the "back" link url (full path is not required) + * @param bool $exit EXIT the page? * * @global string the curent table * @global string the current db @@ -650,10 +650,10 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * returns array with tables of given db with extended information and grouped * - * @param string $db name of db - * @param string $tables name of tables - * @param integer $limit_offset list offset - * @param int|bool $limit_count max tables to return + * @param string $db name of db + * @param string $tables name of tables + * @param integer $limit_offset list offset + * @param int|bool $limit_count max tables to return * * @return array (recursive) grouped table list */ @@ -782,10 +782,10 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * * * - * @param mixed $a_name the database, table or field name to "backquote" - * or array of it - * @param boolean $do_it a flag to bypass this function (used by dump - * functions) + * @param mixed $a_name the database, table or field name to "backquote" + * or array of it + * @param boolean $do_it a flag to bypass this function (used by dump + * functions) * * @return mixed the "backquoted" database, table or field name * @@ -880,10 +880,10 @@ if (typeof(window.parent) != 'undefined' * displays the message and the query * usually the message is the result of the query executed * - * @param string $message the message to display - * @param string $sql_query the query to display - * @param string $type the type (level) of the message - * @param boolean $is_view is this a message after a VIEW operation? + * @param string $message the message to display + * @param string $sql_query the query to display + * @param string $type the type (level) of the message + * @param boolean $is_view is this a message after a VIEW operation? * * @return string * @@ -1271,7 +1271,8 @@ function PMA_profilingSupported() /** * Displays a form with the Profiling checkbox * - * @param string $sql_query + * @param string $sql_query sql query + * * @access public */ function PMA_profilingCheckbox($sql_query) @@ -1290,9 +1291,9 @@ function PMA_profilingCheckbox($sql_query) /** * Formats $value to byte view * - * @param double $value the value to format - * @param int $limes the sensitiveness - * @param int $comma the number of decimals to retain + * @param double $value the value to format + * @param int $limes the sensitiveness + * @param int $comma the number of decimals to retain * * @return array the formatted value and its unit * @@ -1346,7 +1347,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) /** * Changes thousands and decimal separators to locale specific values. * - * @param $value + * @param string $value the value * * @return string */ @@ -1376,13 +1377,13 @@ function PMA_localizeNumber($value) * echo PMA_formatNumber(0.003, 3, 3); // 0.003 * echo PMA_formatNumber(0.00003, 3, 2); // 0.03 m * echo PMA_formatNumber(0, 6); // 0 - * * - * @param double $value the value to format - * @param integer $digits_left number of digits left of the comma - * @param integer $digits_right number of digits right of the comma - * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * + * @param double $value the value to format + * @param integer $digits_left number of digits left of the comma + * @param integer $digits_right number of digits right of the comma + * @param boolean $only_down do not reformat numbers below 1 + * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) * * @return string the formatted value and its unit * @@ -1474,7 +1475,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow /** * Returns the number of bytes when a formatted size is given * - * @param string $formatted_size the size expression (for example 8MB) + * @param string $formatted_size the size expression (for example 8MB) * * @return integer The numerical part of the expression (for example 8) */ @@ -1495,8 +1496,8 @@ function PMA_extractValueFromFormattedSize($formatted_size) /** * Writes localised date * - * @param string $timestamp the current timestamp - * @param string $format format + * @param string $timestamp the current timestamp + * @param string $format format * * @return string the formatted date * @@ -1565,8 +1566,8 @@ function PMA_localisedDate($timestamp = -1, $format = '') * returns a tab for tabbed navigation. * If the variables $link and $args ar left empty, an inactive tab is created * - * @param array $tab array with all options - * @param array $url_params + * @param array $tab array with all options + * @param array $url_params * * @return string html code for one tab, a link if valid otherwise a span * @@ -1666,8 +1667,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') /** * returns html-code for a tab navigation * - * @param array $tabs one element per tab - * @param string $url_params + * @param array $tabs one element per tab + * @param string $url_params * * @return string html-code for tab-navigation */ @@ -1695,14 +1696,14 @@ function PMA_generate_html_tabs($tabs, $url_params, $base_dir='') * Displays a link, or a button if the link's URL is too large, to * accommodate some browsers' limitations * - * @param string $url the URL - * @param string $message the link message - * @param mixed $tag_params string: js confirmation - * array: additional tag params (f.e. style="") - * @param boolean $new_form we set this to false when we are already in - * a form, to avoid generating nested forms - * @param boolean $strip_img - * @param string $target + * @param string $url the URL + * @param string $message the link message + * @param mixed $tag_params string: js confirmation + * array: additional tag params (f.e. style="") + * @param boolean $new_form we set this to false when we are already in + * a form, to avoid generating nested forms + * @param boolean $strip_img whether to strip the image + * @param string $target target * * @return string the results to be echoed or saved in an array */ @@ -1822,7 +1823,8 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), /** * Splits a URL string by parameter * - * @param string $url the URL + * @param string $url the URL + * * @return array the parameter/value pairs, for example [0] db=sakila */ function PMA_splitURLQuery($url) { @@ -1844,7 +1846,7 @@ function PMA_splitURLQuery($url) { /** * Returns a given timespan value in a readable format. * - * @param int $seconds the timespan + * @param int $seconds the timespan * * @return string the formatted value */ @@ -1872,11 +1874,11 @@ function PMA_timespanFormat($seconds) * Fulfills todo-item * http://sf.net/tracker/?func=detail&aid=544361&group_id=23067&atid=377411 * - * @todo add a multibyte safe function PMA_STR_split() - * @param string $string The string - * @param string $Separator The Separator (defaults to "
    \n") + * @param string $string The string + * @param string $Separator The Separator (defaults to "
    \n") * * @access public + * @todo add a multibyte safe function PMA_STR_split() * * @return string The flipped string */ @@ -1920,16 +1922,17 @@ function PMA_flipstring($string, $Separator = "
    \n") * Not sure we could use a strMissingParameter message here, * would have to check if the error message file is always available * - * @todo use PMA_fatalError() if $die === true? - * @param array $params The names of the parameters needed by the calling script. - * @param bool $die Stop the execution? - * (Set this manually to false in the calling script - * until you know all needed parameters to check). - * @param bool $request Whether to include this list in checking for special params. + * @param array $params The names of the parameters needed by the calling script. + * @param bool $die Stop the execution? + * (Set this manually to false in the calling script + * until you know all needed parameters to check). + * @param bool $request Whether to include this list in checking for special params. + * * @global string path to current script * @global boolean flag whether any special variable was required * * @access public + * @todo use PMA_fatalError() if $die === true? */ function PMA_checkParameters($params, $die = true, $request = true) { @@ -1972,11 +1975,11 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * Function to generate unique condition for specified row. * - * @param resource $handle current query result - * @param integer $fields_cnt number of fields - * @param array $fields_meta meta information about fields - * @param array $row current row - * @param boolean $force_unique generate condition only on pk or unique + * @param resource $handle current query result + * @param integer $fields_cnt number of fields + * @param array $fields_meta meta information about fields + * @param array $row current row + * @param boolean $force_unique generate condition only on pk or unique * * @access public * @@ -2123,12 +2126,12 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force /** * Generate a button or image tag * - * @param string $button_name name of button element - * @param string $button_class class of button element - * @param string $image_name name of image element - * @param string $text text to display - * @param string $image image to display - * @param string $value + * @param string $button_name name of button element + * @param string $button_class class of button element + * @param string $image_name name of image element + * @param string $text text to display + * @param string $image image to display + * @param string $value value * * @access public */ @@ -2167,17 +2170,18 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /** * Generate a pagination selector for browsing resultsets * - * @param int $rows Number of rows in the pagination set - * @param int $pageNow current page number - * @param int $nbTotalPage number of total pages - * @param int $showAll If the number of pages is lower than this - * variable, no pages will be omitted in pagination - * @param int $sliceStart How many rows at the beginning should always be shown? - * @param int $sliceEnd How many rows at the end should always be shown? - * @param int $percent Percentage of calculation page offsets to hop to a next page - * @param int $range Near the current page, how many pages should - * be considered "nearby" and displayed as well? - * @param string $prompt The prompt to display (sometimes empty) + * @param int $rows Number of rows in the pagination set + * @param int $pageNow current page number + * @param int $nbTotalPage number of total pages + * @param int $showAll If the number of pages is lower than this + * variable, no pages will be omitted in pagination + * @param int $sliceStart How many rows at the beginning should always be shown? + * @param int $sliceEnd How many rows at the end should always be shown? + * @param int $percent Percentage of calculation page offsets to hop to a + * next page + * @param int $range Near the current page, how many pages should + * be considered "nearby" and displayed as well? + * @param string $prompt The prompt to display (sometimes empty) * * @return string * @@ -2267,15 +2271,16 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, /** * Generate navigation for a list * - * @todo use $pos from $_url_params - * @param int $count number of elements in the list - * @param int $pos current position in the list - * @param array $_url_params url parameters - * @param string $script script name for form target - * @param string $frame target frame - * @param int $max_count maximum number of elements to display from the list + * @param int $count number of elements in the list + * @param int $pos current position in the list + * @param array $_url_params url parameters + * @param string $script script name for form target + * @param string $frame target frame + * @param int $max_count maximum number of elements to display from the list * * @access public + * + * @todo use $pos from $_url_params */ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_count) { @@ -2357,7 +2362,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou * * * - * @param string $dir with wildcard for user + * @param string $dir with wildcard for user * * @return string per user directory */ @@ -2374,7 +2379,7 @@ function PMA_userDir($dir) /** * returns html code for db link to default db page * - * @param string $database + * @param string $database database * * @return string html link to default db page */ @@ -2398,10 +2403,10 @@ function PMA_getDbLink($database = null) * Displays a lightbulb hint explaining a known external bug * that affects a functionality * - * @param string $functionality localized message explaining the func. - * @param string $component 'mysql' (eventually, 'php') - * @param string $minimum_version of this component - * @param string $bugref bug reference for this component + * @param string $functionality localized message explaining the func. + * @param string $component 'mysql' (eventually, 'php') + * @param string $minimum_version of this component + * @param string $bugref bug reference for this component */ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) { @@ -2417,6 +2422,8 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref) * @param string $label label for checkbox * @param boolean $checked is it initially checked? * @param boolean $onclick should it submit the form on click? + * + * @return the HTML for the checkbox */ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) { @@ -2433,6 +2440,8 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick) * @param boolean $line_break whether to add an HTML line break after a choice * @param boolean $escape_label whether to use htmlspecialchars() on label * @param string $class enclose each choice with a div of this class + * + * @return the HTML for the tadio buttons */ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='') { @@ -2460,11 +2469,12 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '' /** * Generates and returns an HTML dropdown * - * @param string $select_name - * @param array $choices choices values - * @param string $active_choice the choice to select by default - * @param string $id id of the select element; can be different in case - * the dropdown is present more than once on the page + * @param string $select_name name for the select element + * @param array $choices choices values + * @param string $active_choice the choice to select by default + * @param string $id id of the select element; can be different in case + * the dropdown is present more than once on the page + * * @return string * * @todo support titles @@ -2489,8 +2499,8 @@ function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id) * controlling the slider; you have to generate the yourself * after the sliding section. * - * @param string $id the id of the
    on which to apply the effect - * @param string $message the message to show as a link + * @param string $id the id of the
    on which to apply the effect + * @param string $message the message to show as a link */ function PMA_generate_slider_effect($id, $message) { @@ -2511,13 +2521,14 @@ function PMA_generate_slider_effect($id, $message) } /** - * Creates an AJAX sliding toggle button (or and equivalent form when AJAX is disabled) + * Creates an AJAX sliding toggle button + * (or and equivalent form when AJAX is disabled) * - * @param string $action The URL for the request to be executed - * @param string $select_name The name for the dropdown box - * @param array $options An array of options (see rte_footer.lib.php) - * @param string $callback A JS snippet to execute when the request is - * successfully processed + * @param string $action The URL for the request to be executed + * @param string $select_name The name for the dropdown box + * @param array $options An array of options (see rte_footer.lib.php) + * @param string $callback A JS snippet to execute when the request is + * successfully processed * * @return string HTML code for the toggle button */ @@ -2602,8 +2613,8 @@ function PMA_clearUserCache() /** * Verifies if something is cached in the session * - * @param string $var - * @param int|true $server + * @param string $var variable name + * @param int|true $server server * * @return boolean */ @@ -2618,8 +2629,8 @@ function PMA_cacheExists($var, $server = 0) /** * Gets cached information from the session * - * @param string $var - * @param int|true $server + * @param string $var varibale name + * @param int|true $server server * * @return mixed */ @@ -2638,9 +2649,9 @@ function PMA_cacheGet($var, $server = 0) /** * Caches information in the session * - * @param string $var - * @param mixed $val - * @param int|true $server + * @param string $var variable name + * @param mixed $val value + * @param int|true $server server * * @return mixed */ @@ -2655,8 +2666,8 @@ function PMA_cacheSet($var, $val = null, $server = 0) /** * Removes cached information from the session * - * @param string $var - * @param int|true $server + * @param string $var variable name + * @param int|true $server server */ function PMA_cacheUnset($var, $server = 0) { @@ -2671,7 +2682,7 @@ function PMA_cacheUnset($var, $server = 0) * in MySQL a BIT field can be from 1 to 64 bits so we need this * function because in PHP, decbin() supports only 32 bits * - * @param numeric $value coming from a BIT field + * @param numeric $value coming from a BIT field * @param integer $length * * @return string the printable value @@ -2689,7 +2700,7 @@ function PMA_printable_bit_value($value, $length) /** * Verifies whether the value contains a non-printable character * - * @param string $value + * @param string $value value * * @return boolean */ @@ -2702,7 +2713,7 @@ function PMA_contains_nonprintable_ascii($value) * Converts a BIT type default value * for example, b'010' becomes 010 * - * @param string $bit_default_value + * @param string $bit_default_value value * * @return string the converted value */ @@ -2714,7 +2725,7 @@ function PMA_convert_bit_default_value($bit_default_value) /** * Extracts the various parts from a field type spec * - * @param string $fieldspec + * @param string $fieldspec Field specification * * @return array associative array containing type, spec_in_brackets * and possibly enum_set_values (another array) @@ -2830,7 +2841,7 @@ function PMA_extractFieldSpec($fieldspec) /** * Verifies if this table's engine supports foreign keys * - * @param string $engine + * @param string $engine engine * * @return boolean */ @@ -2847,7 +2858,7 @@ function PMA_foreignkey_supported($engine) /** * Replaces some characters by a displayable equivalent * - * @param string $content + * @param string $content content * * @return string the content with characters replaced */ @@ -2864,8 +2875,9 @@ function PMA_replace_binary_contents($content) /** * Converts GIS data to Well Known Text format * - * @param $data GIS data - * @param $includeSRID Add SRID to the WKT + * @param binary $data GIS data + * @param bool $includeSRID Add SRID to the WKT + * * @return GIS data in Well Know Text format */ function PMA_asWKT($data, $includeSRID = false) { @@ -2889,7 +2901,7 @@ function PMA_asWKT($data, $includeSRID = false) { /** * If the string starts with a \r\n pair (0x0d0a) add an extra \n * - * @param string $string + * @param string $string string * * @return string with the chars replaced */ @@ -2907,8 +2919,8 @@ function PMA_duplicateFirstNewline($string) * Get the action word corresponding to a script name * in order to display it as a title in navigation panel * - * @param string $target a valid value for $cfg['LeftDefaultTabTable'], $cfg['DefaultTabTable'] - * or $cfg['DefaultTabDatabase'] + * @param string $target a valid value for $cfg['LeftDefaultTabTable'], + * $cfg['DefaultTabTable'] or $cfg['DefaultTabDatabase'] * * @return array */ @@ -2934,9 +2946,10 @@ function PMA_getTitleForTarget($target) /** * Formats user string, expading @VARIABLES@, accepting strftime format string. * - * @param string $string Text where to do expansion. - * @param function $escape Function to call for escaping variable values. - * @param array $updates Array with overrides for default parameters (obtained from GLOBALS). + * @param string $string Text where to do expansion. + * @param function $escape Function to call for escaping variable values. + * @param array $updates Array with overrides for default parameters + * (obtained from GLOBALS). * * @return string */ @@ -3005,9 +3018,14 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) * function that generates a json output for an ajax request and ends script * execution * - * @param PMA_Message|string $message message string containing the html of the message - * @param bool $success success whether the ajax request was successfull - * @param array $extra_data extra_data optional - any other data as part of the json request + * @param PMA_Message|string $message message string containing the + * html of the message + * @param bool $success success whether the ajax request + * was successfull + * @param array $extra_data extra data optional - + * any other data as part of the json request + * + * @return nothing */ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) { @@ -3052,9 +3070,11 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) } /** - * Display the form used to browse anywhere on the local server for the file to import + * Display the form used to browse anywhere on the local server for a file to import * - * @param $max_upload_size + * @param string $max_upload_size maximum upload size + * + * @return nothing */ function PMA_browseUploadFile($max_upload_size) { @@ -3070,8 +3090,10 @@ function PMA_browseUploadFile($max_upload_size) /** * Display the form used to select a file to import from the server upload directory * - * @param $import_list - * @param $uploaddir + * @param array $import_list array of import types + * @param string $uploaddir upload directory + * + * @return nothing */ function PMA_selectUploadFile($import_list, $uploaddir) { @@ -3133,8 +3155,8 @@ function PMA_buildActionTitles() * $cfg['ColumnTypes'] and either returns an array (useful for quickly checking * if a datatype is supported) or an HTML snippet that creates a drop-down list. * - * @param bool $html Whether to generate an html snippet or an array - * @param string $selected The value to mark as selected in HTML mode + * @param bool $html Whether to generate an html snippet or an array + * @param string $selected The value to mark as selected in HTML mode * * @return mixed An HTML snippet or an array of datatypes. * @@ -3197,12 +3219,18 @@ function PMA_getSupportedDatatypes($html = false, $selected = '') * * @return array list of datatypes */ - function PMA_unsupportedDatatypes() { $no_support_types = array(); return $no_support_types; } +/** + * Return GIS data types + * + * @param bool $upper_case whether to return values in upper case + * + * @return array GIS data types + */ function PMA_getGISDatatypes($upper_case = false) { $gis_data_types = array('geometry', 'point', @@ -3226,6 +3254,8 @@ function PMA_getGISDatatypes($upper_case = false) { * Generates GIS data based on the string passed. * * @param string $gis_string GIS string + * + * @return GIS data enclosed in 'GeomFromText' function */ function PMA_createGISData($gis_string) { $gis_string = trim($gis_string); @@ -3352,9 +3382,9 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false /** * Creates a dropdown box with MySQL functions for a particular column. * - * @param array $field Data about the column for which - * to generate the dropdown - * @param bool $insert_mode Whether the operation is 'insert' + * @param array $field Data about the column for which + * to generate the dropdown + * @param bool $insert_mode Whether the operation is 'insert' * * @global array $cfg PMA configuration * @global array $analyzed_sql Analyzed SQL query @@ -3458,12 +3488,11 @@ function PMA_getFunctionsForField($field, $insert_mode) * // 'CREATE ROUTINE' privilege or, if not, checks if the * // user has this privilege on database 'mydb'. * - * - * @param string $priv The privilege to check - * @param mixed $db null, to only check global privileges - * string, db name where to also check for privileges - * @param mixed $tbl null, to only check global privileges - * string, db name where to also check for privileges + * @param string $priv The privilege to check + * @param mixed $db null, to only check global privileges + * string, db name where to also check for privileges + * @param mixed $tbl null, to only check global privileges + * string, db name where to also check for privileges * * @return bool */ From ea30c016c85cb4a34b5c49109dd18a745447fb54 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Aug 2011 07:30:29 +0530 Subject: [PATCH 921/971] Opening braces should be on a new line --- libraries/common.lib.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2e74489303..c3e2ce5667 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3219,7 +3219,8 @@ function PMA_getSupportedDatatypes($html = false, $selected = '') * * @return array list of datatypes */ -function PMA_unsupportedDatatypes() { +function PMA_unsupportedDatatypes() +{ $no_support_types = array(); return $no_support_types; } @@ -3231,7 +3232,8 @@ function PMA_unsupportedDatatypes() { * * @return array GIS data types */ -function PMA_getGISDatatypes($upper_case = false) { +function PMA_getGISDatatypes($upper_case = false) +{ $gis_data_types = array('geometry', 'point', 'linestring', @@ -3257,7 +3259,8 @@ function PMA_getGISDatatypes($upper_case = false) { * * @return GIS data enclosed in 'GeomFromText' function */ -function PMA_createGISData($gis_string) { +function PMA_createGISData($gis_string) +{ $gis_string = trim($gis_string); $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)'; if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $gis_string)) { @@ -3283,8 +3286,8 @@ function PMA_createGISData($gis_string) { * @return array names and details of the functions that can be applied on * geometry data typess. */ -function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false) { - +function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false) +{ $funcs = array(); if ($display) { $funcs[] = array('display' => ' '); From adbdb71e60b788ac10d134a5e0a099d35ca91ff1 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Aug 2011 07:42:24 +0530 Subject: [PATCH 922/971] Coding style improvements --- libraries/common.lib.php | 103 ++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 46 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c3e2ce5667..4b286d3b71 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -178,7 +178,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php $a_string = strtr( $a_string, array("\n" => '\n', "\r" => '\r', "\t" => '\t') - ); + ); } if ($php_code) { @@ -246,15 +246,17 @@ function PMA_unQuote($quoted_string, $quote = null) foreach ($quotes as $quote) { if (substr($quoted_string, 0, 1) === $quote - && substr($quoted_string, -1, 1) === $quote) { - $unquoted_string = substr($quoted_string, 1, -1); - // replace escaped quotes - $unquoted_string = str_replace( + && substr($quoted_string, -1, 1) === $quote + ) { + $unquoted_string = substr($quoted_string, 1, -1); + // replace escaped quotes + $unquoted_string = str_replace( $quote . $quote, $quote, - $unquoted_string); - return $unquoted_string; - } + $unquoted_string + ); + return $unquoted_string; + } } return $quoted_string; @@ -512,14 +514,14 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice') * @access public */ function PMA_mysqlDie($error_message = '', $the_query = '', - $is_modify_link = true, $back_url = '', $exit = true) +$is_modify_link = true, $back_url = '', $exit = true) { global $table, $db; /** * start http output, display html headers */ - require_once './libraries/header.inc.php'; + include_once './libraries/header.inc.php'; $error_msg_output = ''; @@ -641,7 +643,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', /** * display footer and exit */ - require './libraries/footer.inc.php'; + include './libraries/footer.inc.php'; } else { echo $error_msg_output; } @@ -829,9 +831,8 @@ function PMA_whichCrlf() // Win case if (PMA_USR_OS == 'Win') { $the_crlf = "\r\n"; - } - // Others - else { + } else { + // Others $the_crlf = "\n"; } @@ -1005,8 +1006,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Same as below (append LIMIT), append the remembered ORDER BY if ($GLOBALS['cfg']['RememberSorting'] - && isset($analyzed_display_query[0]['queryflags']['select_from']) - && isset($GLOBALS['sql_order_to_append'])) { + && isset($analyzed_display_query[0]['queryflags']['select_from']) + && isset($GLOBALS['sql_order_to_append']) + ) { $query_base = $analyzed_display_query[0]['section_before_limit'] . "\n" . $GLOBALS['sql_order_to_append'] . $analyzed_display_query[0]['section_after_limit']; @@ -1158,10 +1160,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view ) { $validate_params = $url_params; if (!empty($GLOBALS['validatequery'])) { - $validate_message = __('Skip Validate SQL') ; + $validate_message = __('Skip Validate SQL'); } else { $validate_params['validatequery'] = 1; - $validate_message = __('Validate SQL') ; + $validate_message = __('Validate SQL'); } $validate_link = 'import.php' . PMA_generate_common_url($validate_params); @@ -1361,7 +1363,8 @@ function PMA_localizeNumber($value) /* l10n: Decimal separator */ __('.'), ), - $value); + $value + ); } /** @@ -1383,7 +1386,8 @@ function PMA_localizeNumber($value) * @param integer $digits_left number of digits left of the comma * @param integer $digits_right number of digits right of the comma * @param boolean $only_down do not reformat numbers below 1 - * @param boolean $noTrailingZero removes trailing zeros right of the comma (default: true) + * @param boolean $noTrailingZero removes trailing zeros right of the comma + * (default: true) * * @return string the formatted value and its unit * @@ -1391,7 +1395,9 @@ function PMA_localizeNumber($value) */ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true) { - if ($value==0) return '0'; + if ($value==0) { + return '0'; + } $originalValue = $value; //number_format is not multibyte safe, str_replace is safe @@ -1450,7 +1456,9 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow $d-= floor(($digits_left - $cur_digits)/3); } - if ($d<0 && $only_down) $d=0; + if ($d<0 && $only_down) { + $d=0; + } $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; @@ -1459,7 +1467,7 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow if ($noTrailingZero) { $value = PMA_localizeNumber( preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value) - ); + ); } else { //number_format is not multibyte safe, str_replace is safe $value = PMA_localizeNumber(number_format($value, $digits_right)); @@ -1594,7 +1602,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') // determine additionnal style-class if (empty($tab['class'])) { if (! empty($tab['active']) - || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) { + || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link']) + ) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) && basename($GLOBALS['PMA_PHP_SELF']) == $tab['link'] @@ -1631,19 +1640,21 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='') // display icon, even if iconic is disabled but the link-text is missing if (($GLOBALS['cfg']['MainPageIconic'] || empty($tab['text'])) - && isset($tab['icon'])) { + && isset($tab['icon']) + ) { // avoid generating an alt tag, because it only illustrates // the text that follows and if browser does not display // images, the text is duplicated $image = '%2$s'; $tab['text'] = sprintf($image, htmlentities($tab['icon']), $tab['text']); - } - // check to not display an empty link-text - elseif (empty($tab['text'])) { + } elseif (empty($tab['text'])) { + // check to not display an empty link-text $tab['text'] = '?'; - trigger_error('empty linktext in function ' . __FUNCTION__ . '()', - E_USER_NOTICE); + trigger_error( + 'empty linktext in function ' . __FUNCTION__ . '()', + E_USER_NOTICE + ); } //Set the id for the tab, if set in the params @@ -1753,9 +1764,9 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) { if ($suhosin_get_MaxValueLength = ini_get('suhosin.get.max_value_length')) { $query_parts = PMA_splitURLQuery($url); - foreach($query_parts as $query_pair) { + foreach ($query_parts as $query_pair) { list($eachvar, $eachval) = explode('=', $query_pair); - if(strlen($eachval) > $suhosin_get_MaxValueLength) { + if (strlen($eachval) > $suhosin_get_MaxValueLength) { $in_suhosin_limits = false; break; } @@ -1827,7 +1838,8 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), * * @return array the parameter/value pairs, for example [0] db=sakila */ -function PMA_splitURLQuery($url) { +function PMA_splitURLQuery($url) +{ // decode encoded url separators $separator = PMA_get_arg_separator(); // on most places separator is still hard coded ... @@ -1964,7 +1976,7 @@ function PMA_checkParameters($params, $die = true, $request = true) /** * display html meta tags */ - require_once './libraries/header_meta_style.inc.php'; + include_once './libraries/header_meta_style.inc.php'; echo '

    ' . $error_message . '

    '; if ($die) { exit(); @@ -1985,7 +1997,7 @@ function PMA_checkParameters($params, $die = true, $request = true) * * @return array the calculated condition and whether condition is unique */ -function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique=false) +function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force_unique = false) { $primary_key = ''; $unique_key = ''; @@ -2317,9 +2329,10 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou echo "\n", '', "\n"; echo PMA_generate_common_hidden_inputs($_url_params); echo PMA_pageselector( - $max_count, - floor(($pos + 1) / $max_count) + 1, - ceil($count / $max_count)); + $max_count, + floor(($pos + 1) / $max_count) + 1, + ceil($count / $max_count) + ); echo ''; if ($pos + $max_count < $count) { @@ -2771,8 +2784,8 @@ function PMA_extractFieldSpec($fieldspec) $enum_set_values[] = $working; $in_string = false; - // Otherwise, this is a 'double quote', and can be added to the working string } elseif ($next == "'") { + // Otherwise, this is a 'double quote', and can be added to the working string $working .= "'"; // Skip the next char; we already know what it is $index++; @@ -2880,7 +2893,8 @@ function PMA_replace_binary_contents($content) * * @return GIS data in Well Know Text format */ -function PMA_asWKT($data, $includeSRID = false) { +function PMA_asWKT($data, $includeSRID = false) +{ // Convert to WKT format $hex = bin2hex($data); $wktsql = "SELECT ASTEXT(x'" . $hex . "')"; @@ -3034,17 +3048,14 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response['success'] = true; if ($message instanceof PMA_Message) { $response['message'] = $message->getDisplay(); - } - else { + } else { $response['message'] = $message; } - } - else { + } else { $response['success'] = false; if ($message instanceof PMA_Message) { $response['error'] = $message->getDisplay(); - } - else { + } else { $response['error'] = $message; } } From 26622d7fdae775bb8ef5e331fec9b2c963024e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 09:04:54 +0200 Subject: [PATCH 923/971] Pass this as javascript code --- server_status.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server_status.php b/server_status.php index 5490400bc8..803b76cd98 100644 --- a/server_status.php +++ b/server_status.php @@ -683,7 +683,8 @@ PMA_AddJSVar( ); PMA_AddJSVar( 'server_time_diff', - 'new Date().getTime() - ' . (microtime(true) * 1000) + 'new Date().getTime() - ' . (microtime(true) * 1000), + false ); PMA_AddJSVar( 'server_os', From 863d8f2e52373f404ba96fa79c406481277764b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 09:06:31 +0200 Subject: [PATCH 924/971] Support for not escaped js code --- libraries/core.lib.php | 4 ++-- libraries/js_escape.lib.php | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 29d2f439e2..d1348ed2c7 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -726,9 +726,9 @@ function PMA_AddJSCode($str) * @param mixed $value Value to set, can be either string or array of strings * */ -function PMA_AddJSVar($key, $value) +function PMA_AddJSVar($key, $value, $escape = true) { - PMA_AddJsCode(PMA_getJsValue($key, $value)); + PMA_AddJsCode(PMA_getJsValue($key, $value, $escape)); } ?> diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 87d88552a6..cb2dbd1c52 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -87,10 +87,12 @@ function PMA_formatJsVal($value) * * @return string Javascript code. */ -function PMA_getJsValue($key, $value) +function PMA_getJsValue($key, $value, $escape = true) { $result = $key . ' = '; - if (is_array($value)) { + if (!$escape) { + $result .= $value; + } elseif (is_array($value)) { $result .= '['; foreach ($value as $id => $val) { $result .= PMA_formatJsVal($value) . ","; From ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 09:10:39 +0200 Subject: [PATCH 925/971] Docblocks --- libraries/core.lib.php | 5 +++-- libraries/js_escape.lib.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index d1348ed2c7..3d561e6ded 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -722,8 +722,9 @@ function PMA_AddJSCode($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 + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code) * */ function PMA_AddJSVar($key, $value, $escape = true) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index cb2dbd1c52..969b1bcd55 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -82,8 +82,9 @@ function PMA_formatJsVal($value) * 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 + * @param string $key Name of value to set + * @param mixed $value Value to set, can be either string or array of strings + * @param bool $escape Whether to escape value or keep it as it is (for inclusion of js code) * * @return string Javascript code. */ From f1b4c72e41d94e23c52e7d58fd000eacdcc5a61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 09:24:53 +0200 Subject: [PATCH 926/971] Revert "Fix: Monitor broken from a change by michal" This reverts commit 6f20ebf5cfb1fa47fb84cb14729b5000449955de. --- libraries/core.lib.php | 9 ++------- server_status.php | 3 +-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index fbc111002f..a277f29629 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -724,16 +724,11 @@ function PMA_AddJSCode($str) * * @param string $key Name of value to set * @param mixed $value Value to set, can be either string or array of strings - * @param string $escaping Handle value as-is, don't use PMA_formatJsVal() on it * */ -function PMA_AddJSVar($key, $value, $escaping = true) +function PMA_AddJSVar($key, $value) { - if($escaping) { - PMA_AddJsCode($key . '=' . PMA_formatJsVal($value) . ';'); - } else { - PMA_AddJsCode($key . '=' . $value . ';'); - } + PMA_AddJsCode(PMA_getJsValue($key, $value)); } ?> diff --git a/server_status.php b/server_status.php index 8d8ecf267b..1dd4852369 100644 --- a/server_status.php +++ b/server_status.php @@ -683,8 +683,7 @@ PMA_AddJSVar( ); PMA_AddJSVar( 'server_time_diff', - 'new Date().getTime() - ' . (microtime(true) * 1000), - false + 'new Date().getTime() - ' . (microtime(true) * 1000) ); PMA_AddJSVar( 'server_os', From c5eb1f4d79b4095e91a0201628cc353fd19365fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Aug 2011 10:14:05 +0200 Subject: [PATCH 927/971] Fix format string --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 893fbb4a71..958ff292e4 100644 --- a/po/es.po +++ b/po/es.po @@ -13118,7 +13118,7 @@ msgid "" "\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" "innodblogfilesize-proper-way.html\\\">this blog entry" msgstr "" -"Normalmente es suficiente definir «innodb_log_file_size» a el 25% del valor " +"Normalmente es suficiente definir «innodb_log_file_size» a el 25%% del valor " "de «innodb_buffer_pool_size». Un valor muy alto de «innodb_log_file_size» " "reduce considerablemente la velocidad de la recuperación luego de una caída " "de la base de datos. Revise también Date: Mon, 22 Aug 2011 11:08:49 +0200 Subject: [PATCH 928/971] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5321e3c8f4..af2bd5ec00 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-21 04:03+0200\n" +"PO-Revision-Date: 2011-08-22 11:08+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -848,7 +848,7 @@ msgid "Dump has been saved to file %s." msgstr "ダンプをファイル %s に保存しました" #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" msgstr "カラム \"%s\" に対しての値" From 4181fc2a5617712e719e4cb2681671b9d46fd0e0 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Mon, 22 Aug 2011 11:10:05 +0200 Subject: [PATCH 929/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index af2bd5ec00..5e909777ec 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-22 11:08+0200\n" +"PO-Revision-Date: 2011-08-22 11:10+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1231,10 +1231,9 @@ msgid "Query cache efficiency" msgstr "クエリキャッシュ" #: js/messages.php:97 po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache usage" -msgstr "クエリキャッシュ" +msgstr "クエリキャッシュの使用状況" #: js/messages.php:98 #, fuzzy From 922c6f501c22e5604cbe4c81381dc79fa42d53e6 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Mon, 22 Aug 2011 11:15:19 +0200 Subject: [PATCH 930/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5e909777ec..7480fb9cbe 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-22 11:10+0200\n" +"PO-Revision-Date: 2011-08-22 11:15+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1236,10 +1236,9 @@ msgid "Query cache usage" msgstr "クエリキャッシュの使用状況" #: js/messages.php:98 -#, fuzzy #| msgid "Query cache" msgid "Query cache used" -msgstr "クエリキャッシュ" +msgstr "使用されているクエリキャッシュ" #: js/messages.php:100 msgid "System CPU Usage" From 47a0c7d4a9a25d8065f041d7d9fe5dce5e9d8f93 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Mon, 22 Aug 2011 11:20:30 +0200 Subject: [PATCH 931/971] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7480fb9cbe..e3c82e3d43 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-22 11:15+0200\n" +"PO-Revision-Date: 2011-08-22 11:20+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1225,10 +1225,9 @@ msgid "" msgstr "" #: js/messages.php:96 -#, fuzzy #| msgid "Query cache" msgid "Query cache efficiency" -msgstr "クエリキャッシュ" +msgstr "クエリキャッシュ効率" #: js/messages.php:97 po/advisory_rules.php:70 #| msgid "Query cache" From fa81f24b4349c96f436b8d11d501f2a679ab1288 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Mon, 22 Aug 2011 11:21:17 +0200 Subject: [PATCH 932/971] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index e3c82e3d43..482bae3bfa 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-17 16:58+0200\n" -"PO-Revision-Date: 2011-08-22 11:20+0200\n" +"PO-Revision-Date: 2011-08-22 11:21+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -11961,7 +11961,7 @@ msgstr "" #: po/advisory_rules.php:75 msgid "Query cache efficiency (%)" -msgstr "" +msgstr "クエリキャッシュ効率 (%)" #: po/advisory_rules.php:76 msgid "Query cache not running efficiently, it has a low hit rate." From 966716ec6844e3c47d1cd8e75346609da79a84bb Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Aug 2011 14:51:56 +0530 Subject: [PATCH 933/971] More coding style improvements --- libraries/common.lib.php | 265 +++++++++++++++++++++++++++------------ 1 file changed, 186 insertions(+), 79 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4b286d3b71..833dd20fbc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -97,11 +97,11 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa if ($include_icon) { if ($noSprite) { $button .= ''; + . ' class="icon" width="16" height="16" />'; } else { - $button .= '' . $alternate . ''; + $button .= '' . $alternate . ''; } } @@ -386,15 +386,21 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju if (defined('PMA_MYSQL_INT_VERSION')) { if (PMA_MYSQL_INT_VERSION >= 50500) { $mysql = '5.5'; - /* l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. */ + /* l10n: Language to use for MySQL 5.5 documentation, please + * use only languages which do exist in official documentation. + */ $lang = _pgettext('MySQL 5.5 documentation language', 'en'); } else if (PMA_MYSQL_INT_VERSION >= 50100) { $mysql = '5.1'; - /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */ + /* l10n: Language to use for MySQL 5.1 documentation, please + * use only languages which do exist in official documentation. + */ $lang = _pgettext('MySQL 5.1 documentation language', 'en'); } else { $mysql = '5.0'; - /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */ + /* l10n: Language to use for MySQL 5.0 documentation, please use + * only languages which do exist in official documentation. + */ $lang = _pgettext('MySQL 5.0 documentation language', 'en'); } } @@ -409,9 +415,11 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju if ($just_open) { return $open_link; } elseif ($big_icon) { - return $open_link . '' . __('Documentation') . ''; + return $open_link . '' + . __('Documentation') . ''; } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) { - return $open_link . '' . __('Documentation') . ''; + return $open_link . '' + . __('Documentation') . ''; } else { return '[' . $open_link . __('Documentation') . ']'; } @@ -430,9 +438,12 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju function PMA_showDocu($anchor) { if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' + . '' + . __('Documentation') . ''; } else { - return '[' . __('Documentation') . ']'; + return '[' + . __('Documentation') . ']'; } } // end of the 'PMA_showDocu()' function @@ -450,7 +461,9 @@ function PMA_showPHPDocu($target) $url = PMA_getPHPDocLink($target); if ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '' . __('Documentation') . ''; + return '' + . '' + . __('Documentation') . ''; } else { return '[' . __('Documentation') . ']'; } @@ -559,7 +572,8 @@ $is_modify_link = true, $back_url = '', $exit = true) // --- // modified to show the help on sql errors $error_msg_output .= '

    ' . __('SQL query') . ':' . "\n"; - if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select + if (strstr(strtolower($formatted_sql), 'select')) { + // please show me help to the error on select $error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT'); } if ($is_modify_link) { @@ -588,8 +602,12 @@ $is_modify_link = true, $back_url = '', $exit = true) .'

    ' . "\n"; } // end if - if (!empty($error_message)) { - $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); + if (! empty($error_message)) { + $error_message = preg_replace( + "@((\015\012)|(\015)|(\012)){3,}@", + "\n\n", + $error_message + ); } // modified to show the help on error-returns // (now error-messages-server) @@ -600,7 +618,8 @@ $is_modify_link = true, $back_url = '', $exit = true) . '

    ' . "\n"; // The error message will be displayed within a CODE segment. - // To preserve original formatting, but allow wordwrapping, we do a couple of replacements + // To preserve original formatting, but allow wordwrapping, + // we do a couple of replacements // Replace all non-single blanks with their HTML-counterpart $error_message = str_replace(' ', '  ', $error_message); @@ -928,7 +947,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view echo "\n"; echo '' . "\n"; } // end if ... elseif @@ -947,7 +967,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence, // check for it's presence before using it - echo '
    ' . "\n"; + echo '
    ' . "\n"; if ($message instanceof PMA_Message) { if (isset($GLOBALS['special_message'])) { @@ -986,7 +1008,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // when the query is large (for example an INSERT of binary // data), the parser chokes; so avoid parsing the query $query_too_big = true; - $shortened_query_base = nl2br(htmlspecialchars(substr($sql_query, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]')); + $shortened_query_base = nl2br( + htmlspecialchars( + substr($sql_query, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]' + ) + ); } elseif (! empty($GLOBALS['parsed_sql']) && $query_base == $GLOBALS['parsed_sql']['raw']) { // (here, use "! empty" because when deleting a bookmark, @@ -1109,7 +1135,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // to edit it (unless it's enormous, see PMA_linkOrButton() ) if (! empty($cfg['SQLQuery']['Edit'])) { if ($cfg['EditInWindow'] == true) { - $onclick = 'window.parent.focus_querywindow(\'' . PMA_jsFormat($sql_query, false) . '\'); return false;'; + $onclick = 'window.parent.focus_querywindow(\'' + . PMA_jsFormat($sql_query, false) . '\'); return false;'; } else { $onclick = ''; } @@ -1205,14 +1232,18 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (empty($refresh_link) || ! PMA_profilingSupported()) { echo '
    '; echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); - echo ''; + echo ''; echo ''; } // in the tools div, only display the Inline link when not in ajax // mode because 1) it currently does not work and 2) we would // have two similar mechanisms on the page for the same goal - if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) { + if ($is_select + || $GLOBALS['is_ajax_request'] === false + && ! $query_too_big + ) { // see in js/functions.js the jQuery code attached to id inline_edit // document.write conflicts with jQuery, hence used $().append() echo "