Git August 2011

git@phpmyadmin.net

8 participants
476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13624-ged1519e
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via ed1519ee76a572306bfa668e0cb72ce8e2d1bf0d (commit) from d6873470c2cccb26cbc9c674c98cce8c9ebe963c (commit) - Log ----------------------------------------------------------------- commit ed1519ee76a572306bfa668e0cb72ce8e2d1bf0d Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:33:10 2011 +0200 Fix indentation of some code blocks ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 289 +++++++++++++++++++++---------------------- 1 files changed, 144 insertions(+), 145 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 9a6df66..10c7547 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -645,13 +645,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { } elseif (($last == '-') || ($last == '+') || ($last == '!')) { $count2--; $punct_data = PMA_substr($sql, $count1, $count2 - $count1); - /** - * @todo for negation operator, split in 2 tokens ? - * "select x&~1 from t" - * becomes "select x & ~ 1 from t" ? - */ - } elseif ($last != '~') { + /** + * @todo for negation operator, split in 2 tokens ? + * "select x&~1 from t" + * becomes "select x & ~ 1 from t" ? + */ $debugstr = __('Unknown Punctuation String') . ' @ ' . ($count1+1) . "\n" . 'STR: ' . htmlspecialchars($punct_data); PMA_SQP_throwError($debugstr, $sql); @@ -812,16 +811,16 @@ if (! defined('PMA_MINIMUM_COMMON')) { return $sql_array; } // end of the "PMA_SQP_parse()" function - /** - * Checks for token types being what we want... - * - * @param string String of type that we have - * @param string String of type that we want - * - * @return boolean result of check - * - * @access private - */ + /** + * Checks for token types being what we want... + * + * @param string String of type that we have + * @param string String of type that we want + * + * @return boolean result of check + * + * @access private + */ function PMA_SQP_typeCheck($toCheck, $whatWeWant) { $typeSeperator = '_'; @@ -890,122 +889,122 @@ if (! defined('PMA_MINIMUM_COMMON')) { // for GROUP_CONCAT(...) $in_group_concat = false; -/* Description of analyzer results - * - * db, table, column, alias - * ------------------------ - * - * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] arrays. - * - * The SELECT syntax (simplified) is - * - * SELECT - * select_expression,... - * [FROM [table_references] - * - * - * ['select_expr'] is filled with each expression, the key represents the - * expression position in the list (0-based) (so we don't lose track of - * multiple occurences of the same column). - * - * ['table_ref'] is filled with each table ref, same thing for the key. - * - * I create all sub-values empty, even if they are - * not present (for example no select_expression alias). - * - * There is a debug section at the end of loop #1, if you want to - * see the exact contents of select_expr and table_ref - * - * queryflags - * ---------- - * - * In $subresult, array 'queryflags' is filled, according to what we - * find in the query. - * - * Currently, those are generated: - * - * ['queryflags']['need_confirm'] = 1; if the query needs confirmation - * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM - * ['queryflags']['distinct'] = 1; for a DISTINCT - * ['queryflags']['union'] = 1; for a UNION - * ['queryflags']['join'] = 1; for a JOIN - * ['queryflags']['offset'] = 1; for the presence of OFFSET - * ['queryflags']['procedure'] = 1; for the presence of PROCEDURE - * - * query clauses - * ------------- - * - * The select is splitted in those clauses: - * ['select_expr_clause'] - * ['from_clause'] - * ['group_by_clause'] - * ['order_by_clause'] - * ['having_clause'] - * ['limit_clause'] - * ['where_clause'] - * - * The identifiers of the WHERE clause are put into the array - * ['where_clause_identifier'] - * - * For a SELECT, the whole query without the ORDER BY clause is put into - * ['unsorted_query'] - * - * foreign keys - * ------------ - * The CREATE TABLE may contain FOREIGN KEY clauses, so they get - * analyzed and ['foreign_keys'] is an array filled with - * the constraint name, the index list, - * the REFERENCES table name and REFERENCES index list, - * and ON UPDATE | ON DELETE clauses - * - * position_of_first_select - * ------------------------ - * - * The array index of the first SELECT we find. Will be used to - * insert a SQL_CALC_FOUND_ROWS. - * - * create_table_fields - * ------------------- - * - * Used to detect the DEFAULT CURRENT_TIMESTAMP and - * ON UPDATE CURRENT_TIMESTAMP clauses of the CREATE TABLE query. - * Also used to store the default value of the field. - * An array, each element is the identifier name. - * Note that for now, the timestamp_not_null element is created - * even for non-TIMESTAMP fields. - * - * Sub-elements: ['type'] which contains the column type - * optional (currently they are never false but can be absent): - * ['default_current_timestamp'] boolean - * ['on_update_current_timestamp'] boolean - * ['timestamp_not_null'] boolean - * - * section_before_limit, section_after_limit - * ----------------------------------------- - * - * Marks the point of the query where we can insert a LIMIT clause; - * so the section_before_limit will contain the left part before - * a possible LIMIT clause - * - * - * End of description of analyzer results - */ + /* Description of analyzer results + * + * db, table, column, alias + * ------------------------ + * + * Inside the $subresult array, we create ['select_expr'] and ['table_ref'] arrays. + * + * The SELECT syntax (simplified) is + * + * SELECT + * select_expression,... + * [FROM [table_references] + * + * + * ['select_expr'] is filled with each expression, the key represents the + * expression position in the list (0-based) (so we don't lose track of + * multiple occurences of the same column). + * + * ['table_ref'] is filled with each table ref, same thing for the key. + * + * I create all sub-values empty, even if they are + * not present (for example no select_expression alias). + * + * There is a debug section at the end of loop #1, if you want to + * see the exact contents of select_expr and table_ref + * + * queryflags + * ---------- + * + * In $subresult, array 'queryflags' is filled, according to what we + * find in the query. + * + * Currently, those are generated: + * + * ['queryflags']['need_confirm'] = 1; if the query needs confirmation + * ['queryflags']['select_from'] = 1; if this is a real SELECT...FROM + * ['queryflags']['distinct'] = 1; for a DISTINCT + * ['queryflags']['union'] = 1; for a UNION + * ['queryflags']['join'] = 1; for a JOIN + * ['queryflags']['offset'] = 1; for the presence of OFFSET + * ['queryflags']['procedure'] = 1; for the presence of PROCEDURE + * + * query clauses + * ------------- + * + * The select is splitted in those clauses: + * ['select_expr_clause'] + * ['from_clause'] + * ['group_by_clause'] + * ['order_by_clause'] + * ['having_clause'] + * ['limit_clause'] + * ['where_clause'] + * + * The identifiers of the WHERE clause are put into the array + * ['where_clause_identifier'] + * + * For a SELECT, the whole query without the ORDER BY clause is put into + * ['unsorted_query'] + * + * foreign keys + * ------------ + * The CREATE TABLE may contain FOREIGN KEY clauses, so they get + * analyzed and ['foreign_keys'] is an array filled with + * the constraint name, the index list, + * the REFERENCES table name and REFERENCES index list, + * and ON UPDATE | ON DELETE clauses + * + * position_of_first_select + * ------------------------ + * + * The array index of the first SELECT we find. Will be used to + * insert a SQL_CALC_FOUND_ROWS. + * + * create_table_fields + * ------------------- + * + * Used to detect the DEFAULT CURRENT_TIMESTAMP and + * ON UPDATE CURRENT_TIMESTAMP clauses of the CREATE TABLE query. + * Also used to store the default value of the field. + * An array, each element is the identifier name. + * Note that for now, the timestamp_not_null element is created + * even for non-TIMESTAMP fields. + * + * Sub-elements: ['type'] which contains the column type + * optional (currently they are never false but can be absent): + * ['default_current_timestamp'] boolean + * ['on_update_current_timestamp'] boolean + * ['timestamp_not_null'] boolean + * + * section_before_limit, section_after_limit + * ----------------------------------------- + * + * Marks the point of the query where we can insert a LIMIT clause; + * so the section_before_limit will contain the left part before + * a possible LIMIT clause + * + * + * End of description of analyzer results + */ // must be sorted // TODO: current logic checks for only one word, so I put only the // first word of the reserved expressions that end a table ref; // maybe this is not ok (the first word might mean something else) -// $words_ending_table_ref = array( -// 'FOR UPDATE', -// 'GROUP BY', -// 'HAVING', -// 'LIMIT', -// 'LOCK IN SHARE MODE', -// 'ORDER BY', -// 'PROCEDURE', -// 'UNION', -// 'WHERE' -// ); + // $words_ending_table_ref = array( + // 'FOR UPDATE', + // 'GROUP BY', + // 'HAVING', + // 'LIMIT', + // 'LOCK IN SHARE MODE', + // 'ORDER BY', + // 'PROCEDURE', + // 'UNION', + // 'WHERE' + // ); $words_ending_table_ref = array( 'FOR' => 1, 'GROUP' => 1, @@ -1047,7 +1046,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // loop #1 for each token: select_expr, table_ref for SELECT for ($i = 0; $i < $size; $i++) { -//DEBUG echo "Loop1 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ") "; + //DEBUG echo "Loop1 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ") "; // High speed seek for locating the end of the current query if ($seek_queryend == true) { @@ -1068,7 +1067,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { continue; } // end if (type == punct_queryend) -// ============================================================== + // ============================================================== if ($arr[$i]['type'] == 'punct_bracket_open_round') { $number_of_brackets++; if ($in_extract) { @@ -1078,7 +1077,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $number_of_brackets_in_group_concat++; } } -// ============================================================== + // ============================================================== if ($arr[$i]['type'] == 'punct_bracket_close_round') { $number_of_brackets--; if ($number_of_brackets == 0) { @@ -1109,7 +1108,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ continue; } -// ============================================================== + // ============================================================== if ($arr[$i]['type'] == 'alpha_functionName') { $upper_data = strtoupper($arr[$i]['data']); if ($upper_data =='EXTRACT') { @@ -1122,10 +1121,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { } } -// ============================================================== + // ============================================================== if ($arr[$i]['type'] == 'alpha_reservedWord' -// && $arr[$i]['forbidden'] == false) { - ) { + //&& $arr[$i]['forbidden'] == false) { + ) { // We don't know what type of query yet, so run this if ($subresult['querytype'] == '') { $subresult['querytype'] = strtoupper($arr[$i]['data']); @@ -1168,7 +1167,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // reserved words below } // end if (type == alpha_reservedWord) -// ============================== + // ============================== if ($arr[$i]['type'] == 'quote_backtick' || $arr[$i]['type'] == 'quote_double' || $arr[$i]['type'] == 'quote_single' @@ -1229,7 +1228,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // end if (querytype SELECT) } // end if (quote_backtick or double quote or alpha_identifier) -// =================================== + // =================================== if ($arr[$i]['type'] == 'punct_qualifier') { // to be able to detect an identifier following another $previous_was_identifier = false; @@ -1498,7 +1497,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $in_subquery = false; for ($i = 0; $i < $size; $i++) { -//DEBUG echo "Loop2 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ") "; + //DEBUG echo "Loop2 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ") "; // need_confirm // @@ -1988,10 +1987,10 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($seen_references) { if ($seen_alter && $brackets_level > 0) { $foreign[$foreign_key_number]['ref_index_list'][] = $identifier; - // here, the first bracket level corresponds to the - // bracket of CREATE TABLE - // so if we are on level 2, it must be the index list - // of the foreign key REFERENCES + // here, the first bracket level corresponds to the + // bracket of CREATE TABLE + // so if we are on level 2, it must be the index list + // of the foreign key REFERENCES } elseif ($brackets_level > 1) { $foreign[$foreign_key_number]['ref_index_list'][] = $identifier; } elseif ($arr[$i+1]['type'] == 'punct_qualifier') { @@ -2200,7 +2199,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $in_priv_list = false; for ($i = $start_token; $i < $number_of_tokens; $i++) { -// DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . " "; + // DEBUG echo "Loop format " . $arr[$i]['data'] . " " . $arr[$i]['type'] . " "; $before = ''; $after = ''; // array_shift($typearr); @@ -2307,7 +2306,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { // select 20 -9 // ) if ($typearr[3] != 'digit_integer') { - $after .= ' '; + $after .= ' '; } break; case 'punct_bracket_close_round': @@ -2453,8 +2452,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { $before .= $space_alpha_reserved_word; } } else { - // on first keyword, check if it introduces a - // privilege list + // on first keyword, check if it introduces a + // privilege list if (isset($keywords_priv_list[$arr[$i]['data']])) { $in_priv_list = true; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13623-gd687347
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via d6873470c2cccb26cbc9c674c98cce8c9ebe963c (commit) via 9d3e6904f5c0ecea115a50d907f663fe725826db (commit) via f0e92be1d50f2a62705829f0be834358ed21bb76 (commit) via 8f4ce18807efdf31fd31daeeeadcd59ebd282d9f (commit) via 6f02168687102816fa3285336dd7df76d08d830a (commit) via 49a4c93b7735b8e0df8946b1f140eaf312c32729 (commit) via a2271486d77d6e62e20c6d940bd8533b5c99bad8 (commit) via 283a2ada3be833febcf908bda9d67425066482cd (commit) via 70f3fb9900372b70b94ec96d079c92ba206e1e2d (commit) via 183a5a0abff942add1c7a03cc00336d98d713943 (commit) via 7bcabac8eecd4344706efb1d76637dee92c9205e (commit) via f2a368f2466c51de442313a80bb72aba1b66b15e (commit) via ba18463c0870eaca1da52f8feb350cbaea1554c5 (commit) via fd942224b1eab56b63c3ae9b8ded99eeb728e705 (commit) via eef3234901962c4b8262080f65bebfc863a96493 (commit) via f2431282d2d74aa0f57fa15c4c0adf448aeea53a (commit) via 6794f57dfd99ae4ce5c2bb604656f18b331eb204 (commit) via ff088d3da9abcbf9a4d27db2861bc4f87760287a (commit) via b2d18e7e57187bd96c811b010cfea91ba1e54d15 (commit) via c77b1955eabdc0fd7ec7d466250e7a3af5319635 (commit) via fa762051bf6d269aa8f43d564a98142a53ace584 (commit) via fcb3e7d1ed97ab7009568600451123f6866d474d (commit) via bcfb8a2f0f9c623dde56292c917d2e808988dfa1 (commit) via 03a0403c27026ce8594e01ecc565e9fafaa36f65 (commit) via 125a056c72bcab47162e62cd86b6bbbe30bba4ec (commit) via f54e21d2fbbe28ea082a5d6daa41a333a658a4a7 (commit) via f8ab5db36becb435f12f809968f7bfe2d41cd39f (commit) via 9d22688f6dc4d732ad587a0303f19f62012f4566 (commit) via 88fadabed9473ca9ce684308970ed082afbfff8e (commit) via 9849d95e359cbc45662f7ffb7c432a9feaf077de (commit) via e6fa2fb6b1dd18383dfb0e414e6e6a571192e452 (commit) via f2b52dfad4c185aa757c3c1a9c911346810cd9c7 (commit) via c4e84df3403868ab2938f89358fcb147506290f9 (commit) via e69bb8a936dd223ad5129d72ed0564ce070b9229 (commit) via 8f3f5e6d33fde15175dbf63540fc845c03c16093 (commit) via 72b4c9fc53746357c419a63e2ef725ee0b9813a1 (commit) via ff98b0a82928ac97ef340518b4ad49129d592239 (commit) via 7a7427dd5535fa33d67848751dc532ffac0c86db (commit) via c03f8e0db2322a22d2a5defb3e14731deefc16dc (commit) via 67cd7e0e864e4f2c502e409c3af97ca4e2659f54 (commit) via 7d97d0252179a24f161f1faa41c9b7cd96c493fb (commit) via 0b70bf56d61e77d30d88b281d50f512ba834e518 (commit) via b6de9358715aba144b0ea8a147d72616077b65a8 (commit) via 97a0da335566f4a92a5a17e2eeb973b90d143a28 (commit) via bfde0c563e160b80ed4f83fb740cfc708983f7fb (commit) via 5d42c62d1513231e76f0cced2b00b0495ef53708 (commit) via f56bd81bc0b9d4cf9e6bae0c021a66d8d1df90ae (commit) via 6a4e20e9a2a36f1b92758d6442fb9cf8f907e9dc (commit) via a943c8b5cc6d31cfff82303664ed8740cb85081f (commit) via 82b5632b99d0d22bd8f30bbf76174b42713a2dd3 (commit) via 67b644d910720f56451699721b1a9ca1f3b93dfa (commit) via badbb84dd14f81a1f79b20a7bbc960da3be2cff7 (commit) via ae033e0e9dfaed904ad8543eba322748034d4610 (commit) via 08467dcefd218c46ca362eadfe0a5b739c0f6a26 (commit) via 69b4ca09a8d3b77f3ad57da9bab76c87dd84166c (commit) via 536f5686753f69fb11a5125a28bf01a2b1b96a6d (commit) via 177d95ef8ae7de2af2c610e0f1a93847f0be1a0d (commit) via 3e2cb558f4b3d544c3e504b5f47945444f0839c4 (commit) via 09feb3d85c24c961219b153f916884e43d81f3f5 (commit) via 76c4bf9ccf1434f766d76ca45dfbf6c6ff647eaf (commit) via a84f22bafc08628d5fd1dd627909f531f5a0284b (commit) via ee4b3962930068e2bf4360575fa043f234a910a1 (commit) via adbaf68a27f78bcf5d75812c2126723fc283bf6c (commit) via 47b93bfe2bb7a84d956bda3668c125b2a91e7e50 (commit) via 174a0776e013ac6ecacb28ca5e70b6b2f875252a (commit) via 73dfb7d12bf50cd1a8267b61d094dbdc8f439791 (commit) via 616361adec32db30e2c7097dccc49c3e9a4e62a7 (commit) via 5188b33125706d8f2016dd37a44359284066e9fd (commit) via 11ce6705c2c50159e1105e4e8b0b6aa832b18d47 (commit) via a86e61f762074482ae14be5f5fbb00527e228a58 (commit) via 4c2ecde381d4abc7bdc6523c210f69ce04be2f94 (commit) via d1a02e48e79eb87c0c4d64ca8ee496911f4b0ca1 (commit) via 4e19e9c2dc300ff17dafb8eb31ad57e9ea3f47b2 (commit) via 5e2a5f479f17ba2eab788cef2288138cbc0daaa5 (commit) via 2011e7880ab96bc3dd3f456e182b39b03c7508b0 (commit) via 71b9cd258f1c4870c16c3d3f30d9e84547fc9490 (commit) via 274d03a9179cc7cc87961c50638eb7ba9a8b3703 (commit) via 2f15c3e7cc7a8667fdcbbc037a9bed717fd29654 (commit) via 75f9e53de2433970b06753245a15124380fa5c04 (commit) via 02f70ef2a59a85140b31bed2d75c963b042f0070 (commit) via af8c69a90ec8c184f99162248df748b4bec7620c (commit) via 5af5cdfaa78c4caacfe91ac7faf5054f8ea0f1a3 (commit) via ea422315c9aad3d5a3329aa0a28152962883e231 (commit) from f5cdef3db8fe356f5bedbd8a0372c436e653aff4 (commit) - Log ----------------------------------------------------------------- commit d6873470c2cccb26cbc9c674c98cce8c9ebe963c Merge: f5cdef3 9d3e690 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:20:04 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 9d3e6904f5c0ecea115a50d907f663fe725826db Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:19:34 2011 +0200 Translation update done using Pootle. commit f0e92be1d50f2a62705829f0be834358ed21bb76 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:19:26 2011 +0200 Translation update done using Pootle. commit 8f4ce18807efdf31fd31daeeeadcd59ebd282d9f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:19:09 2011 +0200 Translation update done using Pootle. commit 6f02168687102816fa3285336dd7df76d08d830a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:18:59 2011 +0200 Translation update done using Pootle. commit 49a4c93b7735b8e0df8946b1f140eaf312c32729 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:18:30 2011 +0200 Translation update done using Pootle. commit a2271486d77d6e62e20c6d940bd8533b5c99bad8 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:18:12 2011 +0200 Translation update done using Pootle. commit 283a2ada3be833febcf908bda9d67425066482cd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:18:01 2011 +0200 Translation update done using Pootle. commit 70f3fb9900372b70b94ec96d079c92ba206e1e2d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:17:39 2011 +0200 Translation update done using Pootle. commit 183a5a0abff942add1c7a03cc00336d98d713943 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:16:15 2011 +0200 Translation update done using Pootle. commit 7bcabac8eecd4344706efb1d76637dee92c9205e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:14:52 2011 +0200 Translation update done using Pootle. commit f2a368f2466c51de442313a80bb72aba1b66b15e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:14:24 2011 +0200 Translation update done using Pootle. commit ba18463c0870eaca1da52f8feb350cbaea1554c5 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:13:58 2011 +0200 Translation update done using Pootle. commit fd942224b1eab56b63c3ae9b8ded99eeb728e705 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:13:50 2011 +0200 Translation update done using Pootle. commit eef3234901962c4b8262080f65bebfc863a96493 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:13:24 2011 +0200 Translation update done using Pootle. commit f2431282d2d74aa0f57fa15c4c0adf448aeea53a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:59 2011 +0200 Translation update done using Pootle. commit 6794f57dfd99ae4ce5c2bb604656f18b331eb204 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:49 2011 +0200 Translation update done using Pootle. commit ff088d3da9abcbf9a4d27db2861bc4f87760287a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:41 2011 +0200 Translation update done using Pootle. commit b2d18e7e57187bd96c811b010cfea91ba1e54d15 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:30 2011 +0200 Translation update done using Pootle. commit c77b1955eabdc0fd7ec7d466250e7a3af5319635 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:26 2011 +0200 Translation update done using Pootle. commit fa762051bf6d269aa8f43d564a98142a53ace584 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:20 2011 +0200 Translation update done using Pootle. commit fcb3e7d1ed97ab7009568600451123f6866d474d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:11 2011 +0200 Translation update done using Pootle. commit bcfb8a2f0f9c623dde56292c917d2e808988dfa1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:12:02 2011 +0200 Translation update done using Pootle. commit 03a0403c27026ce8594e01ecc565e9fafaa36f65 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:09:13 2011 +0200 Translation update done using Pootle. commit 125a056c72bcab47162e62cd86b6bbbe30bba4ec Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:01:35 2011 +0200 Translation update done using Pootle. commit f54e21d2fbbe28ea082a5d6daa41a333a658a4a7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:01:26 2011 +0200 Translation update done using Pootle. commit f8ab5db36becb435f12f809968f7bfe2d41cd39f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:01:17 2011 +0200 Translation update done using Pootle. commit 9d22688f6dc4d732ad587a0303f19f62012f4566 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:00:39 2011 +0200 Translation update done using Pootle. commit 88fadabed9473ca9ce684308970ed082afbfff8e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:00:23 2011 +0200 Translation update done using Pootle. commit 9849d95e359cbc45662f7ffb7c432a9feaf077de Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:00:17 2011 +0200 Translation update done using Pootle. commit e6fa2fb6b1dd18383dfb0e414e6e6a571192e452 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:59:57 2011 +0200 Translation update done using Pootle. commit f2b52dfad4c185aa757c3c1a9c911346810cd9c7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:59:40 2011 +0200 Translation update done using Pootle. commit c4e84df3403868ab2938f89358fcb147506290f9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:59:10 2011 +0200 Translation update done using Pootle. commit e69bb8a936dd223ad5129d72ed0564ce070b9229 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:54 2011 +0200 Translation update done using Pootle. commit 8f3f5e6d33fde15175dbf63540fc845c03c16093 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:48 2011 +0200 Translation update done using Pootle. commit 72b4c9fc53746357c419a63e2ef725ee0b9813a1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:23 2011 +0200 Translation update done using Pootle. commit ff98b0a82928ac97ef340518b4ad49129d592239 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:17 2011 +0200 Translation update done using Pootle. commit 7a7427dd5535fa33d67848751dc532ffac0c86db Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:13 2011 +0200 Translation update done using Pootle. commit c03f8e0db2322a22d2a5defb3e14731deefc16dc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:58:03 2011 +0200 Translation update done using Pootle. commit 67cd7e0e864e4f2c502e409c3af97ca4e2659f54 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:59 2011 +0200 Translation update done using Pootle. commit 7d97d0252179a24f161f1faa41c9b7cd96c493fb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:56 2011 +0200 Translation update done using Pootle. commit 0b70bf56d61e77d30d88b281d50f512ba834e518 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:54 2011 +0200 Translation update done using Pootle. commit b6de9358715aba144b0ea8a147d72616077b65a8 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:51 2011 +0200 Translation update done using Pootle. commit 97a0da335566f4a92a5a17e2eeb973b90d143a28 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:47 2011 +0200 Translation update done using Pootle. commit bfde0c563e160b80ed4f83fb740cfc708983f7fb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:37 2011 +0200 Translation update done using Pootle. commit 5d42c62d1513231e76f0cced2b00b0495ef53708 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:28 2011 +0200 Translation update done using Pootle. commit f56bd81bc0b9d4cf9e6bae0c021a66d8d1df90ae Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:25 2011 +0200 Translation update done using Pootle. commit 6a4e20e9a2a36f1b92758d6442fb9cf8f907e9dc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:17 2011 +0200 Translation update done using Pootle. commit a943c8b5cc6d31cfff82303664ed8740cb85081f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:57:06 2011 +0200 Translation update done using Pootle. commit 82b5632b99d0d22bd8f30bbf76174b42713a2dd3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:56:30 2011 +0200 Translation update done using Pootle. commit 67b644d910720f56451699721b1a9ca1f3b93dfa Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:56:14 2011 +0200 Translation update done using Pootle. commit badbb84dd14f81a1f79b20a7bbc960da3be2cff7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:56:10 2011 +0200 Translation update done using Pootle. commit ae033e0e9dfaed904ad8543eba322748034d4610 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:55:54 2011 +0200 Translation update done using Pootle. commit 08467dcefd218c46ca362eadfe0a5b739c0f6a26 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:55:51 2011 +0200 Translation update done using Pootle. commit 69b4ca09a8d3b77f3ad57da9bab76c87dd84166c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:55:47 2011 +0200 Translation update done using Pootle. commit 536f5686753f69fb11a5125a28bf01a2b1b96a6d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:55:01 2011 +0200 Translation update done using Pootle. commit 177d95ef8ae7de2af2c610e0f1a93847f0be1a0d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:54:53 2011 +0200 Translation update done using Pootle. commit 3e2cb558f4b3d544c3e504b5f47945444f0839c4 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:54:47 2011 +0200 Translation update done using Pootle. commit 09feb3d85c24c961219b153f916884e43d81f3f5 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:53:22 2011 +0200 Translation update done using Pootle. commit 76c4bf9ccf1434f766d76ca45dfbf6c6ff647eaf Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:53:02 2011 +0200 Translation update done using Pootle. commit a84f22bafc08628d5fd1dd627909f531f5a0284b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:52:46 2011 +0200 Translation update done using Pootle. commit ee4b3962930068e2bf4360575fa043f234a910a1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:52:32 2011 +0200 Translation update done using Pootle. commit adbaf68a27f78bcf5d75812c2126723fc283bf6c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:52:15 2011 +0200 Translation update done using Pootle. commit 47b93bfe2bb7a84d956bda3668c125b2a91e7e50 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:52:00 2011 +0200 Translation update done using Pootle. commit 174a0776e013ac6ecacb28ca5e70b6b2f875252a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:51:01 2011 +0200 Translation update done using Pootle. commit 73dfb7d12bf50cd1a8267b61d094dbdc8f439791 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:50:53 2011 +0200 Translation update done using Pootle. commit 616361adec32db30e2c7097dccc49c3e9a4e62a7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:50:22 2011 +0200 Translation update done using Pootle. commit 5188b33125706d8f2016dd37a44359284066e9fd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:50:16 2011 +0200 Translation update done using Pootle. commit 11ce6705c2c50159e1105e4e8b0b6aa832b18d47 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:49:03 2011 +0200 Translation update done using Pootle. commit a86e61f762074482ae14be5f5fbb00527e228a58 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:48:33 2011 +0200 Translation update done using Pootle. commit 4c2ecde381d4abc7bdc6523c210f69ce04be2f94 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:48:28 2011 +0200 Translation update done using Pootle. commit d1a02e48e79eb87c0c4d64ca8ee496911f4b0ca1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:48:21 2011 +0200 Translation update done using Pootle. commit 4e19e9c2dc300ff17dafb8eb31ad57e9ea3f47b2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:48:13 2011 +0200 Translation update done using Pootle. commit 5e2a5f479f17ba2eab788cef2288138cbc0daaa5 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:47:57 2011 +0200 Translation update done using Pootle. commit 2011e7880ab96bc3dd3f456e182b39b03c7508b0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:47:49 2011 +0200 Translation update done using Pootle. commit 71b9cd258f1c4870c16c3d3f30d9e84547fc9490 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:47:32 2011 +0200 Translation update done using Pootle. commit 274d03a9179cc7cc87961c50638eb7ba9a8b3703 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:47:27 2011 +0200 Translation update done using Pootle. commit 2f15c3e7cc7a8667fdcbbc037a9bed717fd29654 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:47:19 2011 +0200 Translation update done using Pootle. commit 75f9e53de2433970b06753245a15124380fa5c04 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:46:54 2011 +0200 Translation update done using Pootle. commit 02f70ef2a59a85140b31bed2d75c963b042f0070 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:46:41 2011 +0200 Translation update done using Pootle. commit af8c69a90ec8c184f99162248df748b4bec7620c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:45:38 2011 +0200 Translation update done using Pootle. commit 5af5cdfaa78c4caacfe91ac7faf5054f8ea0f1a3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:45:35 2011 +0200 Translation update done using Pootle. commit ea422315c9aad3d5a3329aa0a28152962883e231 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:45:28 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 262 ++++++++++++++++++++++++------------------------------------- 1 files changed, 103 insertions(+), 159 deletions(-) diff --git a/po/lt.po b/po/lt.po index ba5f7bd..00546cc 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 16:44+0200\n" +"PO-Revision-Date: 2011-08-08 17:19+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -6804,14 +6804,14 @@ msgstr "Generuoti slaiptažodį" #: libraries/rte/rte_routines.lib.php:1242 #: libraries/rte/rte_triggers.lib.php:75 libraries/rte/rte_triggers.lib.php:80 #: libraries/rte/rte_triggers.lib.php:103 -#, fuzzy, php-format +#, php-format #| msgid "The following queries have been executed:" msgid "The following query has failed: \"%s\"" -msgstr "Sekančios užklausos buvo įvykdytos:" +msgstr "Sekančios užklausos nepavyko: „%s“" #: libraries/rte/rte_events.lib.php:116 msgid "Sorry, we failed to restore the dropped event." -msgstr "" +msgstr "Atsiprašome, nepavyko atstatyti pašalinto įvykio." #: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269 #: libraries/rte/rte_triggers.lib.php:90 @@ -6819,49 +6819,45 @@ msgid "The backed up query was:" msgstr "" #: libraries/rte/rte_events.lib.php:121 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Event %1$s has been modified." -msgstr "Stulpelis %s panaikintas" +msgstr "Įvykis %1$s buvo pakeistas." #: libraries/rte/rte_events.lib.php:133 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Event %1$s has been created." -msgstr "Sukurta %1$s lentelė." +msgstr "Įvykis %1$s buvo sukurtas." #: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294 #: libraries/rte/rte_triggers.lib.php:114 msgid "One or more errors have occured while processing your request:" -msgstr "" +msgstr "Viena ar daugiau klaidų įvyko vykdant Jūsų užklausą:" #: libraries/rte/rte_events.lib.php:181 -#, fuzzy #| msgid "Create User" msgid "Create event" -msgstr "Sukurti naudotoją" +msgstr "Sukurti įvykį" #: libraries/rte/rte_events.lib.php:185 -#, fuzzy #| msgid "Edit server" msgid "Edit event" -msgstr "Redaguoti serverį" +msgstr "Redaguoti įvykį" #: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370 #: libraries/rte/rte_routines.lib.php:1264 #: libraries/rte/rte_routines.lib.php:1300 #: libraries/rte/rte_triggers.lib.php:187 -#, fuzzy #| msgid "Error in Processing Request" msgid "Error in processing request" msgstr "Klaida vykdant užklausą" #: libraries/rte/rte_events.lib.php:371 libraries/rte/rte_routines.lib.php:817 #: libraries/rte/rte_triggers.lib.php:298 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "Detalės..." +msgstr "Detalės" #: libraries/rte/rte_events.lib.php:374 #, fuzzy @@ -6874,24 +6870,23 @@ msgid "Event type" msgstr "Įvykio tipas" #: libraries/rte/rte_events.lib.php:416 libraries/rte/rte_routines.lib.php:838 -#, fuzzy, php-format +#, php-format #| msgid "Change" msgid "Change to %s" -msgstr "Redaguoti" +msgstr "Pakeisti į %s" #: libraries/rte/rte_events.lib.php:422 msgid "Execute at" -msgstr "" +msgstr "Vykdyti" #: libraries/rte/rte_events.lib.php:430 msgid "Execute every" -msgstr "" +msgstr "Vykdyti kas" #: libraries/rte/rte_events.lib.php:449 -#, fuzzy #| msgid "Startup" msgid "Start" -msgstr "Paleidimas" +msgstr "Paleisti" #: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912 #: libraries/rte/rte_triggers.lib.php:348 @@ -6901,10 +6896,9 @@ msgid "Definition" msgstr "Paaiškinimas" #: libraries/rte/rte_events.lib.php:471 -#, fuzzy #| msgid "complete inserts" msgid "On completion preserve" -msgstr "užbaigti įterpimus" +msgstr "Pabaigus išlaikyti" #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922 #: libraries/rte/rte_triggers.lib.php:354 @@ -6942,21 +6936,20 @@ msgstr "" #: libraries/rte/rte_footer.lib.php:91 msgid "OFF" -msgstr "" +msgstr "IŠJUNGTA" #: libraries/rte/rte_footer.lib.php:96 msgid "ON" -msgstr "" +msgstr "ĮJUNGTA" #: libraries/rte/rte_footer.lib.php:108 msgid "Event scheduler status" -msgstr "" +msgstr "Įvykių planuotojo būsena" #: libraries/rte/rte_list.lib.php:54 -#, fuzzy #| msgid "Return type" msgid "Returns" -msgstr "Gražinimo tipas" +msgstr "Grąžina" #: libraries/rte/rte_list.lib.php:62 libraries/rte/rte_triggers.lib.php:320 #: server_status.php:1074 sql.php:943 @@ -7017,59 +7010,53 @@ msgstr "Stulpelių vardai" #: libraries/rte/rte_routines.lib.php:843 msgid "Parameters" -msgstr "" +msgstr "Parametrai" #: libraries/rte/rte_routines.lib.php:848 -#, fuzzy #| msgid "Direct links" msgid "Direction" -msgstr "Tiesioginės nuorodos" +msgstr "Nukreipimas" #: libraries/rte/rte_routines.lib.php:851 libraries/tbl_properties.inc.php:108 msgid "Length/Values" msgstr "Ilgis/reikšmės*" #: libraries/rte/rte_routines.lib.php:866 -#, fuzzy #| msgid "Apply index(s)" msgid "Add parameter" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Pridėti parametrą" #: libraries/rte/rte_routines.lib.php:870 -#, fuzzy #| msgid "Remove database" msgid "Remove last parameter" -msgstr "Pašalinti duomenų bazę" +msgstr "Pašalinti paskutinį parametrą" #: libraries/rte/rte_routines.lib.php:875 msgid "Return type" msgstr "Gražinimo tipas" #: libraries/rte/rte_routines.lib.php:881 -#, fuzzy #| msgid "Length/Values" msgid "Return length/values" -msgstr "Ilgis/reikšmės*" +msgstr "Grąžinimo Ilgis/reikšmės" #: libraries/rte/rte_routines.lib.php:887 -#, fuzzy #| msgid "Table options" msgid "Return options" -msgstr "Lentelės parinktys" +msgstr "Grąžinimo parametrai" #: libraries/rte/rte_routines.lib.php:918 msgid "Is deterministic" -msgstr "" +msgstr "Yra apibrėžtas" #: libraries/rte/rte_routines.lib.php:927 -#, fuzzy #| msgid "Security" msgid "Security type" -msgstr "Saugumas" +msgstr "Saugumo tipas" #: libraries/rte/rte_routines.lib.php:934 msgid "SQL data access" -msgstr "" +msgstr "SQL duomenų priėjimas" #: libraries/rte/rte_routines.lib.php:999 msgid "You must provide a routine name" @@ -7108,10 +7095,10 @@ msgstr[1] "" msgstr[2] "" #: libraries/rte/rte_routines.lib.php:1214 -#, fuzzy, php-format +#, php-format #| msgid "Allows executing stored routines." msgid "Execution results of routine %s" -msgstr "Leisti įvykdyti saugomas programas (stored routines)." +msgstr "" #: libraries/rte/rte_routines.lib.php:1288 #: libraries/rte/rte_routines.lib.php:1294 @@ -7133,34 +7120,31 @@ msgid "Sorry, we failed to restore the dropped trigger." msgstr "" #: libraries/rte/rte_triggers.lib.php:94 -#, fuzzy, php-format +#, php-format #| msgid "Column %s has been dropped" msgid "Trigger %1$s has been modified." -msgstr "Stulpelis %s panaikintas" +msgstr "" #: libraries/rte/rte_triggers.lib.php:106 -#, fuzzy, php-format +#, php-format #| msgid "Table %1$s has been created." msgid "Trigger %1$s has been created." -msgstr "Sukurta %1$s lentelė." +msgstr "" #: libraries/rte/rte_triggers.lib.php:157 -#, fuzzy #| msgid "Create User" msgid "Create trigger" -msgstr "Sukurti naudotoją" +msgstr "" #: libraries/rte/rte_triggers.lib.php:161 -#, fuzzy #| msgid "Add a new server" msgid "Edit trigger" -msgstr "Pridėti naują serverį" +msgstr "" #: libraries/rte/rte_triggers.lib.php:301 -#, fuzzy #| msgid "User name" msgid "Trigger name" -msgstr "Naudotojo vardas" +msgstr "" #: libraries/rte/rte_triggers.lib.php:399 msgid "You must provide a trigger name" @@ -7175,122 +7159,109 @@ msgid "You must provide a valid event for the trigger" msgstr "" #: libraries/rte/rte_triggers.lib.php:415 -#, fuzzy #| msgid "Invalid table name" msgid "You must provide a valid table name" -msgstr "Neteisingas lentelės vardas" +msgstr "Jūs privalote pateikti teisingą lentelės vardą" #: libraries/rte/rte_triggers.lib.php:421 msgid "You must provide a trigger definition." msgstr "" #: libraries/rte/rte_words.lib.php:18 -#, fuzzy #| msgid "Apply index(s)" msgid "Add routine" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "" #: libraries/rte/rte_words.lib.php:20 -#, fuzzy, php-format +#, php-format #| msgid "Export defaults" msgid "Export of routine %s" -msgstr "Eksportuoti numatytąsias reikšmes" +msgstr "" #: libraries/rte/rte_words.lib.php:21 -#, fuzzy #| msgid "Apply index(s)" msgid "routine" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "" #: libraries/rte/rte_words.lib.php:22 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a routine" -msgstr "Neturite pakankamai teisių čia būti!" +msgstr "" #: libraries/rte/rte_words.lib.php:23 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No routine with name %1$s found in database %2$s" -msgstr "Duomenų bazėje nerasta jokių lentelių." +msgstr "" #: libraries/rte/rte_words.lib.php:24 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no routines to display." -msgstr "Nėra failų išsiuntimui" +msgstr "" #: libraries/rte/rte_words.lib.php:30 -#, fuzzy #| msgid "Add a new server" msgid "Add trigger" -msgstr "Pridėti naują serverį" +msgstr "" #: libraries/rte/rte_words.lib.php:32 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of trigger %s" -msgstr "Eksportuoti turinį" +msgstr "" #: libraries/rte/rte_words.lib.php:33 -#, fuzzy #| msgid "Add a new server" msgid "trigger" -msgstr "Pridėti naują serverį" +msgstr "" #: libraries/rte/rte_words.lib.php:34 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a trigger" -msgstr "Neturite pakankamai teisių čia būti!" +msgstr "" #: libraries/rte/rte_words.lib.php:35 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No trigger with name %1$s found in database %2$s" -msgstr "Duomenų bazėje nerasta jokių lentelių." +msgstr "" #: libraries/rte/rte_words.lib.php:36 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no triggers to display." -msgstr "Nėra failų išsiuntimui" +msgstr "" #: libraries/rte/rte_words.lib.php:42 -#, fuzzy #| msgid "Add a new server" msgid "Add event" -msgstr "Pridėti naują serverį" +msgstr "Pridėti įvykį" #: libraries/rte/rte_words.lib.php:44 -#, fuzzy, php-format +#, php-format #| msgid "Export contents" msgid "Export of event %s" -msgstr "Eksportuoti turinį" +msgstr "Įvykio %s eksportavimas" #: libraries/rte/rte_words.lib.php:45 -#, fuzzy #| msgid "Event" msgid "event" -msgstr "Įvykis" +msgstr "įvykis" #: libraries/rte/rte_words.lib.php:46 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create an event" -msgstr "Neturite pakankamai teisių čia būti!" +msgstr "Neturite pakankamai teisių sukurti įvykį" #: libraries/rte/rte_words.lib.php:47 -#, fuzzy, php-format +#, php-format #| msgid "No tables found in database" msgid "No event with name %1$s found in database %2$s" -msgstr "Duomenų bazėje nerasta jokių lentelių." +msgstr "Nėra įvykio su vardu %1$s duomenų bazėje %2$s" #: libraries/rte/rte_words.lib.php:48 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no events to display." -msgstr "Nėra failų išsiuntimui" +msgstr "Nėra įvykių rodymui." #: libraries/schema/Dia_Relation_Schema.class.php:221 #: libraries/schema/Eps_Relation_Schema.class.php:394 @@ -7319,10 +7290,9 @@ msgid "Schema of the %s database - Page %s" msgstr "Duomenų bazės %s schema - %s puslapis" #: libraries/schema/Export_Relation_Schema.class.php:170 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "This page does not contain any tables!" -msgstr "Failas %s neturi jokio raktinio id" +msgstr "Šis puslapis neturi jokių lentelių!" #: libraries/schema/Export_Relation_Schema.class.php:195 msgid "SCHEMA ERROR: " @@ -7355,10 +7325,9 @@ msgid "Create a page" msgstr "Sukurti naują puslapį" #: libraries/schema/User_Schema.class.php:95 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Puslapis:" +msgstr "Puslapio vardas" #: libraries/schema/User_Schema.class.php:99 msgid "Automatic layout based on" @@ -7516,10 +7485,9 @@ msgid "Clear" msgstr "Išvalyti" #: libraries/sql_query_form.lib.php:267 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Stulpelių vardai" +msgstr "Stulpeliai" #: libraries/sql_query_form.lib.php:302 sql.php:1016 sql.php:1033 msgid "Bookmark this SQL query" @@ -7635,7 +7603,7 @@ msgstr "Lentelė atrodo tuščia!" #: libraries/tbl_links.inc.php:127 #, php-format msgid "Tracking of %s.%s is activated." -msgstr "" +msgstr "Stebėjimas %s.%s yra aktyvuotas." #: libraries/tbl_properties.inc.php:108 msgid "" @@ -7699,7 +7667,6 @@ msgid "Get more editing space" msgstr "Padidinti redagavimo erdvę" #: libraries/tbl_properties.inc.php:367 -#, fuzzy #| msgid "None" msgctxt "for default" msgid "None" @@ -7746,10 +7713,9 @@ msgid "PARTITION definition" msgstr "SKAIDINIO (PARTITION) apibrėžimas" #: libraries/tbl_properties.inc.php:762 -#, fuzzy #| msgid "Add a new server" msgid "+ Add a value" -msgstr "Pridėti naują serverį" +msgstr "+ Pridėti reikšmę" #: libraries/transformations/application_octetstream__download.inc.php:10 #, fuzzy @@ -7802,7 +7768,6 @@ msgid "" msgstr "" #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -7826,17 +7791,16 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"LINUX VARTOTOJAMS: Paleidžiama išorinė aplikacija ir duomenys imami iš " -"standartinio įvedimo. Išvedama iš aplikacijos gauta informacija. Nutylint: " -"bus Tidy korektiškam HTML kodo išvedimui. Saugumo sumetimais Jūs turite " -"paredaguoti libraries/transformations/text_plain__external.inc.php failą ir " -"įvesti tas aplikacijas, kurias naudosite. Pirmas parametras yra leidžiamų " -"aplikacijų kiekis, kurias naudosite. Antras parametras yra specifiniai " -"aplikacijų raktai. Jeigu trečias parametras lygus 1, tai išvedama " -"informacija bus apdorota su htmlspecialchars() (nutylint: reikšmė lygi 1). " -"Jeigu ketvirtas parametras lygus 1, tai išvedimo lentelės celė turės " -"atributą NOWRAP, tam kad išvedama būtų atvaizduota be perkėlimų į kitas " -"eilutes (nutylint: reikšmė lygi 1)." +"TIK LINUX: Paleidžiama išorinė programa ir duomenys imami iš standartinio " +"įvedimo. Grąžinama iš programos standartinio išvedimo. Numatytasis yra Tidy " +"pretty-print HTML kodui. Dėl saugumo, Jūs turite rankomis paredaguoti " +"libraries/transformations/text_plain__external.inc.php failą ir išvardinti " +"tuos įrankius kuriuos norite padaryti prieinamus. Pirmas parametras yra " +"programos kurią norite naudoti skaičius. Antras parametras yra programos " +"parametrai. Jeigu trečias parametras lygus 1, tai išvedama informacija bus " +"apdorota su htmlspecialchars() (pagal numatymą reikšmė 1). Jeigu ketvirtas " +"parametras lygus 1, tai išvengs žodžių karpymo ir garantuos, kad visas " +"išvedimas bus vienoje eilutėje (pagal numatymą reikšmė 1)." #: libraries/transformations/text_plain__formatted.inc.php:10 #, fuzzy @@ -8205,34 +8169,29 @@ msgstr "Sąryšis ištrintas" #: pmd_general.php:470 pmd_general.php:529 pmd_general.php:652 #: pmd_general.php:769 -#, fuzzy #| msgid "Export" msgid "Except" -msgstr "Eksportuoti" +msgstr "Išskyrus" #: pmd_general.php:476 pmd_general.php:535 pmd_general.php:658 #: pmd_general.php:775 -#, fuzzy #| msgid "in query" msgid "subquery" -msgstr "užklausą vykdoma" +msgstr "" #: pmd_general.php:480 pmd_general.php:576 -#, fuzzy msgid "Rename to" -msgstr "Pervadinti lentelę į" +msgstr "Pervadinti į" #: pmd_general.php:482 pmd_general.php:581 -#, fuzzy #| msgid "User name" msgid "New name" -msgstr "Naudotojo vardas" +msgstr "Naujas vardas" #: pmd_general.php:485 pmd_general.php:700 -#, fuzzy #| msgid "Create" msgid "Aggregate" -msgstr "Sukurti" +msgstr "" #: pmd_general.php:487 pmd_general.php:507 pmd_general.php:629 #: pmd_general.php:642 pmd_general.php:705 pmd_general.php:759 @@ -8241,10 +8200,9 @@ msgid "Operator" msgstr "Operatorius" #: pmd_general.php:810 -#, fuzzy #| msgid "Table options" msgid "Active options" -msgstr "Lentelės parinktys" +msgstr "" #: pmd_help.php:22 msgid "To select relation, click :" @@ -8269,34 +8227,29 @@ msgid "Page creation failed" msgstr "Puslapio kūrimas nepavyko" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "puslapiai" +msgstr "Puslapis" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Importuoti iš failo" +msgstr "Importuoti iš pasirinkto puslapio" #: pmd_pdf.php:100 -#, fuzzy #| msgid "No rows selected" msgid "Export to selected page" -msgstr "Nepasirinkti įrašai" +msgstr "Eksportuoti pasirinktą puslapį" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Sukurti naują indeksą" +msgstr "Sukurti puslapį ir eksportuoti į jį" #: pmd_pdf.php:111 -#, fuzzy #| msgid "User name" msgid "New page name: " -msgstr "Naudotojo vardas" +msgstr "Naujas puslapio vardas:" #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -8335,20 +8288,18 @@ msgid "Modifications have been saved" msgstr "Pakeitimai išsaugoti" #: prefs_forms.php:78 -#, fuzzy #| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" -msgstr "Pateiktoje formoje yra klaidų" +msgstr "Nepavyko išsaugoti nustatymų, išsiųstoje formoje yra klaidų" #: prefs_manage.php:78 -#, fuzzy #| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" -msgstr "Nepavyko užkrauti numatytų nustatymų failo iš: %1$s" +msgstr "Nepavyko importuoti konfigūracijos" #: prefs_manage.php:110 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Konfigūracijoje yra neteisingų duomenų tam tikruose laukeliuose." #: prefs_manage.php:126 msgid "Do you want to import remaining settings?" @@ -8621,9 +8572,8 @@ msgstr "" # gal labiau kartu vykstančių #: server_privileges.php:54 server_privileges.php:721 #: server_privileges.php:723 -#, fuzzy msgid "Limits the number of simultaneous connections the user may have." -msgstr "Riboti prisijungimų kiekį per valandą (kartu vykstančių)." +msgstr "Riboti skaičių lygiagrečių prisijungimų kurį naudotojai gali turėti." #: server_privileges.php:55 server_privileges.php:225 #: server_privileges.php:645 @@ -8649,9 +8599,8 @@ msgstr "" #: server_privileges.php:59 server_privileges.php:261 #: server_privileges.php:654 -#, fuzzy msgid "Needed for the replication slaves." -msgstr "Reikalinga atstatyti slave darbinei stočiai" +msgstr "" #: server_privileges.php:60 server_privileges.php:193 #: server_privileges.php:538 server_privileges.php:604 @@ -8931,10 +8880,9 @@ msgid "wildcard" msgstr "pakaitos simbolis" #: server_privileges.php:2382 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Rodinys %s buvo panaikintas" +msgstr "Naudotojas buvo pridėtas." #: server_replication.php:49 msgid "Unknown error" @@ -8957,10 +8905,10 @@ msgid "Unable to change master" msgstr "Nepavyko pakeisti pagrindinio (master) serverio" #: server_replication.php:72 -#, fuzzy, php-format +#, php-format #| msgid "Master server changed succesfully to %s" msgid "Master server changed successfully to %s" -msgstr "Pagrindinis (master) serveris pakeistas sėkmingai į %s" +msgstr "Pagrindinis (master) serveris sėkmingai pakeistas į %s" #: server_replication.php:180 msgid "This server is configured as master in a replication process." @@ -9073,28 +9021,24 @@ msgid "Reset slave" msgstr "Paleisti iš naujo pavaldųjį serverį (reset slave)" #: server_replication.php:326 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Start SQL Thread only" -msgstr "Tik SQL gija %s" +msgstr "Pradėti tik SQL giją" #: server_replication.php:328 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Stop SQL Thread only" -msgstr "Tik SQL gija %s" +msgstr "Sustabdyti tik SQL giją" #: server_replication.php:331 -#, fuzzy #| msgid "IO Thread %s only" msgid "Start IO Thread only" -msgstr "Tik IO %s gija" +msgstr "Pradėti tik IO giją" #: server_replication.php:333 -#, fuzzy #| msgid "IO Thread %s only" msgid "Stop IO Thread only" -msgstr "Tik IO %s gija" +msgstr "Sustabdyti tik IO giją" #: server_replication.php:338 msgid "Error management:" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13540-gf5cdef3
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via f5cdef3db8fe356f5bedbd8a0372c436e653aff4 (commit) via aceefcb23e02daa5d4d4e357f0f6666661e7b879 (commit) from 2bfaa716bdb3e9e4cfa6d0a85a321328ffd7161f (commit) - Log ----------------------------------------------------------------- commit f5cdef3db8fe356f5bedbd8a0372c436e653aff4 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:17:34 2011 +0200 No need to mention requirements commit aceefcb23e02daa5d4d4e357f0f6666661e7b879 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:15:59 2011 +0200 Avoid three calls of same PMA_substr ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 1037ca3..9a6df66 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -313,10 +313,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { // MySQL style # // C style /* */ // ANSI style -- + $next_c = PMA_substr($sql, $count2 + 1, 1); if (($c == '#') - || (($count2 + 1 < $len) && ($c == '/') && (PMA_substr($sql, $count2 + 1, 1) == '*')) - || (($count2 + 2 == $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-')) - || (($count2 + 2 < $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-') && ((PMA_substr($sql, $count2 + 2, 1) <= ' ')))) { + || (($count2 + 1 < $len) && ($c == '/') && ($next_c == '*')) + || (($count2 + 2 == $len) && ($c == '-') && ($next_c == '-')) + || (($count2 + 2 < $len) && ($c == '-') && ($next_c == '-') && ((PMA_substr($sql, $count2 + 2, 1) <= ' ')))) { $count2++; $pos = 0; $type = 'bad'; @@ -506,7 +507,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { echo '</pre>'; */ - // Nijel: Fast skip is especially needed for huge BLOB data, requires PHP at least 4.3.0: + // Fast skip is especially needed for huge BLOB data if ($is_hex_digit) { $count2++; $pos = strspn($sql, '0123456789abcdefABCDEF', $count2); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13538-g2bfaa71
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 2bfaa716bdb3e9e4cfa6d0a85a321328ffd7161f (commit) via 3d29edba96358b6ac5f494332975bb092a2b10b3 (commit) via 3228a5b761c0a2d48b79175f6527142cc10b9f9e (commit) via 53f9d89fbd7c246d424d9d696a4781ef41a66064 (commit) from d2f97300d0b1115b83170be3cdaec1d0d057f7be (commit) - Log ----------------------------------------------------------------- commit 2bfaa716bdb3e9e4cfa6d0a85a321328ffd7161f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:12:19 2011 +0200 Remove global variables These are used only once anyway and storing in variables looks like it is configurable. commit 3d29edba96358b6ac5f494332975bb092a2b10b3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:10:31 2011 +0200 Remove no longer needed globals commit 3228a5b761c0a2d48b79175f6527142cc10b9f9e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:05:03 2011 +0200 Avoid using GLOBALS referenced functions This actually makes performance because it needs extra lookup in globals. commit 53f9d89fbd7c246d424d9d696a4781ef41a66064 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:59:31 2011 +0200 Wrap some long lines ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 89 ++++++++++++++++++++++++------------------- libraries/string.lib.php | 24 ++---------- 2 files changed, 54 insertions(+), 59 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index fba2719..1037ca3 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -206,7 +206,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ function PMA_SQP_parse($sql) { - static $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type; + static $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word; + static $PMA_SQPdata_column_type; static $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word; global $mysql_charsets, $mysql_collations_flat; @@ -221,11 +222,21 @@ if (! defined('PMA_MINIMUM_COMMON')) { // Create local hashtables if (!isset($PMA_SQPdata_column_attrib_cnt)) { - $PMA_SQPdata_column_attrib = array_flip($GLOBALS['PMA_SQPdata_column_attrib']); - $PMA_SQPdata_function_name = array_flip($GLOBALS['PMA_SQPdata_function_name']); - $PMA_SQPdata_reserved_word = array_flip($GLOBALS['PMA_SQPdata_reserved_word']); - $PMA_SQPdata_forbidden_word = array_flip($GLOBALS['PMA_SQPdata_forbidden_word']); - $PMA_SQPdata_column_type = array_flip($GLOBALS['PMA_SQPdata_column_type']); + $PMA_SQPdata_column_attrib = array_flip( + $GLOBALS['PMA_SQPdata_column_attrib'] + ); + $PMA_SQPdata_function_name = array_flip( + $GLOBALS['PMA_SQPdata_function_name'] + ); + $PMA_SQPdata_reserved_word = array_flip( + $GLOBALS['PMA_SQPdata_reserved_word'] + ); + $PMA_SQPdata_forbidden_word = array_flip( + $GLOBALS['PMA_SQPdata_forbidden_word'] + ); + $PMA_SQPdata_column_type = array_flip( + $GLOBALS['PMA_SQPdata_column_type'] + ); } $sql_array = array(); @@ -270,7 +281,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $this_was_quote = false; while ($count2 < $len) { - $c = $GLOBALS['PMA_substr']($sql, $count2, 1); + $c = PMA_substr($sql, $count2, 1); $count1 = $count2; $previous_was_space = $this_was_space; @@ -292,7 +303,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // Checks for white space - if ($GLOBALS['PMA_STR_isSpace']($c)) { + if (PMA_STR_isSpace($c)) { $this_was_space = true; $count2++; continue; @@ -303,9 +314,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { // C style /* */ // ANSI style -- if (($c == '#') - || (($count2 + 1 < $len) && ($c == '/') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '*')) - || (($count2 + 2 == $len) && ($c == '-') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '-')) - || (($count2 + 2 < $len) && ($c == '-') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '-') && (($GLOBALS['PMA_substr']($sql, $count2 + 2, 1) <= ' ')))) { + || (($count2 + 1 < $len) && ($c == '/') && (PMA_substr($sql, $count2 + 1, 1) == '*')) + || (($count2 + 2 == $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-')) + || (($count2 + 2 < $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-') && ((PMA_substr($sql, $count2 + 2, 1) <= ' ')))) { $count2++; $pos = 0; $type = 'bad'; @@ -314,24 +325,24 @@ if (! defined('PMA_MINIMUM_COMMON')) { $type = 'mysql'; case '-': $type = 'ansi'; - $pos = $GLOBALS['PMA_strpos']($sql, "\n", $count2); + $pos = PMA_strpos($sql, "\n", $count2); break; case '/': $type = 'c'; - $pos = $GLOBALS['PMA_strpos']($sql, '*/', $count2); + $pos = PMA_strpos($sql, '*/', $count2); $pos += 2; break; default: break; } // end switch $count2 = ($pos < $count2) ? $len : $pos; - $str = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); + $str = PMA_substr($sql, $count1, $count2 - $count1); PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize); continue; } // end if // Checks for something inside quotation marks - if ($GLOBALS['PMA_strpos']($quote_list, $c) !== false) { + if (PMA_strpos($quote_list, $c) !== false) { $startquotepos = $count2; $quotetype = $c; $count2++; @@ -341,7 +352,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $oldpos = 0; do { $oldpos = $pos; - $pos = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1; + $pos = PMA_strpos(' ' . $sql, $quotetype, $oldpos + 1) - 1; // ($pos === false) if ($pos < 0) { if ($c == '`') { @@ -355,7 +366,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * SELECT * FROM `table` */ - $pos_quote_separator = $GLOBALS['PMA_strpos'](' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1) - 1; + $pos_quote_separator = PMA_strpos(' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1) - 1; if ($pos_quote_separator < 0) { $len += 1; $sql .= '`'; @@ -363,7 +374,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $pos = $len; } else { $len += 1; - $sql = $GLOBALS['PMA_substr']($sql, 0, $pos_quote_separator) . '`' . $GLOBALS['PMA_substr']($sql, $pos_quote_separator); + $sql = PMA_substr($sql, 0, $pos_quote_separator) . '`' . PMA_substr($sql, $pos_quote_separator); $sql_array['raw'] = $sql; $pos = $pos_quote_separator; } @@ -389,7 +400,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos) && $c != '`') { $pos ++; continue; - } elseif (($pos + 1 < $len) && ($GLOBALS['PMA_substr']($sql, $pos, 1) == $quotetype) && ($GLOBALS['PMA_substr']($sql, $pos + 1, 1) == $quotetype)) { + } elseif (($pos + 1 < $len) && (PMA_substr($sql, $pos, 1) == $quotetype) && (PMA_substr($sql, $pos + 1, 1) == $quotetype)) { $pos = $pos + 2; continue; } else { @@ -416,27 +427,27 @@ if (! defined('PMA_MINIMUM_COMMON')) { default: break; } // end switch - $data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); + $data = PMA_substr($sql, $count1, $count2 - $count1); PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize); continue; } // Checks for brackets - if ($GLOBALS['PMA_strpos']($bracket_list, $c) !== false) { + if (PMA_strpos($bracket_list, $c) !== false) { // All bracket tokens are only one item long $this_was_bracket = true; $count2++; $type_type = ''; - if ($GLOBALS['PMA_strpos']('([{', $c) !== false) { + if (PMA_strpos('([{', $c) !== false) { $type_type = 'open'; } else { $type_type = 'close'; } $type_style = ''; - if ($GLOBALS['PMA_strpos']('()', $c) !== false) { + if (PMA_strpos('()', $c) !== false) { $type_style = 'round'; - } elseif ($GLOBALS['PMA_strpos']('[]', $c) !== false) { + } elseif (PMA_strpos('[]', $c) !== false) { $type_style = 'square'; } else { $type_style = 'curly'; @@ -463,7 +474,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (PMA_STR_isSqlIdentifier($c, false) || $c == '@' || ($c == '.' - && $GLOBALS['PMA_STR_isDigit']($GLOBALS['PMA_substr']($sql, $count2 + 1, 1)) + && PMA_STR_isDigit(PMA_substr($sql, $count2 + 1, 1)) && ($previous_was_space || $previous_was_bracket || $previous_was_listsep))) { /* DEBUG @@ -481,8 +492,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { $is_identifier = $previous_was_punct; $is_sql_variable = $c == '@' && ! $previous_was_quote; $is_user = $c == '@' && $previous_was_quote; - $is_digit = !$is_identifier && !$is_sql_variable && $GLOBALS['PMA_STR_isDigit']($c); - $is_hex_digit = $is_digit && $c == '0' && $count2 < $len && $GLOBALS['PMA_substr']($sql, $count2, 1) == 'x'; + $is_digit = !$is_identifier && !$is_sql_variable && PMA_STR_isDigit($c); + $is_hex_digit = $is_digit && $c == '0' && $count2 < $len && PMA_substr($sql, $count2, 1) == 'x'; $is_float_digit = $c == '.'; $is_float_digit_exponent = false; @@ -511,8 +522,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { unset($pos); } - while (($count2 < $len) && PMA_STR_isSqlIdentifier($GLOBALS['PMA_substr']($sql, $count2, 1), ($is_sql_variable || $is_digit))) { - $c2 = $GLOBALS['PMA_substr']($sql, $count2, 1); + while (($count2 < $len) && PMA_STR_isSqlIdentifier(PMA_substr($sql, $count2, 1), ($is_sql_variable || $is_digit))) { + $c2 = PMA_substr($sql, $count2, 1); if ($is_sql_variable && ($c2 == '.')) { $count2++; continue; @@ -540,7 +551,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $is_float_digit = false; } } - if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && $GLOBALS['PMA_STR_isDigit']($c2))) { + if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && PMA_STR_isDigit($c2))) { $count2++; continue; } else { @@ -552,7 +563,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // end while $l = $count2 - $count1; - $str = $GLOBALS['PMA_substr']($sql, $count1, $l); + $str = PMA_substr($sql, $count1, $l); $type = ''; if ($is_digit || $is_float_digit || $is_hex_digit) { @@ -577,15 +588,15 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // Checks for punct - if ($GLOBALS['PMA_strpos']($allpunct_list, $c) !== false) { - while (($count2 < $len) && $GLOBALS['PMA_strpos']($allpunct_list, $GLOBALS['PMA_substr']($sql, $count2, 1)) !== false) { + if (PMA_strpos($allpunct_list, $c) !== false) { + while (($count2 < $len) && PMA_strpos($allpunct_list, PMA_substr($sql, $count2, 1)) !== false) { $count2++; } $l = $count2 - $count1; if ($l == 1) { $punct_data = $c; } else { - $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $l); + $punct_data = PMA_substr($sql, $count1, $l); } // Special case, sometimes, althought two characters are @@ -627,12 +638,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (($first == ',') || ($first == ';') || ($first == '.') || ($first == '*')) { $count2 = $count1 + 1; $punct_data = $first; - } elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || $GLOBALS['PMA_substr']($sql, $count2, 1) <= ' '))) { + } elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || PMA_substr($sql, $count2, 1) <= ' '))) { $count2 -= 2; - $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); + $punct_data = PMA_substr($sql, $count1, $count2 - $count1); } elseif (($last == '-') || ($last == '+') || ($last == '!')) { $count2--; - $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); + $punct_data = PMA_substr($sql, $count1, $count2 - $count1); /** * @todo for negation operator, split in 2 tokens ? * "select x&~1 from t" @@ -655,7 +666,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $count2++; $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n" - . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1) . "\n"; + . 'STR: ' . PMA_substr($sql, $count1, $count2 - $count1) . "\n"; PMA_SQP_bug($debugstr, $sql); return $sql_array; @@ -2062,7 +2073,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ function PMA_SQP_formatHtml_colorize($arr) { - $i = $GLOBALS['PMA_strpos']($arr['type'], '_'); + $i = PMA_strpos($arr['type'], '_'); $class = ''; if ($i > 0) { $class = 'syntax_' . PMA_substr($arr['type'], 0, $i) . ' '; diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 0cfef41..0e9f974 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -19,38 +19,22 @@ if (! defined('PHPMYADMIN')) { exit; } -$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen'); -$GLOBALS['PMA_allow_ctype'] = @extension_loaded('ctype'); - -if ($GLOBALS['PMA_allow_mbstr']) { - mb_internal_encoding('utf-8'); -} - /** * Load proper code for handling input. */ -if ($GLOBALS['PMA_allow_mbstr']) { - $GLOBALS['PMA_strpos'] = 'mb_strpos'; - $GLOBALS['PMA_substr'] = 'mb_substr'; +if (@function_exists('mb_strlen')) { + mb_internal_encoding('utf-8'); require './libraries/string_mb.lib.php'; } else { - $GLOBALS['PMA_strpos'] = 'strpos'; - $GLOBALS['PMA_substr'] = 'substr'; require './libraries/string_native.lib.php'; } /** * Load ctype handler. */ -if ($GLOBALS['PMA_allow_ctype']) { - $GLOBALS['PMA_STR_isAlnum'] = 'ctype_alnum'; - $GLOBALS['PMA_STR_isDigit'] = 'ctype_digit'; - $GLOBALS['PMA_STR_isSpace'] = 'ctype_space'; +if (@extension_loaded('ctype')) { require './libraries/string_type_ctype.lib.php'; } else { - $GLOBALS['PMA_STR_isAlnum'] = 'PMA_STR_isAlnum'; - $GLOBALS['PMA_STR_isDigit'] = 'PMA_STR_isDigit'; - $GLOBALS['PMA_STR_isSpace'] = 'PMA_STR_isSpace'; require './libraries/string_type_native.lib.php'; } @@ -107,7 +91,7 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) */ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) { - return ($GLOBALS['PMA_STR_isAlnum']($c) + return (PMA_STR_isAlnum($c) || ($ord_c = ord($c)) && $ord_c >= 192 && $ord_c != 215 && $ord_c != 249 || $c == '_' || $c == '$' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13534-gd2f9730
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via d2f97300d0b1115b83170be3cdaec1d0d057f7be (commit) via 9b9e03ba7f04c46564a30820aae669664fc9fc68 (commit) via 99f58c2fcf37487e1399d477118e40141945dfa0 (commit) via 7b15b8968d9a959b64ab01f1b9dc8688c15dce0c (commit) via de66bc4994acd610aeea21986ff0a41574ee7f99 (commit) via 80dfcfef3f0f194fac0ef168f4135eb9c3e567ff (commit) via 8ba4ea0d223e9a5ff273c57553bea999c5b13b23 (commit) via 131ef6df30c11f6a646c514b8ab8c6cd094379c0 (commit) via 6df0022ef68b2be21dbb9eebad7549a37e4c7fba (commit) via 31448c0e4b7346d616a090f14cb4956904a9e860 (commit) via 5bd24c383cf56cbc8d47a9e5f63f1cb621ac10a8 (commit) via d8fa173bbe184cb0c0eb771d28261d4ef396edba (commit) via 0aaaa4a0f46597bd38ad8e1d25623bb6a6d588b3 (commit) via 0d4beef1bf4f488481f7aa21babfe1f21194cf5a (commit) via 595d2aaf7d74453d3c95dd8936e922a0a1d1789d (commit) via dbe67b7625a314f0f58263c400c48c055d9158d8 (commit) via 384f17c5b8f9f95bf17a2ba11a82f18b8c5d2a55 (commit) via cb7e421e8a4d809d22ad0a416f73212a67ce827b (commit) via 52bdd43439c7405e51d8f9518c1dad19620d2001 (commit) via 339789cdc79b14f2bfd520588bee21bb9c7efd9e (commit) via b3cbab85aa347db3d50381fcb8b6aea28380767a (commit) via 5653e6c698b68df400423c574c07b20a56575d8e (commit) via 1fe59123eaf99b6806b7112eaf96237951352164 (commit) via 23a7ad72a2299576e561b8757869deecbc624c60 (commit) via a3882cdd6e86c2c94719ad2d93890b6ea9cb1a3a (commit) from 79672532c4bbcf7cc24d522db9ba7a696a0fda5a (commit) - Log ----------------------------------------------------------------- commit d2f97300d0b1115b83170be3cdaec1d0d057f7be Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:44:04 2011 +0200 Translation update done using Pootle. commit 9b9e03ba7f04c46564a30820aae669664fc9fc68 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:43:55 2011 +0200 Translation update done using Pootle. commit 99f58c2fcf37487e1399d477118e40141945dfa0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:43:44 2011 +0200 Translation update done using Pootle. commit 7b15b8968d9a959b64ab01f1b9dc8688c15dce0c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:43:11 2011 +0200 Translation update done using Pootle. commit de66bc4994acd610aeea21986ff0a41574ee7f99 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:42:46 2011 +0200 Translation update done using Pootle. commit 80dfcfef3f0f194fac0ef168f4135eb9c3e567ff Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:42:32 2011 +0200 Translation update done using Pootle. commit 8ba4ea0d223e9a5ff273c57553bea999c5b13b23 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:41:50 2011 +0200 Translation update done using Pootle. commit 131ef6df30c11f6a646c514b8ab8c6cd094379c0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:41:41 2011 +0200 Translation update done using Pootle. commit 6df0022ef68b2be21dbb9eebad7549a37e4c7fba Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:41:07 2011 +0200 Translation update done using Pootle. commit 31448c0e4b7346d616a090f14cb4956904a9e860 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:40:21 2011 +0200 Translation update done using Pootle. commit 5bd24c383cf56cbc8d47a9e5f63f1cb621ac10a8 Merge: d8fa173bbe184cb0c0eb771d28261d4ef396edba 79672532c4bbcf7cc24d522db9ba7a696a0fda5a Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 16:40:16 2011 +0200 Merge remote-tracking branch 'origin/master' commit d8fa173bbe184cb0c0eb771d28261d4ef396edba Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:40:06 2011 +0200 Translation update done using Pootle. commit 0aaaa4a0f46597bd38ad8e1d25623bb6a6d588b3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:38:28 2011 +0200 Translation update done using Pootle. commit 0d4beef1bf4f488481f7aa21babfe1f21194cf5a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:37:08 2011 +0200 Translation update done using Pootle. commit 595d2aaf7d74453d3c95dd8936e922a0a1d1789d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:36:38 2011 +0200 Translation update done using Pootle. commit dbe67b7625a314f0f58263c400c48c055d9158d8 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:36:23 2011 +0200 Translation update done using Pootle. commit 384f17c5b8f9f95bf17a2ba11a82f18b8c5d2a55 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:35:52 2011 +0200 Translation update done using Pootle. commit cb7e421e8a4d809d22ad0a416f73212a67ce827b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:35:45 2011 +0200 Translation update done using Pootle. commit 52bdd43439c7405e51d8f9518c1dad19620d2001 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:34:50 2011 +0200 Translation update done using Pootle. commit 339789cdc79b14f2bfd520588bee21bb9c7efd9e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:34:13 2011 +0200 Translation update done using Pootle. commit b3cbab85aa347db3d50381fcb8b6aea28380767a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:33:39 2011 +0200 Translation update done using Pootle. commit 5653e6c698b68df400423c574c07b20a56575d8e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:32:56 2011 +0200 Translation update done using Pootle. commit 1fe59123eaf99b6806b7112eaf96237951352164 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:32:49 2011 +0200 Translation update done using Pootle. commit 23a7ad72a2299576e561b8757869deecbc624c60 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:32:38 2011 +0200 Translation update done using Pootle. commit a3882cdd6e86c2c94719ad2d93890b6ea9cb1a3a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:32:27 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 65 ++++++++++++++++++++++--------------------------------------- 1 files changed, 24 insertions(+), 41 deletions(-) diff --git a/po/lt.po b/po/lt.po index a7b9d10..ba5f7bd 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 16:32+0200\n" +"PO-Revision-Date: 2011-08-08 16:44+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -5340,10 +5340,9 @@ msgid "Language" msgstr "Kalba" #: libraries/display_tbl.lib.php:401 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Textarea laukeliai" +msgstr "Atstatyti stulpelių rikiavimą" #: libraries/display_tbl.lib.php:431 #, php-format @@ -5351,22 +5350,19 @@ msgid "%d is not valid row number." msgstr "%d nėra galimas eilutės numeris." #: libraries/display_tbl.lib.php:436 -#, fuzzy #| msgid "Startup" msgid "Start row" -msgstr "Paleidimas" +msgstr "Pradėti eilute" #: libraries/display_tbl.lib.php:438 -#, fuzzy #| msgid "Number of rows:" msgid "Number of rows" msgstr "Eilučių skaičius:" #: libraries/display_tbl.lib.php:443 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Daugiau" +msgstr "Režimas" #: libraries/display_tbl.lib.php:445 msgid "horizontal" @@ -5421,10 +5417,9 @@ msgid "Relational key" msgstr "Sąryšių raktas" #: libraries/display_tbl.lib.php:629 -#, fuzzy #| msgid "Relational schema" msgid "Relational display column" -msgstr "Ryšių schema" +msgstr "Ryšių rodymo stulpelis" #: libraries/display_tbl.lib.php:636 msgid "Show binary contents" @@ -5498,10 +5493,9 @@ msgid "Visualize GIS data" msgstr "" #: libraries/display_tbl.lib.php:2545 -#, fuzzy #| msgid "Create User" msgid "Create view" -msgstr "Sukurti naudotoją" +msgstr "Sukurti rodinį" #: libraries/display_tbl.lib.php:2647 msgid "Link not found" @@ -5524,9 +5518,8 @@ msgid "Data files" msgstr "Duomenų failai" #: libraries/engines/innodb.lib.php:27 -#, fuzzy msgid "Autoextend increment" -msgstr "Automatiškai prasiplečiantis prieaugis" +msgstr "Automatinis didėjimas" #: libraries/engines/innodb.lib.php:28 msgid "" @@ -5574,23 +5567,20 @@ msgid "Pages containing data" msgstr "Puslapiai su duomenimis" #: libraries/engines/innodb.lib.php:188 -#, fuzzy msgid "Pages to be flushed" -msgstr "Lentelės buferis %s išvalytas" +msgstr "" #: libraries/engines/innodb.lib.php:194 -#, fuzzy msgid "Busy pages" -msgstr "Tušti puslapiai" +msgstr "" #: libraries/engines/innodb.lib.php:203 msgid "Latched pages" msgstr "" #: libraries/engines/innodb.lib.php:214 -#, fuzzy msgid "Buffer Pool Activity" -msgstr "Buferio pool'o dydis" +msgstr "Buferio pool'o veikla" #: libraries/engines/innodb.lib.php:218 msgid "Read requests" @@ -5602,7 +5592,7 @@ msgstr "Įrašymo užklausos" #: libraries/engines/innodb.lib.php:230 msgid "Read misses" -msgstr "" +msgstr "Skaitymo nepataikymai" #: libraries/engines/innodb.lib.php:236 msgid "Write waits" @@ -5610,7 +5600,7 @@ msgstr "Rašymas laukia" #: libraries/engines/innodb.lib.php:242 msgid "Read misses in %" -msgstr "" +msgstr "Skaitymo nepataikymai %" #: libraries/engines/innodb.lib.php:250 msgid "Write waits in %" @@ -5765,10 +5755,9 @@ msgid "" msgstr "" #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 -#, fuzzy #| msgid "Relations" msgid "Related Links" -msgstr "Sąryšiai" +msgstr "Susijusios nuorodos" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" @@ -6192,15 +6181,13 @@ msgid "Structure for view" msgstr "Struktūra peržiūrėjimui" #: libraries/export/sql.php:1012 -#, fuzzy msgid "Stand-in structure for view" -msgstr "Tik struktūra" +msgstr "Tik struktūra rodiniui" #: libraries/export/sql.php:1071 -#, fuzzy #| msgid "Allows reading data." msgid "Error reading data:" -msgstr "Leisti skaityti duomenis." +msgstr "Klaida skaitant duomenis:" #: libraries/export/xml.php:19 libraries/import/xml.php:21 msgid "XML" @@ -6224,10 +6211,9 @@ msgid "Open new phpMyAdmin window" msgstr "Atverti naują phpMyAdmin langą" #: libraries/gis_visualization.lib.php:129 -#, fuzzy #| msgid "No data found for the chart." msgid "No data found for GIS visualization." -msgstr "Nerasta duomenų diagramos braižymui." +msgstr "Nerasta duomenų GIS vizualizavimui." #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54 msgid "SQL result" @@ -6270,20 +6256,20 @@ msgid "Go to database" msgstr "Eiti į duomenų bazę" #: libraries/import.lib.php:1085 libraries/import.lib.php:1109 -#, fuzzy, php-format +#, php-format #| msgid "Missing data for %s" msgid "Edit settings for %s" -msgstr "Trūksta duomenų %s" +msgstr "Keisti nustatymus %s" #: libraries/import.lib.php:1104 msgid "Go to table" msgstr "Eiti į lentelę" #: libraries/import.lib.php:1107 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" -msgstr "Tik struktūra" +msgstr "Struktūra %s" #: libraries/import.lib.php:1113 msgid "Go to view" @@ -6378,7 +6364,6 @@ msgstr "" "klaidas ir bandyti dar kartą." #: libraries/kanji-encoding.lib.php:147 -#, fuzzy #| msgid "None" msgctxt "None encoding conversion" msgid "None" @@ -6390,14 +6375,13 @@ msgid "Convert to Kana" msgstr "Konvertuoti į Kana" #: libraries/mult_submits.inc.php:254 -#, fuzzy #| msgid "Fr" msgid "From" -msgstr "Pn" +msgstr "Iš" #: libraries/mult_submits.inc.php:257 msgid "To" -msgstr "" +msgstr "Kam" #: libraries/mult_submits.inc.php:262 libraries/mult_submits.inc.php:276 #: libraries/sql_query_form.lib.php:398 @@ -6406,13 +6390,12 @@ msgstr "Siųsti" #: libraries/mult_submits.inc.php:268 msgid "Add table prefix" -msgstr "" +msgstr "Pridėti lentelės priešdėlį" #: libraries/mult_submits.inc.php:271 -#, fuzzy #| msgid "Apply index(s)" msgid "Add prefix" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Pridėti priešdėlį" #: libraries/mult_submits.inc.php:488 tbl_replace.php:313 msgid "No change" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13509-g7967253
by Marc Delisle 08 Aug '11

08 Aug '11

The branch, master has been updated via 79672532c4bbcf7cc24d522db9ba7a696a0fda5a (commit) from db2da891ed7d0a4f376ebc759c97b4e4f3369e2d (commit) - Log ----------------------------------------------------------------- commit 79672532c4bbcf7cc24d522db9ba7a696a0fda5a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 8 10:39:40 2011 -0400 bug #3380946 [export] no uid Query result export (Suhosin limit) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 128f603..d43f23f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog + [interface] Improved server monitoring + AJAX for table Structure column Add + AJAX for table Operations copy table +- bug #3380946 [export] no uid Query result export (Suhosin limit) 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13508-gdb2da89
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via db2da891ed7d0a4f376ebc759c97b4e4f3369e2d (commit) via ef33a6a92e2b3cb700f8fcc2be1fbca2a461fe65 (commit) via 941fecd4e4cca580af313e30067fc13a014a8a26 (commit) via f7a5d73b4f1eda5f83e5329b1853713ae9f2a28c (commit) via 4825cdbd98f24ad3d5b12976f83b1b0d8f017360 (commit) via 6450af88781f32adccd57d586e5eaac44d707b7a (commit) via 34bf85571a30dbdd46a3e32d392e7481391348ac (commit) via 0f0dad2bde9f6bcaf0f2a28f6532e5483b031300 (commit) via 1cd080ca844f23bb35967aaed4886c2b4a3faea8 (commit) via 61b947bf1f1effb4fa5b9323e1f1b5c05d5f96fe (commit) via 32c0966d523a499c0f24c3084d1709628f53e29d (commit) via c9e5eed66b49f7128082f95da2ed29c09e8dc4ed (commit) from 4a2cedf720259b4f4f26de86c2d6adc9723e6815 (commit) - Log ----------------------------------------------------------------- commit db2da891ed7d0a4f376ebc759c97b4e4f3369e2d Merge: 4a2cedf720259b4f4f26de86c2d6adc9723e6815 ef33a6a92e2b3cb700f8fcc2be1fbca2a461fe65 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:32:19 2011 +0200 Merge remote-tracking branch 'pootle/master' commit ef33a6a92e2b3cb700f8fcc2be1fbca2a461fe65 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:32:04 2011 +0200 Translation update done using Pootle. commit 941fecd4e4cca580af313e30067fc13a014a8a26 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:31:26 2011 +0200 Translation update done using Pootle. commit f7a5d73b4f1eda5f83e5329b1853713ae9f2a28c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:30:42 2011 +0200 Translation update done using Pootle. commit 4825cdbd98f24ad3d5b12976f83b1b0d8f017360 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:28:28 2011 +0200 Translation update done using Pootle. commit 6450af88781f32adccd57d586e5eaac44d707b7a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:28:21 2011 +0200 Translation update done using Pootle. commit 34bf85571a30dbdd46a3e32d392e7481391348ac Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:27:03 2011 +0200 Translation update done using Pootle. commit 0f0dad2bde9f6bcaf0f2a28f6532e5483b031300 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:26:38 2011 +0200 Translation update done using Pootle. commit 1cd080ca844f23bb35967aaed4886c2b4a3faea8 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:26:29 2011 +0200 Translation update done using Pootle. commit 61b947bf1f1effb4fa5b9323e1f1b5c05d5f96fe Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:26:08 2011 +0200 Translation update done using Pootle. commit 32c0966d523a499c0f24c3084d1709628f53e29d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:25:46 2011 +0200 Translation update done using Pootle. commit c9e5eed66b49f7128082f95da2ed29c09e8dc4ed Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:25:41 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index 900cab1..a7b9d10 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 16:23+0200\n" +"PO-Revision-Date: 2011-08-08 16:32+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:276 @@ -4192,7 +4192,7 @@ msgstr "" #: libraries/config/messages.inc.php:374 msgid "Column information table" -msgstr "" +msgstr "Stulpelio informacinė lentelė" #: libraries/config/messages.inc.php:375 msgid "Compress connection to MySQL server" @@ -4245,7 +4245,7 @@ msgstr "" #: libraries/config/messages.inc.php:385 msgid "Designer table" -msgstr "" +msgstr "Suprojektuoti lentelę" #: libraries/config/messages.inc.php:386 msgid "" @@ -4383,10 +4383,9 @@ msgstr "" "pma_designer_coords[/kbd]" #: libraries/config/messages.inc.php:410 -#, fuzzy #| msgid "Analyze table" msgid "Recently used table" -msgstr "Analizuoti lentelę" +msgstr "Paskiausiai naudota lentelė" #: libraries/config/messages.inc.php:411 msgid "" @@ -4471,10 +4470,9 @@ msgstr "" "pma_pdf_pages[/kbd]" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "User preferences" msgid "UI preferences table" -msgstr "Naudotojo nuostatos" +msgstr "Naudotojo sąsajos nustatymų lentelė" #: libraries/config/messages.inc.php:428 msgid "" @@ -4758,7 +4756,7 @@ msgstr "" #: libraries/config/messages.inc.php:489 msgid "Textarea columns" -msgstr "Textarea laukeliai" +msgstr "Textarea stulpeliai" #: libraries/config/messages.inc.php:490 msgid "" @@ -4768,7 +4766,7 @@ msgstr "" #: libraries/config/messages.inc.php:491 msgid "Textarea rows" -msgstr "" +msgstr "Textarea eilutės" #: libraries/config/messages.inc.php:492 msgid "Title of browser window when a database is selected" @@ -4800,7 +4798,7 @@ msgstr "" #: libraries/config/messages.inc.php:501 msgid "List of trusted proxies for IP allow/deny" -msgstr "" +msgstr "Sąrašas patikimų proxy serverių IP leidimui/atmetimui" #: libraries/config/messages.inc.php:502 msgid "Directory on server where you can upload files for import" @@ -4884,7 +4882,7 @@ msgstr "HTTP autentifikacija" #: libraries/config/setup.forms.php:51 msgid "Signon authentication" -msgstr "" +msgstr "Prisijungimo tapatybės nustatymas" #: libraries/config/setup.forms.php:245 #: libraries/config/user_preferences.forms.php:147 libraries/import/ldi.php:35 @@ -5074,10 +5072,9 @@ msgstr "Suderinamas su MySQL 4.0" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Sukurti naują duomenų bazę" +msgstr "Sukurti duombazę" #: libraries/display_create_database.lib.php:33 msgid "Create" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13496-g4a2cedf
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 4a2cedf720259b4f4f26de86c2d6adc9723e6815 (commit) from 197abc88a82e43f3ad2674d93fdbcf7f017874dc (commit) - Log ----------------------------------------------------------------- commit 4a2cedf720259b4f4f26de86c2d6adc9723e6815 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:26:50 2011 +0200 Adjust switch blocks to PEAR coding standards ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 902 +++++++++++++++++++++--------------------- 1 files changed, 451 insertions(+), 451 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index b7b0455..fba2719 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -310,19 +310,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { $pos = 0; $type = 'bad'; switch ($c) { - case '#': - $type = 'mysql'; - case '-': - $type = 'ansi'; - $pos = $GLOBALS['PMA_strpos']($sql, "\n", $count2); - break; - case '/': - $type = 'c'; - $pos = $GLOBALS['PMA_strpos']($sql, '*/', $count2); - $pos += 2; - break; - default: - break; + case '#': + $type = 'mysql'; + case '-': + $type = 'ansi'; + $pos = $GLOBALS['PMA_strpos']($sql, "\n", $count2); + break; + case '/': + $type = 'c'; + $pos = $GLOBALS['PMA_strpos']($sql, '*/', $count2); + $pos += 2; + break; + default: + break; } // end switch $count2 = ($pos < $count2) ? $len : $pos; $str = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); @@ -401,20 +401,20 @@ if (! defined('PMA_MINIMUM_COMMON')) { $count2++; $type = 'quote_'; switch ($quotetype) { - case '\'': - $type .= 'single'; - $this_was_quote = true; - break; - case '"': - $type .= 'double'; - $this_was_quote = true; - break; - case '`': - $type .= 'backtick'; - $this_was_quote = true; - break; - default: - break; + case '\'': + $type .= 'single'; + $this_was_quote = true; + break; + case '"': + $type .= 'double'; + $this_was_quote = true; + break; + case '`': + $type .= 'backtick'; + $this_was_quote = true; + break; + default: + break; } // end switch $data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1); PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize); @@ -600,19 +600,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ($l == 1) { $t_suffix = ''; switch ($punct_data) { - case $punct_queryend: - $t_suffix = '_queryend'; - break; - case $punct_qualifier: - $t_suffix = '_qualifier'; - $this_was_punct = true; - break; - case $punct_listsep: - $this_was_listsep = true; - $t_suffix = '_listsep'; - break; - default: - break; + case $punct_queryend: + $t_suffix = '_queryend'; + break; + case $punct_qualifier: + $t_suffix = '_qualifier'; + $this_was_punct = true; + break; + case $punct_listsep: + $this_was_listsep = true; + $t_suffix = '_listsep'; + break; + default: + break; } PMA_SQP_arrayAdd($sql_array, 'punct' . $t_suffix, $punct_data, $arraysize); } elseif ($punct_data == $GLOBALS['sql_delimiter'] || isset($allpunct_list_pair[$punct_data])) { @@ -1165,23 +1165,23 @@ if (! defined('PMA_MINIMUM_COMMON')) { && $arr[$i]['forbidden'] == false)) { switch ($arr[$i]['type']) { - case 'alpha_identifier': - case 'alpha_reservedWord': - /** - * this is not a real reservedWord, because it's not - * present in the list of forbidden words, for example - * "storage" which can be used as an identifier - * - * @todo avoid the pretty printing in color in this case - */ - $identifier = $arr[$i]['data']; - break; + case 'alpha_identifier': + case 'alpha_reservedWord': + /** + * this is not a real reservedWord, because it's not + * present in the list of forbidden words, for example + * "storage" which can be used as an identifier + * + * @todo avoid the pretty printing in color in this case + */ + $identifier = $arr[$i]['data']; + break; - case 'quote_backtick': - case 'quote_double': - case 'quote_single': - $identifier = PMA_unQuote($arr[$i]['data']); - break; + case 'quote_backtick': + case 'quote_double': + case 'quote_single': + $identifier = PMA_unQuote($arr[$i]['data']); + break; } // end switch if ($subresult['querytype'] == 'SELECT' @@ -2101,21 +2101,21 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // else do it properly switch ($mode) { - case 'color': - $str = ''; - $html_line_break = ' '; - $docu = true; - break; - case 'query_only': - $str = ''; - $html_line_break = "\n"; - $docu = false; - break; - case 'text': - $str = ''; - $html_line_break = ' '; - $docu = true; - break; + case 'color': + $str = ''; + $html_line_break = ' '; + $docu = true; + break; + case 'query_only': + $str = ''; + $html_line_break = "\n"; + $docu = false; + break; + case 'text': + $str = ''; + $html_line_break = ' '; + $docu = true; + break; } // end switch // inner_sql is a span that exists for all cases, except query_only // of $cfg['SQP']['fmtType'] to make possible a replacement @@ -2209,424 +2209,424 @@ if (! defined('PMA_MINIMUM_COMMON')) { } switch ($typearr[2]) { - case 'alpha_bitfield_constant_introducer': - $before = ' '; + case 'alpha_bitfield_constant_introducer': + $before = ' '; + $after = ''; + break; + case 'white_newline': + $before = ''; + break; + case 'punct_bracket_open_round': + $bracketlevel++; + $infunction = false; + // Make sure this array is sorted! + if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') + || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float') + || (($typearr[0] == 'alpha_reservedWord') + && isset($keywords_with_brackets_2before[strtoupper($arr[$i - 2]['data'])])) + || (($typearr[1] == 'alpha_reservedWord') + && isset($keywords_with_brackets_1before[strtoupper($arr[$i - 1]['data'])])) + ) { + $functionlevel++; + $infunction = true; + $after .= ' '; + } else { + $indent++; + $after .= ($mode != 'query_only' ? '<div class="syntax_indent' . $indent . '">' : ' '); + } + break; + case 'alpha_identifier': + if (($typearr[1] == 'punct_qualifier') || ($typearr[3] == 'punct_qualifier')) { $after = ''; - break; - case 'white_newline': $before = ''; - break; - case 'punct_bracket_open_round': - $bracketlevel++; - $infunction = false; - // Make sure this array is sorted! - if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') - || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float') - || (($typearr[0] == 'alpha_reservedWord') - && isset($keywords_with_brackets_2before[strtoupper($arr[$i - 2]['data'])])) - || (($typearr[1] == 'alpha_reservedWord') - && isset($keywords_with_brackets_1before[strtoupper($arr[$i - 1]['data'])])) - ) { - $functionlevel++; - $infunction = true; - $after .= ' '; - } else { - $indent++; - $after .= ($mode != 'query_only' ? '<div class="syntax_indent' . $indent . '">' : ' '); - } - break; - case 'alpha_identifier': - if (($typearr[1] == 'punct_qualifier') || ($typearr[3] == 'punct_qualifier')) { - $after = ''; - $before = ''; - } - // for example SELECT 1 somealias - if ($typearr[1] == 'digit_integer') { - $before = ' '; - } - if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) { - $after .= ' '; - } - break; - case 'punct_user': - case 'punct_qualifier': - $before = ''; - $after = ''; - break; - case 'punct_listsep': - if ($infunction == true) { - $after .= $space_punct_listsep_function_name; - } else { - $after .= $space_punct_listsep; - } - break; - case 'punct_queryend': - if (($typearr[3] != 'comment_mysql') && ($typearr[3] != 'comment_ansi') && $typearr[3] != 'comment_c') { - $after .= $html_line_break; - $after .= $html_line_break; - } - $space_punct_listsep = ' '; - $space_punct_listsep_function_name = ' '; - $space_alpha_reserved_word = ' '; - $in_priv_list = false; - break; - case 'comment_mysql': - case 'comment_ansi': - $after .= $html_line_break; - break; - case 'punct': - $before .= ' '; - if ($docu && isset($PMA_SQPdata_operators_docs[$arr[$i]['data']]) && - ($arr[$i]['data'] != '*' || in_array($arr[$i]['type'], array('digit_integer','digit_float','digit_hex')))) { - $before .= PMA_showMySQLDocu( - 'functions', - $PMA_SQPdata_operators_docs[$arr[$i]['data']]['link'], - false, - $PMA_SQPdata_operators_docs[$arr[$i]['data']]['anchor'], - true); - $after .= '</a>'; - } + } + // for example SELECT 1 somealias + if ($typearr[1] == 'digit_integer') { + $before = ' '; + } + if (($typearr[3] == 'alpha_columnType') || ($typearr[3] == 'alpha_identifier')) { + $after .= ' '; + } + break; + case 'punct_user': + case 'punct_qualifier': + $before = ''; + $after = ''; + break; + case 'punct_listsep': + if ($infunction == true) { + $after .= $space_punct_listsep_function_name; + } else { + $after .= $space_punct_listsep; + } + break; + case 'punct_queryend': + if (($typearr[3] != 'comment_mysql') && ($typearr[3] != 'comment_ansi') && $typearr[3] != 'comment_c') { + $after .= $html_line_break; + $after .= $html_line_break; + } + $space_punct_listsep = ' '; + $space_punct_listsep_function_name = ' '; + $space_alpha_reserved_word = ' '; + $in_priv_list = false; + break; + case 'comment_mysql': + case 'comment_ansi': + $after .= $html_line_break; + break; + case 'punct': + $before .= ' '; + if ($docu && isset($PMA_SQPdata_operators_docs[$arr[$i]['data']]) && + ($arr[$i]['data'] != '*' || in_array($arr[$i]['type'], array('digit_integer','digit_float','digit_hex')))) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['link'], + false, + $PMA_SQPdata_operators_docs[$arr[$i]['data']]['anchor'], + true); + $after .= '</a>'; + } - // workaround for - // select * from mytable limit 0,-1 - // (a side effect of this workaround is that - // select 20 - 9 - // becomes - // select 20 -9 - // ) - if ($typearr[3] != 'digit_integer') { - $after .= ' '; - } - break; - case 'punct_bracket_close_round': - // only close bracket level when it was opened before - if ($bracketlevel > 0) { - $bracketlevel--; - if ($infunction == true) { - $functionlevel--; - $after .= ' '; - $before .= ' '; - } else { - $indent--; - $before .= ($mode != 'query_only' ? '</div>' : ' '); - } - $infunction = ($functionlevel > 0) ? true : false; - } - break; - case 'alpha_columnType': - if ($docu) { - switch ($arr[$i]['data']) { - case 'tinyint': - case 'smallint': - case 'mediumint': - case 'int': - case 'bigint': - case 'decimal': - case 'float': - case 'double': - case 'real': - case 'bit': - case 'boolean': - case 'serial': - $before .= PMA_showMySQLDocu('data-types', 'numeric-types', false, '', true); - $after = '</a>' . $after; - break; - case 'date': - case 'datetime': - case 'timestamp': - case 'time': - case 'year': - $before .= PMA_showMySQLDocu('data-types', 'date-and-time-types', false, '', true); - $after = '</a>' . $after; - break; - case 'char': - case 'varchar': - case 'tinytext': - case 'text': - case 'mediumtext': - case 'longtext': - case 'binary': - case 'varbinary': - case 'tinyblob': - case 'mediumblob': - case 'blob': - case 'longblob': - case 'enum': - case 'set': - $before .= PMA_showMySQLDocu('data-types', 'string-types', false, '', true); - $after = '</a>' . $after; - break; - } - } - if ($typearr[3] == 'alpha_columnAttrib') { + // workaround for + // select * from mytable limit 0,-1 + // (a side effect of this workaround is that + // select 20 - 9 + // becomes + // select 20 -9 + // ) + if ($typearr[3] != 'digit_integer') { + $after .= ' '; + } + break; + case 'punct_bracket_close_round': + // only close bracket level when it was opened before + if ($bracketlevel > 0) { + $bracketlevel--; + if ($infunction == true) { + $functionlevel--; $after .= ' '; - } - if ($typearr[1] == 'alpha_columnType') { $before .= ' '; + } else { + $indent--; + $before .= ($mode != 'query_only' ? '</div>' : ' '); } - break; - case 'alpha_columnAttrib': - - // ALTER TABLE tbl_name AUTO_INCREMENT = 1 - // COLLATE LATIN1_GENERAL_CI DEFAULT - if ($typearr[1] == 'alpha_identifier' || $typearr[1] == 'alpha_charset') { - $before .= ' '; - } - if (($typearr[3] == 'alpha_columnAttrib') || ($typearr[3] == 'quote_single') || ($typearr[3] == 'digit_integer')) { - $after .= ' '; + $infunction = ($functionlevel > 0) ? true : false; + } + break; + case 'alpha_columnType': + if ($docu) { + switch ($arr[$i]['data']) { + case 'tinyint': + case 'smallint': + case 'mediumint': + case 'int': + case 'bigint': + case 'decimal': + case 'float': + case 'double': + case 'real': + case 'bit': + case 'boolean': + case 'serial': + $before .= PMA_showMySQLDocu('data-types', 'numeric-types', false, '', true); + $after = '</a>' . $after; + break; + case 'date': + case 'datetime': + case 'timestamp': + case 'time': + case 'year': + $before .= PMA_showMySQLDocu('data-types', 'date-and-time-types', false, '', true); + $after = '</a>' . $after; + break; + case 'char': + case 'varchar': + case 'tinytext': + case 'text': + case 'mediumtext': + case 'longtext': + case 'binary': + case 'varbinary': + case 'tinyblob': + case 'mediumblob': + case 'blob': + case 'longblob': + case 'enum': + case 'set': + $before .= PMA_showMySQLDocu('data-types', 'string-types', false, '', true); + $after = '</a>' . $after; + break; } - // workaround for - // AUTO_INCREMENT = 31DEFAULT_CHARSET = utf-8 + } + if ($typearr[3] == 'alpha_columnAttrib') { + $after .= ' '; + } + if ($typearr[1] == 'alpha_columnType') { + $before .= ' '; + } + break; + case 'alpha_columnAttrib': - if ($typearr[2] == 'alpha_columnAttrib' && $typearr[3] == 'alpha_reservedWord') { - $before .= ' '; - } - // workaround for - // select * from mysql.user where binary user="root" - // binary is marked as alpha_columnAttrib - // but should be marked as a reserved word - if (strtoupper($arr[$i]['data']) == 'BINARY' - && $typearr[3] == 'alpha_identifier') { - $after .= ' '; - } - break; - case 'alpha_functionName': - $funcname = strtoupper($arr[$i]['data']); - if ($docu && isset($PMA_SQPdata_functions_docs[$funcname])) { - $before .= PMA_showMySQLDocu( - 'functions', - $PMA_SQPdata_functions_docs[$funcname]['link'], - false, - $PMA_SQPdata_functions_docs[$funcname]['anchor'], - true); - $after .= '</a>'; - } - break; - case 'alpha_reservedWord': - // do not uppercase the reserved word if we are calling - // this function in query_only mode, because we need - // the original query (otherwise we get problems with - // semi-reserved words like "storage" which is legal - // as an identifier name) - - if ($mode != 'query_only') { - $arr[$i]['data'] = strtoupper($arr[$i]['data']); - } + // ALTER TABLE tbl_name AUTO_INCREMENT = 1 + // COLLATE LATIN1_GENERAL_CI DEFAULT + if ($typearr[1] == 'alpha_identifier' || $typearr[1] == 'alpha_charset') { + $before .= ' '; + } + if (($typearr[3] == 'alpha_columnAttrib') || ($typearr[3] == 'quote_single') || ($typearr[3] == 'digit_integer')) { + $after .= ' '; + } + // workaround for + // AUTO_INCREMENT = 31DEFAULT_CHARSET = utf-8 - if ((($typearr[1] != 'alpha_reservedWord') - || (($typearr[1] == 'alpha_reservedWord') - && isset($keywords_no_newline[strtoupper($arr[$i - 1]['data'])]))) - && ($typearr[1] != 'punct_level_plus') - && (!isset($keywords_no_newline[$arr[$i]['data']]))) { - // do not put a space before the first token, because - // we use a lot of pattern matching checking for the - // first reserved word at beginning of query - // so do not put a newline before + if ($typearr[2] == 'alpha_columnAttrib' && $typearr[3] == 'alpha_reservedWord') { + $before .= ' '; + } + // workaround for + // select * from mysql.user where binary user="root" + // binary is marked as alpha_columnAttrib + // but should be marked as a reserved word + if (strtoupper($arr[$i]['data']) == 'BINARY' + && $typearr[3] == 'alpha_identifier') { + $after .= ' '; + } + break; + case 'alpha_functionName': + $funcname = strtoupper($arr[$i]['data']); + if ($docu && isset($PMA_SQPdata_functions_docs[$funcname])) { + $before .= PMA_showMySQLDocu( + 'functions', + $PMA_SQPdata_functions_docs[$funcname]['link'], + false, + $PMA_SQPdata_functions_docs[$funcname]['anchor'], + true); + $after .= '</a>'; + } + break; + case 'alpha_reservedWord': + // do not uppercase the reserved word if we are calling + // this function in query_only mode, because we need + // the original query (otherwise we get problems with + // semi-reserved words like "storage" which is legal + // as an identifier name) + + if ($mode != 'query_only') { + $arr[$i]['data'] = strtoupper($arr[$i]['data']); + } + + if ((($typearr[1] != 'alpha_reservedWord') + || (($typearr[1] == 'alpha_reservedWord') + && isset($keywords_no_newline[strtoupper($arr[$i - 1]['data'])]))) + && ($typearr[1] != 'punct_level_plus') + && (!isset($keywords_no_newline[$arr[$i]['data']]))) { + // do not put a space before the first token, because + // we use a lot of pattern matching checking for the + // first reserved word at beginning of query + // so do not put a newline before + // + // also we must not be inside a privilege list + if ($i > 0) { + // the alpha_identifier exception is there to + // catch cases like + // GRANT SELECT ON mydb.mytable TO myuser@localhost + // (else, we get mydb.mytableTO) // - // also we must not be inside a privilege list - if ($i > 0) { - // the alpha_identifier exception is there to - // catch cases like - // GRANT SELECT ON mydb.mytable TO myuser@localhost - // (else, we get mydb.mytableTO) - // - // the quote_single exception is there to - // catch cases like - // GRANT ... TO 'marc'@'domain.com' IDENTIFIED... - /** - * @todo fix all cases and find why this happens - */ + // the quote_single exception is there to + // catch cases like + // GRANT ... TO 'marc'@'domain.com' IDENTIFIED... + /** + * @todo fix all cases and find why this happens + */ - if (!$in_priv_list || $typearr[1] == 'alpha_identifier' || $typearr[1] == 'quote_single' || $typearr[1] == 'white_newline') { - $before .= $space_alpha_reserved_word; - } - } else { - // on first keyword, check if it introduces a - // privilege list - if (isset($keywords_priv_list[$arr[$i]['data']])) { - $in_priv_list = true; - } + if (!$in_priv_list || $typearr[1] == 'alpha_identifier' || $typearr[1] == 'quote_single' || $typearr[1] == 'white_newline') { + $before .= $space_alpha_reserved_word; } } else { - $before .= ' '; + // on first keyword, check if it introduces a + // privilege list + if (isset($keywords_priv_list[$arr[$i]['data']])) { + $in_priv_list = true; + } } + } else { + $before .= ' '; + } - switch ($arr[$i]['data']) { - case 'CREATE': - case 'ALTER': - case 'DROP': - case 'RENAME'; - case 'TRUNCATE': - case 'ANALYZE': - case 'ANALYSE': - case 'OPTIMIZE': - if ($docu) { - switch ($arr[$i + 1]['data']) { - case 'EVENT': - case 'TABLE': - case 'TABLESPACE': - case 'FUNCTION': - case 'INDEX': - case 'PROCEDURE': - case 'TRIGGER': - case 'SERVER': - case 'DATABASE': - case 'VIEW': - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'] . '_' . $arr[$i + 1]['data'], false, '', true); - $close_docu_link = true; - break; - } - if ($arr[$i + 1]['data'] == 'LOGFILE' && $arr[$i + 2]['data'] == 'GROUP') { - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'] . '_LOGFILE_GROUP', false, '', true); - $close_docu_link = true; - } - } - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; + switch ($arr[$i]['data']) { + case 'CREATE': + case 'ALTER': + case 'DROP': + case 'RENAME'; + case 'TRUNCATE': + case 'ANALYZE': + case 'ANALYSE': + case 'OPTIMIZE': + if ($docu) { + switch ($arr[$i + 1]['data']) { case 'EVENT': - case 'TABLESPACE': case 'TABLE': + case 'TABLESPACE': case 'FUNCTION': case 'INDEX': case 'PROCEDURE': - case 'SERVER': case 'TRIGGER': + case 'SERVER': case 'DATABASE': case 'VIEW': - case 'GROUP': - if ($close_docu_link) { - $after = '</a>' . $after; - $close_docu_link = false; - } - break; - case 'SET': - if ($docu && ($i == 0 || $arr[$i - 1]['data'] != 'CHARACTER')) { - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); - $after = '</a>' . $after; - } - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'EXPLAIN': - case 'DESCRIBE': - case 'DELETE': - case 'SHOW': - case 'UPDATE': - if ($docu) { - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); - $after = '</a>' . $after; - } - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = ' '; - } - break; - case 'INSERT': - case 'REPLACE': - if ($docu) { - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); - $after = '</a>' . $after; - } - if (!$in_priv_list) { - $space_punct_listsep = $html_line_break; - $space_alpha_reserved_word = $html_line_break; - } - break; - case 'VALUES': - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'SELECT': - if ($docu) { - $before .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT', false, '', true); - $after = '</a>' . $after; - } - $space_punct_listsep = ' '; - $space_alpha_reserved_word = $html_line_break; - break; - case 'CALL': - case 'DO': - case 'HANDLER': - if ($docu) { - $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); - $after = '</a>' . $after; - } + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'] . '_' . $arr[$i + 1]['data'], false, '', true); + $close_docu_link = true; break; - default: - if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))) { - $after .= '</a>'; - $close_docu_link = false; - } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { - /* Handle multi word statements first */ - if (isset($typearr[4]) && $typearr[4] == 'alpha_reservedWord' && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data'])])) { - $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data']); - $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); - $close_docu_link = true; - } else if (isset($typearr[3]) && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'])])) { - $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data']); - $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); - $close_docu_link = true; - } else { - $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$arr[$i]['data']]['link'], false, $PMA_SQPdata_functions_docs[$arr[$i]['data']]['anchor'], true); - $after .= '</a>'; - } - } - break; - } // end switch ($arr[$i]['data']) - - $after .= ' '; + } + if ($arr[$i + 1]['data'] == 'LOGFILE' && $arr[$i + 2]['data'] == 'GROUP') { + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'] . '_LOGFILE_GROUP', false, '', true); + $close_docu_link = true; + } + } + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; + } break; - case 'digit_integer': - case 'digit_float': - case 'digit_hex': - /** - * @todo could there be other types preceding a digit? - */ - if ($typearr[1] == 'alpha_reservedWord') { - $after .= ' '; + case 'EVENT': + case 'TABLESPACE': + case 'TABLE': + case 'FUNCTION': + case 'INDEX': + case 'PROCEDURE': + case 'SERVER': + case 'TRIGGER': + case 'DATABASE': + case 'VIEW': + case 'GROUP': + if ($close_docu_link) { + $after = '</a>' . $after; + $close_docu_link = false; } - if ($infunction && $typearr[3] == 'punct_bracket_close_round') { - $after .= ' '; + break; + case 'SET': + if ($docu && ($i == 0 || $arr[$i - 1]['data'] != 'CHARACTER')) { + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); + $after = '</a>' . $after; } - if ($typearr[1] == 'alpha_columnAttrib') { - $before .= ' '; + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; } break; - case 'alpha_variable': - $after = ' '; + case 'EXPLAIN': + case 'DESCRIBE': + case 'DELETE': + case 'SHOW': + case 'UPDATE': + if ($docu) { + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); + $after = '</a>' . $after; + } + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = ' '; + } break; - case 'quote_double': - case 'quote_single': - // workaround: for the query - // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%' - // the @ is incorrectly marked as alpha_variable - // in the parser, and here, the '%' gets a blank before, - // which is a syntax error - if ($typearr[1] != 'punct_user' && $typearr[1] != 'alpha_bitfield_constant_introducer') { - $before .= ' '; + case 'INSERT': + case 'REPLACE': + if ($docu) { + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); + $after = '</a>' . $after; } - if ($infunction && $typearr[3] == 'punct_bracket_close_round') { - $after .= ' '; + if (!$in_priv_list) { + $space_punct_listsep = $html_line_break; + $space_alpha_reserved_word = $html_line_break; } break; - case 'quote_backtick': - // here we check for punct_user to handle correctly - // DEFINER = `username`@`%` - // where @ is the punct_user and `%` is the quote_backtick - if ($typearr[3] != 'punct_qualifier' && $typearr[3] != 'alpha_variable' && $typearr[3] != 'punct_user') { - $after .= ' '; + case 'VALUES': + $space_punct_listsep = ' '; + $space_alpha_reserved_word = $html_line_break; + break; + case 'SELECT': + if ($docu) { + $before .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT', false, '', true); + $after = '</a>' . $after; } - if ($typearr[1] != 'punct_qualifier' && $typearr[1] != 'alpha_variable' && $typearr[1] != 'punct_user') { - $before .= ' '; + $space_punct_listsep = ' '; + $space_alpha_reserved_word = $html_line_break; + break; + case 'CALL': + case 'DO': + case 'HANDLER': + if ($docu) { + $before .= PMA_showMySQLDocu('SQL-Syntax', $arr[$i]['data'], false, '', true); + $after = '</a>' . $after; } break; default: + if ($close_docu_link && in_array($arr[$i]['data'], array('LIKE', 'NOT', 'IN', 'REGEXP', 'NULL'))) { + $after .= '</a>'; + $close_docu_link = false; + } else if ($docu && isset($PMA_SQPdata_functions_docs[$arr[$i]['data']])) { + /* Handle multi word statements first */ + if (isset($typearr[4]) && $typearr[4] == 'alpha_reservedWord' && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'] . '_' . $arr[$i + 2]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else if (isset($typearr[3]) && $typearr[3] == 'alpha_reservedWord' && isset($PMA_SQPdata_functions_docs[strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data'])])) { + $tempname = strtoupper($arr[$i]['data'] . '_' . $arr[$i + 1]['data']); + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$tempname]['link'], false, $PMA_SQPdata_functions_docs[$tempname]['anchor'], true); + $close_docu_link = true; + } else { + $before .= PMA_showMySQLDocu('functions', $PMA_SQPdata_functions_docs[$arr[$i]['data']]['link'], false, $PMA_SQPdata_functions_docs[$arr[$i]['data']]['anchor'], true); + $after .= '</a>'; + } + } break; + } // end switch ($arr[$i]['data']) + + $after .= ' '; + break; + case 'digit_integer': + case 'digit_float': + case 'digit_hex': + /** + * @todo could there be other types preceding a digit? + */ + if ($typearr[1] == 'alpha_reservedWord') { + $after .= ' '; + } + if ($infunction && $typearr[3] == 'punct_bracket_close_round') { + $after .= ' '; + } + if ($typearr[1] == 'alpha_columnAttrib') { + $before .= ' '; + } + break; + case 'alpha_variable': + $after = ' '; + break; + case 'quote_double': + case 'quote_single': + // workaround: for the query + // REVOKE SELECT ON `base2\_db`.* FROM 'user'@'%' + // the @ is incorrectly marked as alpha_variable + // in the parser, and here, the '%' gets a blank before, + // which is a syntax error + if ($typearr[1] != 'punct_user' && $typearr[1] != 'alpha_bitfield_constant_introducer') { + $before .= ' '; + } + if ($infunction && $typearr[3] == 'punct_bracket_close_round') { + $after .= ' '; + } + break; + case 'quote_backtick': + // here we check for punct_user to handle correctly + // DEFINER = `username`@`%` + // where @ is the punct_user and `%` is the quote_backtick + if ($typearr[3] != 'punct_qualifier' && $typearr[3] != 'alpha_variable' && $typearr[3] != 'punct_user') { + $after .= ' '; + } + if ($typearr[1] != 'punct_qualifier' && $typearr[1] != 'alpha_variable' && $typearr[1] != 'punct_user') { + $before .= ' '; + } + break; + default: + break; } // end switch ($typearr[2]) /* hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13495-g197abc8
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 197abc88a82e43f3ad2674d93fdbcf7f017874dc (commit) via adca8093c409241734cb2bcee3d5d1b730c7e134 (commit) via b219be20f6299afb55152bd2bc2550dab32395aa (commit) via 609e4271cbbeb391e71865498adff3fcb5881b1a (commit) via 8a33e606137f56ec2a7550242af0a3f556592cdd (commit) via 9b8b88ba572bbf6a6e9707aea76cb3c8211785cb (commit) via 8a21cc27da0c1734825bc95f4983ae702c8301cc (commit) via e63d377e23f2542575246d194ba61564764782ec (commit) via fd219982ba14771ddabe233d64d3c94f3f786760 (commit) via e3f078768cc2f6c8d76e3628dd05043773269523 (commit) via e45c2ce0b154354116ea6854b2cb42a63d22c0f1 (commit) via 820fc893064374cc7aaa8c2d42056099abcae227 (commit) via cb6266274dab65904b6458c17e040d3cba0df437 (commit) via 7f4e30ff2cb5c804c154a6e73e2eb7bd2fa76a93 (commit) via e1edd52069075a4a118a89887986f252cd94a0de (commit) via 589d0e8596b98dc808fe7aa6635561c3fd65ea75 (commit) via fcab6ad07384da7e793dd9c6e90e4dd8d6082a2c (commit) via d6ceb6757c8a14ac69b1da59ba7af72fe34fac80 (commit) via b75bfd7ad3edb7552adef45a894a30341de17217 (commit) via e1d5cfe4c8fce59cb9cc7c67ba7b6d3dea0d0eea (commit) via 77f5748a9504373b28d73f6e507f4f55889c13f0 (commit) via 5bbad06279b16c1fa34eb5097010238816d3063a (commit) via c99d0338a522ab4db3dd8b14d66e4e00bc9d86cd (commit) via ed28ce39580a8cf0b662f37474d9e16ea3891be0 (commit) via 7af2728224cea23e4e8ebd2f4a42765632cb34c5 (commit) via ebdbf800dacd059b3a534131e10360393c9ae590 (commit) via 39c193b722246d5a0c070b07b7bcfc9ebad3715b (commit) via db1ad20f220bdf0bd7508283ca123bf86dbe277a (commit) via 367c94419451b7dd488879c17c46231286020fa7 (commit) via 5289adec741b9aba74213ab46ce9b815e080c3bc (commit) from 4b61ccb92e57e71381782dc3d62486d0fa29c527 (commit) - Log ----------------------------------------------------------------- commit 197abc88a82e43f3ad2674d93fdbcf7f017874dc Merge: 4b61ccb adca809 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:24:08 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/lt.po commit adca8093c409241734cb2bcee3d5d1b730c7e134 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:23:29 2011 +0200 Translation update done using Pootle. commit b219be20f6299afb55152bd2bc2550dab32395aa Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:23:23 2011 +0200 Translation update done using Pootle. commit 609e4271cbbeb391e71865498adff3fcb5881b1a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:22:23 2011 +0200 Translation update done using Pootle. commit 8a33e606137f56ec2a7550242af0a3f556592cdd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:22:10 2011 +0200 Translation update done using Pootle. commit 9b8b88ba572bbf6a6e9707aea76cb3c8211785cb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:21:09 2011 +0200 Translation update done using Pootle. commit 8a21cc27da0c1734825bc95f4983ae702c8301cc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:19:56 2011 +0200 Translation update done using Pootle. commit e63d377e23f2542575246d194ba61564764782ec Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:19:43 2011 +0200 Translation update done using Pootle. commit fd219982ba14771ddabe233d64d3c94f3f786760 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:19:35 2011 +0200 Translation update done using Pootle. commit e3f078768cc2f6c8d76e3628dd05043773269523 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:19:25 2011 +0200 Translation update done using Pootle. commit e45c2ce0b154354116ea6854b2cb42a63d22c0f1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:19:17 2011 +0200 Translation update done using Pootle. commit 820fc893064374cc7aaa8c2d42056099abcae227 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:18:52 2011 +0200 Translation update done using Pootle. commit cb6266274dab65904b6458c17e040d3cba0df437 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:18:14 2011 +0200 Translation update done using Pootle. commit 7f4e30ff2cb5c804c154a6e73e2eb7bd2fa76a93 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:17:22 2011 +0200 Translation update done using Pootle. commit e1edd52069075a4a118a89887986f252cd94a0de Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:16:32 2011 +0200 Translation update done using Pootle. commit 589d0e8596b98dc808fe7aa6635561c3fd65ea75 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:15:02 2011 +0200 Translation update done using Pootle. commit fcab6ad07384da7e793dd9c6e90e4dd8d6082a2c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:14:27 2011 +0200 Translation update done using Pootle. commit d6ceb6757c8a14ac69b1da59ba7af72fe34fac80 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:13:14 2011 +0200 Translation update done using Pootle. commit b75bfd7ad3edb7552adef45a894a30341de17217 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:12:08 2011 +0200 Translation update done using Pootle. commit e1d5cfe4c8fce59cb9cc7c67ba7b6d3dea0d0eea Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:11:10 2011 +0200 Translation update done using Pootle. commit 77f5748a9504373b28d73f6e507f4f55889c13f0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:09:58 2011 +0200 Translation update done using Pootle. commit 5bbad06279b16c1fa34eb5097010238816d3063a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:09:43 2011 +0200 Translation update done using Pootle. commit c99d0338a522ab4db3dd8b14d66e4e00bc9d86cd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:09:24 2011 +0200 Translation update done using Pootle. commit ed28ce39580a8cf0b662f37474d9e16ea3891be0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:08:12 2011 +0200 Translation update done using Pootle. commit 7af2728224cea23e4e8ebd2f4a42765632cb34c5 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:07:45 2011 +0200 Translation update done using Pootle. commit ebdbf800dacd059b3a534131e10360393c9ae590 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:07:28 2011 +0200 Translation update done using Pootle. commit 39c193b722246d5a0c070b07b7bcfc9ebad3715b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:06:46 2011 +0200 Translation update done using Pootle. commit db1ad20f220bdf0bd7508283ca123bf86dbe277a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:06:27 2011 +0200 Translation update done using Pootle. commit 367c94419451b7dd488879c17c46231286020fa7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:05:57 2011 +0200 Translation update done using Pootle. commit 5289adec741b9aba74213ab46ce9b815e080c3bc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:05:45 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 75 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 34 insertions(+), 41 deletions(-) diff --git a/po/lt.po b/po/lt.po index a2ecd48..900cab1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 16:01+0200\n" +"PO-Revision-Date: 2011-08-08 16:23+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -1283,7 +1283,7 @@ msgstr "" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time yra nustatytas į %d sekundė(-es/-žių)." #: js/messages.php:138 msgid "" @@ -1295,10 +1295,10 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:140 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "Išsaugoti į failą" +msgstr "Nustatyti log_output į %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 @@ -1340,7 +1340,6 @@ msgstr "Diagramos antraštė" #. l10n: As in differential values #: js/messages.php:153 -#, fuzzy #| msgid "Difference" msgid "Differential" msgstr "Skirtumas" @@ -1348,7 +1347,7 @@ msgstr "Skirtumas" #: js/messages.php:154 #, php-format msgid "Divided by %s:" -msgstr "" +msgstr "Padalintas į %s:" #: js/messages.php:156 msgid "From slow log" @@ -1381,10 +1380,9 @@ msgid "Log data loaded. Queries executed in this time span:" msgstr "" #: js/messages.php:163 -#, fuzzy #| msgid "Jump to database" msgid "Jump to Log table" -msgstr "Eiti į duomenų bazę" +msgstr "Eiti į žurnalo lentelę" #: js/messages.php:164 msgid "Log analysed, but no data found in this time span." @@ -1392,10 +1390,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:167 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Filtras" +msgstr "Filtrai" #. l10n: Filter as in "Start Filtering" #: js/messages.php:169 navigation.php:270 @@ -1404,11 +1401,11 @@ msgstr "Filtras" #: js/messages.php:170 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Filtro užklausa pagal žodį/regexp:" #: js/messages.php:171 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "" +msgstr "Sugrupuoti užklausas, nepaisant kintamųjų duomenų WHERE dalyje" #: js/messages.php:172 #, fuzzy @@ -1417,16 +1414,14 @@ msgid "Sum of grouped rows:" msgstr "Įkeltų eilučių skaičius" #: js/messages.php:173 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Iš viso" +msgstr "Iš viso:" #: js/messages.php:175 -#, fuzzy #| msgid "Loading" msgid "Loading logs" -msgstr "Įkeliama" +msgstr "Įkeliami žurnalai" #: js/messages.php:176 msgid "Monitor refresh failed" @@ -1440,24 +1435,27 @@ msgid "" msgstr "" #: js/messages.php:178 -#, fuzzy #| msgid "Reload" msgid "Reload page" -msgstr "Įkrauti iš naujo" +msgstr "Puslapį įkelti iš naujo" #: js/messages.php:180 msgid "Affected rows: " -msgstr "" +msgstr "Paveiktos eilutės:" #: js/messages.php:182 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" msgstr "" +"Nepavyko išnagrinėti konfigūracinio failo. Atrodo, kad tai nėra teisingas " +"JSON kodas." #: js/messages.php:183 msgid "" "Failed building chart grid with imported config. Resetting to default " "config..." msgstr "" +"Nepavyko sudaryti diagramos tinklelio su importuota konfigūracija. Nustatoma " +"į numatytąją konfigūraciją..." #: js/messages.php:184 libraries/config/messages.inc.php:170 #: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69 @@ -1555,14 +1553,13 @@ msgid "Browsing" msgstr "Peržiūrėti" #: js/messages.php:218 -#, fuzzy #| msgid "Deleting %s" msgid "Deleting" -msgstr "Šaliname: %s" +msgstr "Šaliname" #: js/messages.php:221 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "" +msgstr "Apibrėžimas „stored“ funkcijos turi turėti RETURN teiginį." #: js/messages.php:224 msgid "" @@ -2282,7 +2279,7 @@ msgstr "Neteisingas naudotojo vardas arba slaptažodis. Priėjimas uždraustas." #: libraries/auth/signon.auth.lib.php:88 msgid "Can not find signon authentication script:" -msgstr "" +msgstr "Nepavyko surasti prisijungimo tapatumo nustatymo scenarijaus:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2397,6 +2394,8 @@ msgid "" "This usually means there is a syntax error in it, please check any errors " "shown below." msgstr "" +"Tai dažniausiai reiškia, kad yra įvelta sintaksės klaida, prašome patikrinti " +"žemiau esančias klaidas." #: libraries/common.inc.php:596 #, php-format @@ -2575,10 +2574,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s d., %s val., %s min. ir %s s" #: libraries/common.lib.php:1927 -#, fuzzy #| msgid "Apply index(s)" msgid "Missing parameter:" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Trūkstamas parametras:" #: libraries/common.lib.php:2236 libraries/common.lib.php:2239 #: libraries/display_tbl.lib.php:306 @@ -2607,10 +2605,9 @@ msgid "The %s functionality is affected by a known bug, see %s" msgstr "%s funkcionalumas paveiktas žinomos klaidos, žiūrėti %s" #: libraries/common.lib.php:2507 -#, fuzzy #| msgid "Click to select" msgid "Click to toggle" -msgstr "Spustelėkite pažymėjimui" +msgstr "Spustelėkite suskleidimui/atskleidimui" #: libraries/common.lib.php:2836 libraries/common.lib.php:2843 #: libraries/common.lib.php:3035 libraries/config/setup.forms.php:296 @@ -2665,7 +2662,7 @@ msgstr "Nėra failų išsiuntimui" #: libraries/common.lib.php:3044 libraries/common.lib.php:3045 msgid "Execute" -msgstr "" +msgstr "Vykdyti" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 @@ -2674,17 +2671,16 @@ msgstr "Abu" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "Niekur" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "Kairė" #: libraries/config.values.php:47 -#, fuzzy #| msgid "Height" msgid "Right" -msgstr "Aukštis" +msgstr "Dešinė" #: libraries/config.values.php:75 msgid "Open" @@ -3054,10 +3050,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Lentelės diagnostika" +msgstr "Išjungti daug lentelių techninę priežiūrą" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -3805,16 +3800,15 @@ msgid "Enable highlighting" msgstr "Įjungti paryškinimą" #: libraries/config/messages.inc.php:288 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "Maksimalus skaičius lentelių rodomų lentelių sąraše" +msgstr "" +"Didžiausias skaičius paskiausiai naudotų lentelių; nustatyti 0, kad išjungti" #: libraries/config/messages.inc.php:289 -#, fuzzy #| msgid "Untracked tables" msgid "Recently used tables" -msgstr "Nesekamos lentelės" +msgstr "Paskiausiai naudotos lentelės" #: libraries/config/messages.inc.php:290 msgid "Use less graphically intense tabs" @@ -4098,13 +4092,12 @@ msgstr "Įrašymo varikliukas" #: libraries/config/messages.inc.php:350 msgid "When browsing tables, the sorting of each table is remembered" -msgstr "" +msgstr "Kai naršomos lentelės, atsimenamas kiekvienos lentelės rikiavimas" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "Pervadinti lentelę į" +msgstr "Įsiminti lentelės rūšiavimą" #: libraries/config/messages.inc.php:352 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13465-g4b61ccb
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 4b61ccb92e57e71381782dc3d62486d0fa29c527 (commit) from 3803a1cde4d153bd5d43b34e16c9eb4c44fd8183 (commit) - Log ----------------------------------------------------------------- commit 4b61ccb92e57e71381782dc3d62486d0fa29c527 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:23:14 2011 +0200 Reintroduce trailing \n ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3b8a6b9..b03e5dc 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -288,13 +288,13 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') if (! is_array($parsed_sql)) { // We don't so just return the input directly // This is intended to be used for when the SQL Parser is turned off - $formatted_sql = '<pre>' . "\n"; + $formatted_sql = "<pre>\n"; if ($cfg['SQP']['fmtType'] == 'none' && $unparsed_sql != '') { $formatted_sql .= $unparsed_sql; } else { $formatted_sql .= $parsed_sql; } - $formatted_sql .= '</pre>'; + $formatted_sql .= "\n</pre>"; return $formatted_sql; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git August 2011