Git
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 12 participants
- 38618 discussions
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13540-gf5cdef3
by Michal Čihař 08 Aug '11
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
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
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
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
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
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 = '<span class="syntax">';
- $html_line_break = '<br />';
- $docu = true;
- break;
- case 'query_only':
- $str = '';
- $html_line_break = "\n";
- $docu = false;
- break;
- case 'text':
- $str = '';
- $html_line_break = '<br />';
- $docu = true;
- break;
+ case 'color':
+ $str = '<span class="syntax">';
+ $html_line_break = '<br />';
+ $docu = true;
+ break;
+ case 'query_only':
+ $str = '';
+ $html_line_break = "\n";
+ $docu = false;
+ break;
+ case 'text':
+ $str = '';
+ $html_line_break = '<br />';
+ $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
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
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
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13464-g3803a1c
by Michal Čihař 08 Aug '11
by Michal Čihař 08 Aug '11
08 Aug '11
The branch, master has been updated
via 3803a1cde4d153bd5d43b34e16c9eb4c44fd8183 (commit)
via 3d621fd3afb302cfa14940f30bf71815a3263b8c (commit)
via 5379b55691620d107ed33ee43d63727079137413 (commit)
via c722d0d696125345e4ef8f0db095458a696c72d6 (commit)
via 323026c0ea041dd818e0e7f0f453c7dc1ec4d3b2 (commit)
from fcf2a7be85ded45e35ce805816657f98de1c4531 (commit)
- Log -----------------------------------------------------------------
commit 3803a1cde4d153bd5d43b34e16c9eb4c44fd8183
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:20:37 2011 +0200
Single call of strtr instead of three str_replace
commit 3d621fd3afb302cfa14940f30bf71815a3263b8c
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:19:05 2011 +0200
Simplify replace logic
commit 5379b55691620d107ed33ee43d63727079137413
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:17:48 2011 +0200
Coding style
commit c722d0d696125345e4ef8f0db095458a696c72d6
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:16:47 2011 +0200
Simplify escape functions usint strtr
commit 323026c0ea041dd818e0e7f0f453c7dc1ec4d3b2
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:15:24 2011 +0200
Use strtr instead of str_replace and array_keys/values combo
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c83ab34..3b8a6b9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -100,7 +100,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa
} else {
$button .= '<img src="themes/dot.gif"'
. ' title="' . $alternate . '" alt="' . $alternate . '"'
- . ' class="icon ic_' . str_replace(array('.gif','.png'),array('',''),$icon) . '" />';
+ . ' class="icon ic_' . str_replace(array('.gif','.png'), '', $icon) . '" />';
}
}
@@ -174,9 +174,10 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php
}
if ($crlf) {
- $a_string = str_replace("\n", '\n', $a_string);
- $a_string = str_replace("\r", '\r', $a_string);
- $a_string = str_replace("\t", '\t', $a_string);
+ $a_string = strtr(
+ $a_string,
+ array("\n" => '\n', "\r" => '\r', "\t" => '\t')
+ );
}
if ($php_code) {
@@ -202,10 +203,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php
*/
function PMA_escape_mysql_wildcards($name)
{
- $name = str_replace('_', '\\_', $name);
- $name = str_replace('%', '\\%', $name);
-
- return $name;
+ return strtr($name, array('_' => '\\_', '%' => '\\%'));
} // end of the 'PMA_escape_mysql_wildcards()' function
/**
@@ -220,10 +218,7 @@ function PMA_escape_mysql_wildcards($name)
*/
function PMA_unescape_mysql_wildcards($name)
{
- $name = str_replace('\\_', '_', $name);
- $name = str_replace('\\%', '%', $name);
-
- return $name;
+ return strtr($name, array('\\_' => '_', '\\%' => '%'));
} // end of the 'PMA_unescape_mysql_wildcards()' function
/**
@@ -1393,7 +1388,9 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow
//number_format is not multibyte safe, str_replace is safe
if ($digits_left === 0) {
$value = number_format($value, $digits_right);
- if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right));
+ if ($originalValue != 0 && floatval($value) == 0) {
+ $value = ' <' . (1 / PMA_pow(10, $digits_right));
+ }
return PMA_localizeNumber($value);
}
@@ -2927,7 +2924,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array())
}
/* Do the replacement */
- return str_replace(array_keys($replace), array_values($replace), strftime($string));
+ return strtr(strftime($string), $replace);
}
/**
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13459-gfcf2a7b
by Michal Čihař 08 Aug '11
by Michal Čihař 08 Aug '11
08 Aug '11
The branch, master has been updated
via fcf2a7be85ded45e35ce805816657f98de1c4531 (commit)
from e502237c623b1981f683f504104c22fdb7d93522 (commit)
- Log -----------------------------------------------------------------
commit fcf2a7be85ded45e35ce805816657f98de1c4531
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Mon Aug 8 16:11:38 2011 +0200
Improve coding style
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 24f8ee0..c83ab34 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1429,10 +1429,16 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow
$dh = PMA_pow(10, $digits_right);
- // This gives us the right SI prefix already, but $digits_left parameter not incorporated
+ /*
+ * This gives us the right SI prefix already,
+ * but $digits_left parameter not incorporated
+ */
$d = floor(log10($value) / 3);
- // Lowering the SI prefix by 1 gives us an additional 3 zeros
- // So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix
+ /*
+ * Lowering the SI prefix by 1 gives us an additional 3 zeros
+ * So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits)
+ * to use, then lower the SI prefix
+ */
$cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1);
if ($digits_left > $cur_digits) {
$d-= floor(($digits_left - $cur_digits)/3);
@@ -1444,12 +1450,18 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow
$unit = $units[$d];
// If we dont want any zeros after the comma just add the thousand seperator
- if ($noTrailingZero)
- $value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value));
- else
- $value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe
+ if ($noTrailingZero) {
+ $value = PMA_localizeNumber(
+ preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value)
+ );
+ } else {
+ //number_format is not multibyte safe, str_replace is safe
+ $value = PMA_localizeNumber(number_format($value, $digits_right));
+ }
- if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit;
+ if ($originalValue!=0 && floatval($value) == 0) {
+ return ' <' . (1 / PMA_pow(10, $digits_right)) . ' ' . $unit;
+ }
return $sign . $value . ' ' . $unit;
} // end of the 'PMA_formatNumber' function
hooks/post-receive
--
phpMyAdmin
1
0