Merge branch 'master' into rte

This commit is contained in:
Rouslan Placella 2011-07-07 12:31:53 +01:00
commit dad5d3594a
20 changed files with 1099 additions and 1333 deletions

View File

@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog
+ Shift/click support in database Structure
+ Show/hide column in table Browse
- bug #3353856 [AJAX] AJAX dialogs use wrong font-size
- bug #3354356 [interface] Timepicker does not work in AJAX dialogs
3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes

View File

@ -2392,23 +2392,6 @@ setfacl -d -m "g:www-data:rwx" tmp
<code>first_timestamp</code>, which is used for first timestamp column
in table.</dd>
<dt id="cfg_NumOperators">$cfg['NumOperators'] array</dt>
<dd>Operators available for search operations on numeric and date columns.
</dd>
<dt id="cfg_TextOperators">$cfg['TextOperators'] array</dt>
<dd>Operators available for search operations on character columns.
Note that we put <code>LIKE</code> by default instead of
<code>LIKE %...%</code>, to avoid unintended performance problems
in case of huge tables.</dd>
<dt id="cfg_EnumOperators">$cfg['EnumOperators'] array</dt>
<dd>Operators available for search operations on ENUM columns.</dd>
<dt id="cfg_NullOperators">$cfg['NullOperators'] array</dt>
<dd>Additional operators available for search operations when the
column can be null.</dd>
</dl>
<!-- TRANSFORMATIONS -->

View File

@ -12,6 +12,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/common.lib.php';
require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/data_mysql.inc.php';
/**
* Include JavaScript libraries

View File

@ -2953,7 +2953,7 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
foreach ($cfg['ColumnTypes'] as $key => $value) {
if (is_array($value)) {
$retval .= "<optgroup label='" . htmlspecialchars($key) . "'>";
foreach ($value as $subkey => $subvalue) {
foreach ($value as $subvalue) {
if ($subvalue == $selected) {
$retval .= "<option selected='selected'>";
$retval .= $subvalue;
@ -2977,9 +2977,9 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
}
} else {
$retval = array();
foreach ($cfg['ColumnTypes'] as $key => $value) {
foreach ($cfg['ColumnTypes'] as $value) {
if (is_array($value)) {
foreach ($value as $subkey => $subvalue) {
foreach ($value as $subvalue) {
if ($subvalue !== '-') {
$retval[] = $subvalue;
}

View File

@ -2740,379 +2740,50 @@ $cfg['DBG']['sql'] = false;
*/
/**
* Column types;
* VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
* Column types
*
* Fill in this array to overwrite data from data_*.inc.php files
*
* @global array $cfg['ColumnTypes']
*/
$cfg['ColumnTypes'] = array(
// most used
'INT',
'VARCHAR',
'TEXT',
'DATE',
// numeric
'NUMERIC' => array(
'TINYINT',
'SMALLINT',
'MEDIUMINT',
'INT',
'BIGINT',
'-',
'DECIMAL',
'FLOAT',
'DOUBLE',
'REAL',
'-',
'BIT',
'BOOLEAN',
'SERIAL',
),
// Date/Time
'DATE and TIME' => array(
'DATE',
'DATETIME',
'TIMESTAMP',
'TIME',
'YEAR',
),
// Text
'STRING' => array(
'CHAR',
'VARCHAR',
'-',
'TINYTEXT',
'TEXT',
'MEDIUMTEXT',
'LONGTEXT',
'-',
'BINARY',
'VARBINARY',
'-',
'TINYBLOB',
'MEDIUMBLOB',
'BLOB',
'LONGBLOB',
'-',
'ENUM',
'SET',
),
'SPATIAL' => array(
'GEOMETRY',
'POINT',
'LINESTRING',
'POLYGON',
'MULTIPOINT',
'MULTILINESTRING',
'MULTIPOLYGON',
'GEOMETRYCOLLECTION',
),
);
$cfg['ColumnTypes'] = array();
/**
* Attributes
*
* Fill in this array to overwrite data from data_*.inc.php files
*
* @global array $cfg['AttributeTypes']
*/
$cfg['AttributeTypes'] = array(
'',
'BINARY',
'UNSIGNED',
'UNSIGNED ZEROFILL',
'on update CURRENT_TIMESTAMP',
);
$cfg['AttributeTypes'] = array();
if ($cfg['ShowFunctionFields']) {
/**
* Available functions
*
* Fill in this array to overwrite data from data_*.inc.php files
*
* @global array $cfg['Functions']
*/
$cfg['Functions'] = array(
'ABS',
'ACOS',
'ASCII',
'ASIN',
'ATAN',
'BIN',
'BIT_COUNT',
'BIT_LENGTH',
'CEILING',
'CHAR',
'CHAR_LENGTH',
'COMPRESS',
'CONNECTION_ID',
'COS',
'COT',
'CRC32',
'CURDATE',
'CURRENT_USER',
'CURTIME',
'DATABASE',
'DATE',
'DAYNAME',
'DAYOFMONTH',
'DAYOFWEEK',
'DAYOFYEAR',
'DEGREES',
'DES_DECRYPT',
'DES_ENCRYPT',
'ENCRYPT',
'EXP',
'FLOOR',
'FROM_DAYS',
'FROM_UNIXTIME',
'HEX',
'HOUR',
'INET_ATON',
'INET_NTOA',
'LAST_DAY',
'LENGTH',
'LN',
'LOAD_FILE',
'LOG',
'LOG10',
'LOG2',
'LOWER',
'LTRIM',
'MD5',
'MICROSECOND',
'MINUTE',
'MONTH',
'MONTHNAME',
'NOW',
'OCT',
'OLD_PASSWORD',
'ORD',
'PASSWORD',
'PI',
'QUARTER',
'QUOTE',
'RADIANS',
'RAND',
'REVERSE',
'ROUND',
'RTRIM',
'SECOND',
'SEC_TO_TIME',
'SHA1',
'SIGN',
'SIN',
'SOUNDEX',
'SPACE',
'SQRT',
'SYSDATE',
'TAN',
'TIME',
'TIMESTAMP',
'TIME_TO_SEC',
'TO_DAYS',
'TRIM',
'UNCOMPRESS',
'UNCOMPRESSED_LENGTH',
'UNHEX',
'UNIX_TIMESTAMP',
'UPPER',
'USER',
'UTC_DATE',
'UTC_TIME',
'UTC_TIMESTAMP',
'UUID',
'VERSION',
'WEEK',
'WEEKDAY',
'WEEKOFYEAR',
'YEAR',
'YEARWEEK',
);
$cfg['Functions'] = array();
/**
* Which column types will be mapped to which Group?
*
* Fill in this array to overwrite data from data_*.inc.php files
*
* @global array $cfg['RestrictColumnTypes']
*/
$cfg['RestrictColumnTypes'] = array(
'TINYINT' => 'FUNC_NUMBER',
'SMALLINT' => 'FUNC_NUMBER',
'MEDIUMINT' => 'FUNC_NUMBER',
'INT' => 'FUNC_NUMBER',
'BIGINT' => 'FUNC_NUMBER',
'DECIMAL' => 'FUNC_NUMBER',
'FLOAT' => 'FUNC_NUMBER',
'DOUBLE' => 'FUNC_NUMBER',
'REAL' => 'FUNC_NUMBER',
'BIT' => 'FUNC_NUMBER',
'BOOLEAN' => 'FUNC_NUMBER',
'SERIAL' => 'FUNC_NUMBER',
'DATE' => 'FUNC_DATE',
'DATETIME' => 'FUNC_DATE',
'TIMESTAMP' => 'FUNC_DATE',
'TIME' => 'FUNC_DATE',
'YEAR' => 'FUNC_DATE',
'CHAR' => 'FUNC_CHAR',
'VARCHAR' => 'FUNC_CHAR',
'TINYTEXT' => 'FUNC_CHAR',
'TEXT' => 'FUNC_CHAR',
'MEDIUMTEXT' => 'FUNC_CHAR',
'LONGTEXT' => 'FUNC_CHAR',
'BINARY' => 'FUNC_CHAR',
'VARBINARY' => 'FUNC_CHAR',
'TINYBLOB' => 'FUNC_CHAR',
'MEDIUMBLOB' => 'FUNC_CHAR',
'BLOB' => 'FUNC_CHAR',
'LONGBLOB' => 'FUNC_CHAR',
'ENUM' => '',
'SET' => '',
'GEOMETRY' => 'FUNC_SPATIAL',
'POINT' => 'FUNC_SPATIAL',
'LINESTRING' => 'FUNC_SPATIAL',
'POLYGON' => 'FUNC_SPATIAL',
'MULTIPOINT' => 'FUNC_SPATIAL',
'MULTILINESTRING' => 'FUNC_SPATIAL',
'MULTIPOLYGON' => 'FUNC_SPATIAL',
'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL',
);
$cfg['RestrictColumnTypes'] = array();
/**
* Map above defined groups to any function
*
* Fill in this array to overwrite data from data_*.inc.php files
*
* @global array $cfg['RestrictFunctions']
*/
$cfg['RestrictFunctions'] = array(
'FUNC_CHAR' => array(
'BIN',
'CHAR',
'CURRENT_USER',
'COMPRESS',
'DATABASE',
'DAYNAME',
'DES_DECRYPT',
'DES_ENCRYPT',
'ENCRYPT',
'HEX',
'INET_NTOA',
'LOAD_FILE',
'LOWER',
'LTRIM',
'MD5',
'MONTHNAME',
'OLD_PASSWORD',
'PASSWORD',
'QUOTE',
'REVERSE',
'RTRIM',
'SHA1',
'SOUNDEX',
'SPACE',
'TRIM',
'UNCOMPRESS',
'UNHEX',
'UPPER',
'USER',
'UUID',
),
'FUNC_DATE' => array(
'CURDATE',
'CURTIME',
'DATE',
'FROM_DAYS',
'FROM_UNIXTIME',
'LAST_DAY',
'NOW',
'SEC_TO_TIME',
'SYSDATE',
'TIME',
'TIMESTAMP',
'UTC_DATE',
'UTC_TIME',
'UTC_TIMESTAMP',
'YEAR',
),
'FUNC_NUMBER' => array(
'ABS',
'ACOS',
'ASCII',
'ASIN',
'ATAN',
'BIT_LENGTH',
'BIT_COUNT',
'CEILING',
'CHAR_LENGTH',
'CONNECTION_ID',
'COS',
'COT',
'CRC32',
'DAYOFMONTH',
'DAYOFWEEK',
'DAYOFYEAR',
'DEGREES',
'EXP',
'FLOOR',
'HOUR',
'INET_ATON',
'LENGTH',
'LN',
'LOG',
'LOG2',
'LOG10',
'MICROSECOND',
'MINUTE',
'MONTH',
'OCT',
'ORD',
'PI',
'QUARTER',
'RADIANS',
'RAND',
'ROUND',
'SECOND',
'SIGN',
'SIN',
'SQRT',
'TAN',
'TO_DAYS',
'TIME_TO_SEC',
'UNCOMPRESSED_LENGTH',
'UNIX_TIMESTAMP',
'WEEK',
'WEEKDAY',
'WEEKOFYEAR',
'YEARWEEK',
),
'FUNC_SPATIAL' => array(
'GeomFromText',
'GeomFromWKB',
'GeomCollFromText',
'LineFromText',
'MLineFromText',
'PointFromText',
'MPointFromText',
'PolyFromText',
'MPolyFromText',
'GeomCollFromWKB',
'LineFromWKB',
'MLineFromWKB',
'PointFromWKB',
'MPointFromWKB',
'PolyFromWKB',
'MPolyFromWKB',
),
);
$cfg['RestrictFunctions'] = array();
/**
* Default functions for above defined groups
@ -3126,90 +2797,6 @@ if ($cfg['ShowFunctionFields']) {
'first_timestamp' => 'NOW',
'pk_char36' => 'UUID',
);
} // end if
/**
* Search operators
*
* @global array $cfg['NumOperators']
*/
$cfg['NumOperators'] = array(
'=',
'>',
'>=',
'<',
'<=',
'!=',
'LIKE',
'NOT LIKE',
'IN (...)',
'NOT IN (...)',
'BETWEEN',
'NOT BETWEEN',
);
/**
* Search operators
*
* @global array $cfg['TextOperators']
*/
$cfg['TextOperators'] = array(
'LIKE',
'LIKE %...%',
'NOT LIKE',
'=',
'!=',
'REGEXP',
'REGEXP ^...$',
'NOT REGEXP',
"= ''",
"!= ''",
'IN (...)',
'NOT IN (...)',
'BETWEEN',
'NOT BETWEEN',
);
/**
* Search operators
*
* @global array $cfg['EnumOperators']
*/
$cfg['EnumOperators'] = array(
'=',
'!=',
);
/**
* Search operators
*
* @global array $cfg['SetOperators']
*/
$cfg['SetOperators'] = array(
'IN',
'NOT IN',
);
/**
* Search operators
*
* @global array $cfg['NullOperators']
*/
$cfg['NullOperators'] = array(
'IS NULL',
'IS NOT NULL',
);
/**
* Search operators
*
* @global array $cfg['UnaryOperators']
*/
$cfg['UnaryOperators'] = array(
'IS NULL' => 1,
'IS NOT NULL' => 1,
"= ''" => 1,
"!= ''" => 1
);
}
?>

View File

@ -0,0 +1,286 @@
<?php
/**
* Column types and functions supported by MySQL
*
* @package phpMyAdmin
*/
// VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
$cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
// most used
'INT',
'VARCHAR',
'TEXT',
'DATE',
// numeric
'NUMERIC' => array(
'TINYINT',
'SMALLINT',
'MEDIUMINT',
'INT',
'BIGINT',
'-',
'DECIMAL',
'FLOAT',
'DOUBLE',
'REAL',
'-',
'BIT',
'BOOLEAN',
'SERIAL',
),
// Date/Time
'DATE and TIME' => array(
'DATE',
'DATETIME',
'TIMESTAMP',
'TIME',
'YEAR',
),
// Text
'STRING' => array(
'CHAR',
'VARCHAR',
'-',
'TINYTEXT',
'TEXT',
'MEDIUMTEXT',
'LONGTEXT',
'-',
'BINARY',
'VARBINARY',
'-',
'TINYBLOB',
'MEDIUMBLOB',
'BLOB',
'LONGBLOB',
'-',
'ENUM',
'SET',
),
'SPATIAL' => array(
'GEOMETRY',
'POINT',
'LINESTRING',
'POLYGON',
'MULTIPOINT',
'MULTILINESTRING',
'MULTIPOLYGON',
'GEOMETRYCOLLECTION',
),
);
$cfg['AttributeTypes'] = !empty($cfg['AttributeTypes']) ? $cfg['AttributeTypes'] : array(
'',
'BINARY',
'UNSIGNED',
'UNSIGNED ZEROFILL',
'on update CURRENT_TIMESTAMP',
);
if ($cfg['ShowFunctionFields']) {
$cfg['RestrictColumnTypes'] = !empty($cfg['RestrictColumnTypes']) ? $cfg['RestrictColumnTypes'] : array(
'TINYINT' => 'FUNC_NUMBER',
'SMALLINT' => 'FUNC_NUMBER',
'MEDIUMINT' => 'FUNC_NUMBER',
'INT' => 'FUNC_NUMBER',
'BIGINT' => 'FUNC_NUMBER',
'DECIMAL' => 'FUNC_NUMBER',
'FLOAT' => 'FUNC_NUMBER',
'DOUBLE' => 'FUNC_NUMBER',
'REAL' => 'FUNC_NUMBER',
'BIT' => 'FUNC_NUMBER',
'BOOLEAN' => 'FUNC_NUMBER',
'SERIAL' => 'FUNC_NUMBER',
'DATE' => 'FUNC_DATE',
'DATETIME' => 'FUNC_DATE',
'TIMESTAMP' => 'FUNC_DATE',
'TIME' => 'FUNC_DATE',
'YEAR' => 'FUNC_DATE',
'CHAR' => 'FUNC_CHAR',
'VARCHAR' => 'FUNC_CHAR',
'TINYTEXT' => 'FUNC_CHAR',
'TEXT' => 'FUNC_CHAR',
'MEDIUMTEXT' => 'FUNC_CHAR',
'LONGTEXT' => 'FUNC_CHAR',
'BINARY' => 'FUNC_CHAR',
'VARBINARY' => 'FUNC_CHAR',
'TINYBLOB' => 'FUNC_CHAR',
'MEDIUMBLOB' => 'FUNC_CHAR',
'BLOB' => 'FUNC_CHAR',
'LONGBLOB' => 'FUNC_CHAR',
'ENUM' => '',
'SET' => '',
'GEOMETRY' => 'FUNC_SPATIAL',
'POINT' => 'FUNC_SPATIAL',
'LINESTRING' => 'FUNC_SPATIAL',
'POLYGON' => 'FUNC_SPATIAL',
'MULTIPOINT' => 'FUNC_SPATIAL',
'MULTILINESTRING' => 'FUNC_SPATIAL',
'MULTIPOLYGON' => 'FUNC_SPATIAL',
'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL',
);
$restrict_functions = array(
'FUNC_CHAR' => array(
'BIN',
'CHAR',
'CURRENT_USER',
'COMPRESS',
'DATABASE',
'DAYNAME',
'DES_DECRYPT',
'DES_ENCRYPT',
'ENCRYPT',
'HEX',
'INET_NTOA',
'LOAD_FILE',
'LOWER',
'LTRIM',
'MD5',
'MONTHNAME',
'OLD_PASSWORD',
'PASSWORD',
'QUOTE',
'REVERSE',
'RTRIM',
'SHA1',
'SOUNDEX',
'SPACE',
'TRIM',
'UNCOMPRESS',
'UNHEX',
'UPPER',
'USER',
'UUID',
'VERSION',
),
'FUNC_DATE' => array(
'CURDATE',
'CURTIME',
'DATE',
'FROM_DAYS',
'FROM_UNIXTIME',
'LAST_DAY',
'NOW',
'SEC_TO_TIME',
'SYSDATE',
'TIME',
'TIMESTAMP',
'UTC_DATE',
'UTC_TIME',
'UTC_TIMESTAMP',
'YEAR',
),
'FUNC_NUMBER' => array(
'ABS',
'ACOS',
'ASCII',
'ASIN',
'ATAN',
'BIT_LENGTH',
'BIT_COUNT',
'CEILING',
'CHAR_LENGTH',
'CONNECTION_ID',
'COS',
'COT',
'CRC32',
'DAYOFMONTH',
'DAYOFWEEK',
'DAYOFYEAR',
'DEGREES',
'EXP',
'FLOOR',
'HOUR',
'INET_ATON',
'LENGTH',
'LN',
'LOG',
'LOG2',
'LOG10',
'MICROSECOND',
'MINUTE',
'MONTH',
'OCT',
'ORD',
'PI',
'QUARTER',
'RADIANS',
'RAND',
'ROUND',
'SECOND',
'SIGN',
'SIN',
'SQRT',
'TAN',
'TO_DAYS',
'TO_SECONDS',
'TIME_TO_SEC',
'UNCOMPRESSED_LENGTH',
'UNIX_TIMESTAMP',
'UUID_SHORT',
'WEEK',
'WEEKDAY',
'WEEKOFYEAR',
'YEARWEEK',
),
'FUNC_SPATIAL' => array(
'GeomFromText',
'GeomFromWKB',
'GeomCollFromText',
'LineFromText',
'MLineFromText',
'PointFromText',
'MPointFromText',
'PolyFromText',
'MPolyFromText',
'GeomCollFromWKB',
'LineFromWKB',
'MLineFromWKB',
'PointFromWKB',
'MPointFromWKB',
'PolyFromWKB',
'MPolyFromWKB',
),
);
// $restrict_functions holds all known functions, remove these that are unavailable on current server
if (PMA_MYSQL_INT_VERSION < 50500) {
$restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('TO_SECONDS'));
}
if (PMA_MYSQL_INT_VERSION < 50120) {
$restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('UUID_SHORT'));
}
if (empty($cfg['RestrictFunctions'])) {
$cfg['RestrictFunctions'] = $restrict_functions;
}
if (empty($cfg['Functions'])) {
// build a list of functions based on $restrict_functions
$cfg['Functions'] = array();
foreach ($restrict_functions as $cat => $functions) {
if ($cat != 'FUNC_SPATIAL') {
$cfg['Functions'] = array_merge($cfg['Functions'], $functions);
}
}
sort($cfg['Functions']);
}
unset($restrict_functions);
} // end if
?>

View File

@ -27,6 +27,9 @@ require_once './libraries/StorageEngine.class.php';
*/
require_once './libraries/Partition.class.php';
// load additional configuration variables
require_once './libraries/data_mysql.inc.php';
if (is_int($cfg['DefaultPropDisplay'])) {
if ($num_fields <= $cfg['DefaultPropDisplay']) {
$display_type = 'vertical';

399
po/bg.po

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-29 20:12+0200\n"
"PO-Revision-Date: 2011-07-02 22:10+0200\n"
"Last-Translator: <fulup.jakez@ofis-bzh.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@ -2411,139 +2411,142 @@ msgstr "Prim - na ziskouez nemet nebeudik-tre a zibarzhioù da gefluniañ"
#: libraries/config.values.php:101
msgid "Custom - display all possible options to configure"
msgstr ""
msgstr "Personelaet - diskouez an holl zibarzhioù kefluniañ posupl"
#: libraries/config.values.php:102
msgid "Custom - like above, but without the quick/custom choice"
msgstr ""
msgstr "Personelaet - evel a-us nemet hep an dibaboù prim/personelaet"
#: libraries/config.values.php:120
msgid "complete inserts"
msgstr ""
msgstr "Ensoc'hadennoù sevenet"
#: libraries/config.values.php:121
msgid "extended inserts"
msgstr ""
msgstr "Ensoc'hadennoù astennet"
#: libraries/config.values.php:122
msgid "both of the above"
msgstr ""
msgstr "Kement dibab zo a-us"
#: libraries/config.values.php:123
msgid "neither of the above"
msgstr ""
msgstr "Dibab ebet a-zouez ar re zo a-us"
#: libraries/config/FormDisplay.class.php:83
#: libraries/config/validate.lib.php:412
msgid "Not a positive number"
msgstr ""
msgstr "N'eo ket un niver pozitivel"
#: libraries/config/FormDisplay.class.php:84
#: libraries/config/validate.lib.php:424
msgid "Not a non-negative number"
msgstr ""
msgstr "N'eo ket un niver annegativel"
#: libraries/config/FormDisplay.class.php:85
#: libraries/config/validate.lib.php:400
msgid "Not a valid port number"
msgstr ""
msgstr "Niverenn borzh direizh"
#: libraries/config/FormDisplay.class.php:86
#: libraries/config/FormDisplay.class.php:535
#: libraries/config/validate.lib.php:352 libraries/config/validate.lib.php:439
msgid "Incorrect value"
msgstr ""
msgstr "Talvoud direizh"
#: libraries/config/FormDisplay.class.php:87
#: libraries/config/validate.lib.php:453
#, php-format
msgid "Value must be equal or lower than %s"
msgstr ""
msgstr "Rankout a ra an talvoud bezañ par da pe bihanoc'h eget %s"
#: libraries/config/FormDisplay.class.php:499
#, php-format
msgid "Missing data for %s"
msgstr ""
msgstr "Roadennoù a vank evit %s"
#: libraries/config/FormDisplay.class.php:696
#: libraries/config/FormDisplay.class.php:700
msgid "unavailable"
msgstr ""
msgstr "N'eo ket hegerz"
#: libraries/config/FormDisplay.class.php:697
#: libraries/config/FormDisplay.class.php:701
#, php-format
msgid "\"%s\" requires %s extension"
msgstr ""
msgstr "\"%s\" zo rekis dezhañ an astenn %s"
#: libraries/config/FormDisplay.class.php:715
#, php-format
msgid "import will not work, missing function (%s)"
msgstr ""
msgstr "Ne'z aio ket an enporzhiañ en-dro, un arc'hwel a vank (%s)"
#: libraries/config/FormDisplay.class.php:719
#, php-format
msgid "export will not work, missing function (%s)"
msgstr ""
msgstr "Ne'z aio ket an ezporzhiañ en-dro, un arc'hwel a vank (%s)"
#: libraries/config/FormDisplay.class.php:726
msgid "SQL Validator is disabled"
msgstr ""
msgstr "Diweredekaet eo kadarnataer SQL"
#: libraries/config/FormDisplay.class.php:733
msgid "SOAP extension not found"
msgstr ""
msgstr "N'eo ket bet kavet an astenn SOAP"
#: libraries/config/FormDisplay.class.php:741
#, php-format
msgid "maximum %s"
msgstr ""
msgstr "%s d'ar muiañ"
#: libraries/config/FormDisplay.tpl.php:167
msgid "This setting is disabled, it will not be applied to your configuration"
msgstr ""
"Diweredekaet eo an arventenn; ne vo ket lakaet e pleustr gant ho kefluniadur"
#: libraries/config/FormDisplay.tpl.php:167 libraries/relation.lib.php:78
#: libraries/relation.lib.php:85 pmd_relation_new.php:68
msgid "Disabled"
msgstr ""
msgstr "Diweredekaet"
#: libraries/config/FormDisplay.tpl.php:242
#, php-format
msgid "Set value: %s"
msgstr ""
msgstr "Lakaat an talvoud da %s"
#: libraries/config/FormDisplay.tpl.php:247
#: libraries/config/messages.inc.php:356
msgid "Restore default value"
msgstr ""
msgstr "Adlakaat an talvoud dre ziouer"
#: libraries/config/FormDisplay.tpl.php:263
msgid "Allow users to customize this value"
msgstr ""
msgstr "Aotren an implijerien da bersonelaat an talvoud-mañ"
#: libraries/config/FormDisplay.tpl.php:324
#: libraries/schema/User_Schema.class.php:466 prefs_manage.php:320
#: prefs_manage.php:325 tbl_change.php:1025
msgid "Reset"
msgstr ""
msgstr "Adderaouekaat"
#: libraries/config/messages.inc.php:17
msgid "Improves efficiency of screen refresh"
msgstr ""
msgstr "Gwellaat a ra efeduster ar freskaat skrammoù"
#: libraries/config/messages.inc.php:18
msgid "Enable Ajax"
msgstr ""
msgstr "Gweredekaat Ajax"
#: libraries/config/messages.inc.php:19
msgid ""
"If enabled user can enter any MySQL server in login form for cookie auth"
msgstr ""
"Ma c'hall an implijer aotreet monet e ne vern pe servijer MySQL er furmskrid "
"kevreañ evit ar gwiriekaat dre doupinoù"
#: libraries/config/messages.inc.php:20
msgid "Allow login to any MySQL server"
msgstr ""
msgstr "Aotren kevreañ ouzh ne vern pe servijer MySQL"
#: libraries/config/messages.inc.php:21
msgid ""

110
po/da.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-03-07 01:17+0200\n"
"Last-Translator: <hjortholm@gmail.com>\n"
"PO-Revision-Date: 2011-07-04 10:57+0200\n"
"Last-Translator: <thomas@dyhr.com>\n"
"Language-Team: danish <da@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -504,17 +504,17 @@ msgid "Your SQL query has been executed successfully"
msgstr "Din SQL-forespørgsel blev udført korrekt"
#: db_routines.php:157
#, php-format
#, php-format, fuzzy
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "række påvirket af den sidste SQL-sætning inde i proceduren"
msgstr[1] "rækker påvirket af den sidste SQL-sætning inde i proceduren"
#: db_routines.php:167
#, fuzzy, php-format
#, php-format
#| msgid "Allows executing stored routines."
msgid "Execution results of routine %s"
msgstr "Tillader udførelse af gemte rutiner."
msgstr "Udførelsesresultater af rutine %s"
#: db_routines.php:187 libraries/import.lib.php:152 sql.php:685
#: tbl_change.php:180 tbl_get_field.php:34
@ -525,7 +525,7 @@ msgstr "MySQL returnerede ingen data (fx ingen rækker)."
#: db_routines.php:326
#, php-format
msgid "The following query has failed: \"%s\""
msgstr ""
msgstr "Den følgende SQL-forespørgsel fejlede: \"%s\""
#: db_routines.php:193 db_routines.php:298 db_routines.php:303
#: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@ -534,27 +534,26 @@ msgstr "MySQL returnerede: "
#: db_routines.php:210 db_routines.php:242 db_routines.php:270
#: db_routines.php:409
#, fuzzy
#| msgid "Error in Processing Request"
msgid "Error in processing request"
msgstr "Felj i udførsel af forespørgsel"
msgstr "Fejl i udførsel af forespørgsel"
#: db_routines.php:211 db_routines.php:243 db_routines.php:271
#: db_routines.php:410
#, fuzzy, php-format
#, php-format
#| msgid "No tables found in database"
msgid "No routine with name %1$s found in database %2$s"
msgstr "Ingen tabeller fundet i databasen"
msgstr "Ingen rutine med navnet %1$s fundet i databasen %2$s"
#: db_routines.php:232 db_routines.php:236
msgid "Execute routine"
msgstr ""
msgstr "Udfør rutine"
#: db_routines.php:261 db_routines.php:265
#, fuzzy, php-format
#, php-format
#| msgid "Export defaults"
msgid "Export of routine %s"
msgstr "Standardindstillinger for eksport"
msgstr "Eksport af rutine %s"
#: db_routines.php:290 libraries/db_routines.lib.php:911
#, fuzzy, php-format
@ -584,19 +583,17 @@ msgstr "Database %1$s er oprettet,"
#: db_routines.php:337
msgid "<b>One or more errors have occured while processing your request:</b>"
msgstr ""
msgstr "<b>Der er opstået fejl under behandling af anmodningen:</b>"
#: db_routines.php:381
#, fuzzy
#| msgid "Create relation"
msgid "Create routine"
msgstr "Opret relation"
msgstr "Opret rutine"
#: db_routines.php:385
#, fuzzy
#| msgid "Edit mode"
msgid "Edit routine"
msgstr "Redigeringstilstand"
msgstr "Rediger rutine"
#: db_routines.php:436
msgid ""
@ -604,17 +601,21 @@ msgid ""
"handling multi queries. <b>The execution of some stored routines may fail!</"
"b> Please use the improved 'mysqli' extension to avoid any problems."
msgstr ""
"Du bruger en forældet PHP 'mysql' udvidelse, som ikke er i stand til at "
"håndtere multi forespørgsler. <b> Eksekveringen af nogle lagrede rutiner "
"kan mislykkes! </ b> Brug den forbedrede 'MySQLi \"udvidelse for at undgå "
"eventuelle problemer."
#: db_search.php:30 libraries/auth/config.auth.lib.php:83
#: libraries/auth/config.auth.lib.php:102
#: libraries/auth/cookie.auth.lib.php:566 libraries/auth/http.auth.lib.php:51
#: libraries/auth/signon.auth.lib.php:236
msgid "Access denied"
msgstr "Adgang Nægtet"
msgstr "Adgang nægtet"
#: db_search.php:42 db_search.php:284
msgid "at least one of the words"
msgstr "mindst et af ordene"
msgstr "mindst ét af ordene"
#: db_search.php:43 db_search.php:285
msgid "all words"
@ -649,7 +650,7 @@ msgstr "Vis"
#: db_search.php:236
#, php-format
msgid "Delete the matches for the %s table?"
msgstr "Slet match for %s tabellen"
msgstr "Slet match for %s tabellen?"
#: db_search.php:236 libraries/display_tbl.lib.php:1338
#: libraries/display_tbl.lib.php:2314
@ -675,10 +676,9 @@ msgid "Search in database"
msgstr "Søg i databasen"
#: db_search.php:275
#, fuzzy
#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
msgid "Words or values to search for (wildcard: \"%\"):"
msgstr "Ord eller værdi(er) (jokertegn: \"%\"):"
msgstr "Ord eller værdier til at søge efter (jokertegn: \"%\"):"
#: db_search.php:280
msgid "Find:"
@ -926,11 +926,11 @@ msgstr "Indtast hver værdi i et seperat felt."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
msgstr ""
msgstr "+ Genstart indsættelse og tilføj ny værdi"
#: enum_editor.php:67
msgid "Output"
msgstr ""
msgstr "Output"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
@ -943,7 +943,7 @@ msgstr "Valgte eksporttype skal gemmes som fil!"
#: export.php:164 export.php:189 export.php:671
#, php-format
msgid "Insufficient space to save the file %s."
msgstr "Utilstrækkeligt plads til at gemme filen %s."
msgstr "Utilstrækkelig plads til at gemme filen %s."
#: export.php:307
#, php-format
@ -10511,44 +10511,46 @@ msgid "After %s"
msgstr "Efter %s"
#: tbl_structure.php:732
#, fuzzy, php-format
#, php-format
#| msgid "Create an index on&nbsp;%s&nbsp;columns"
msgid "Create an index on &nbsp;%s&nbsp;columns"
msgstr "Dan et indeks på&nbsp;%s&nbsp;kolonner"
msgstr "Opret et indeks på &nbsp;%s&nbsp; kolonner"
#: tbl_structure.php:893
msgid "partitioned"
msgstr ""
msgstr "partitioneret"
#: tbl_tracking.php:109
#, php-format
msgid "Tracking report for table `%s`"
msgstr ""
msgstr "Sporings rapport for tabel `% s`"
#: tbl_tracking.php:182
#, php-format
msgid "Version %s is created, tracking for %s.%s is activated."
msgstr ""
msgstr "Version %s er oprettet, sporing for %s.%s er aktiveret."
#: tbl_tracking.php:190
#, php-format
msgid "Tracking for %s.%s , version %s is deactivated."
msgstr ""
msgstr "Sporing for %s.%s, version %s er deaktiveret."
#: tbl_tracking.php:198
#, php-format
msgid "Tracking for %s.%s , version %s is activated."
msgstr ""
msgstr "Sporing for %s.%s, version %s er aktiveret."
#: tbl_tracking.php:208
msgid "SQL statements executed."
msgstr ""
msgstr "SQL-sætninger udført."
#: tbl_tracking.php:214
msgid ""
"You can execute the dump by creating and using a temporary database. Please "
"ensure that you have the privileges to do so."
msgstr ""
"Du kan udføre eksporten ved at oprette og bruge en midlertidig database. "
"Sørg venligst for at du har privilegier til at gøre det."
#: tbl_tracking.php:215
msgid "Comment out these two lines if you do not need them."
@ -10556,16 +10558,16 @@ msgstr ""
#: tbl_tracking.php:224
msgid "SQL statements exported. Please copy the dump or execute it."
msgstr ""
msgstr "SQL-sætninger eksporteres. Kopier venligst dump eller udfør den."
#: tbl_tracking.php:255
#, php-format
msgid "Version %s snapshot (SQL code)"
msgstr ""
msgstr "Version %s snapshot (SQL kode)"
#: tbl_tracking.php:382
msgid "Tracking data definition successfully deleted"
msgstr ""
msgstr "Sporing af data definition slettet"
#: tbl_tracking.php:384 tbl_tracking.php:401
#, fuzzy
@ -10616,7 +10618,7 @@ msgstr ""
#: tbl_tracking.php:559
msgid "SQL dump"
msgstr ""
msgstr "SQL dump"
#: tbl_tracking.php:560
msgid "This option will replace your table and contained data."
@ -10624,55 +10626,55 @@ msgstr ""
#: tbl_tracking.php:560
msgid "SQL execution"
msgstr ""
msgstr "SQL-udførelse"
#: tbl_tracking.php:572
#, php-format
msgid "Export as %s"
msgstr ""
msgstr "Eksporter som %s"
#: tbl_tracking.php:612
msgid "Show versions"
msgstr ""
msgstr "Vis versioner"
#: tbl_tracking.php:644
msgid "Version"
msgstr ""
msgstr "Version"
#: tbl_tracking.php:692
#, php-format
msgid "Deactivate tracking for %s.%s"
msgstr ""
msgstr "Deaktiver tracking af %s.%s"
#: tbl_tracking.php:694
msgid "Deactivate now"
msgstr ""
msgstr "Deaktiver nu"
#: tbl_tracking.php:705
#, php-format
msgid "Activate tracking for %s.%s"
msgstr ""
msgstr "Aktiver tracking af %s.%s"
#: tbl_tracking.php:707
msgid "Activate now"
msgstr ""
msgstr "Aktiver nu"
#: tbl_tracking.php:720
#, php-format
msgid "Create version %s of %s.%s"
msgstr ""
msgstr "Opret version %s af %s.%s"
#: tbl_tracking.php:724
msgid "Track these data definition statements:"
msgstr ""
msgstr "Spor disse data definition udsagn"
#: tbl_tracking.php:732
msgid "Track these data manipulation statements:"
msgstr ""
msgstr "Spor disse data manipulation udsagn:"
#: tbl_tracking.php:740
msgid "Create version"
msgstr ""
msgstr "Opret version"
#: themes.php:31
#, php-format
@ -10685,7 +10687,7 @@ msgstr ""
#: themes.php:41
msgid "Get more themes!"
msgstr ""
msgstr "Hent flere temaer!"
#: transformation_overview.php:24
msgid "Available MIME types"
@ -10722,7 +10724,7 @@ msgstr "VIEW navn"
#: view_operations.php:91
msgid "Rename view to"
msgstr ""
msgstr "Omdøb view til"
#, fuzzy
#~| msgid "row(s) starting from record #"

569
po/de.po

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-23 10:24+0200\n"
"PO-Revision-Date: 2011-07-01 12:28+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
"Language-Team: greek <el@li.org>\n"
"MIME-Version: 1.0\n"
@ -527,10 +527,10 @@ msgstr ""
#: db_routines.php:192 db_routines.php:297 db_routines.php:302
#: db_routines.php:326
#, fuzzy, php-format
#, php-format
#| msgid "The following queries have been executed:"
msgid "The following query has failed: \"%s\""
msgstr "Το ερώτημα «%s» απέτυχε"
msgstr "Το ακόλουθο ερώτημα έχει αποτύχει: «%s»"
#: db_routines.php:193 db_routines.php:298 db_routines.php:303
#: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@ -544,10 +544,10 @@ msgstr "Σφάλμα στην προώθηση αιτημάτος"
#: db_routines.php:211 db_routines.php:243 db_routines.php:271
#: db_routines.php:410
#, fuzzy, php-format
#, php-format
#| msgid "No routine with name %s found in database %s"
msgid "No routine with name %1$s found in database %2$s"
msgstr "Καμιά ρουτίνα με την ονομασία %s δεν βρέθηκε στη βάση δεδομένων %s"
msgstr "Καμιά ρουτίνα με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s"
#: db_routines.php:232 db_routines.php:236
msgid "Execute routine"
@ -4836,10 +4836,9 @@ msgid "Turn it off"
msgstr "Απενεργοποιήστε τον"
#: libraries/db_events.inc.php:141
#, fuzzy
#| msgid "Add a new Event"
msgid "Add an event"
msgstr "Προσθήκη ενός νέου Συμβάντος"
msgstr "Προσθήκη ενός συμβάντος"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
#: libraries/db_links.inc.php:44
@ -5525,10 +5524,9 @@ msgid "Event"
msgstr "Συμβάν"
#: libraries/display_triggers.inc.php:120
#, fuzzy
#| msgid "Add a new Trigger"
msgid "Add a trigger"
msgstr "Προσθήκη μιας νέας Ενέργειας"
msgstr "Προσθήκη μιας ενέργειας"
#: libraries/engines/bdb.lib.php:20 main.php:211
msgid "Version information"
@ -7310,10 +7308,9 @@ msgid "PARTITION definition"
msgstr "Ορισμός ΚΑΤΑΤΜΗΣΗΣ (PARTITION)"
#: libraries/tbl_properties.inc.php:776
#, fuzzy
#| msgid "+ Add a new value"
msgid "+ Add a value"
msgstr "+ Προσθήκη νέας τιμής"
msgstr "+ Προσθήκη μιας τιμής"
#: libraries/transformations/application_octetstream__download.inc.php:9
msgid ""

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-30 23:48+0200\n"
"Last-Translator: <wiltave@gmail.com>\n"
"PO-Revision-Date: 2011-07-05 15:06+0200\n"
"Last-Translator: <vitorpc.18@gmail.com>\n"
"Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -478,7 +478,6 @@ msgid "Add/Delete criteria rows"
msgstr "Adicionar/Remover critérios de linha"
#: db_qbe.php:618
#, fuzzy
#| msgid "Add/Delete Field Columns"
msgid "Add/Delete columns"
msgstr "Adicionar/Remover colunas"
@ -511,8 +510,8 @@ msgstr "Seu comando SQL foi executado com sucesso"
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "%d linha afetada pela última instrução dentro do procedimento"
msgstr[1] "%d linhas afetadas pela última instrução dentro do procedimento"
#: db_routines.php:167
#, php-format
@ -526,10 +525,10 @@ msgstr "MySQL retornou um conjunto vazio (ex. zero registros)."
#: db_routines.php:192 db_routines.php:297 db_routines.php:302
#: db_routines.php:326
#, fuzzy, php-format
#, php-format
#| msgid "The following queries have been executed:"
msgid "The following query has failed: \"%s\""
msgstr "As seguintes consultas foram executadas:"
msgstr "A seguinte consulta falhou: \"%s\""
#: db_routines.php:193 db_routines.php:298 db_routines.php:303
#: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@ -538,68 +537,66 @@ msgstr "Mensagens do MySQL : "
#: db_routines.php:210 db_routines.php:242 db_routines.php:270
#: db_routines.php:409
#, fuzzy
#| msgid "Error in Processing Request"
msgid "Error in processing request"
msgstr "Erro no processamento da requisição"
#: db_routines.php:211 db_routines.php:243 db_routines.php:271
#: db_routines.php:410
#, fuzzy, php-format
#, php-format
#| msgid "No tables found in database"
msgid "No routine with name %1$s found in database %2$s"
msgstr "Nenhuma tabela encontrada no banco de dados"
msgstr "Nenhuma rotina com o nome %1$s encontrada no banco de dados %2$s"
#: db_routines.php:232 db_routines.php:236
msgid "Execute routine"
msgstr ""
msgstr "Executar rotina"
#: db_routines.php:261 db_routines.php:265
#, fuzzy, php-format
#, php-format
msgid "Export of routine %s"
msgstr "Importar arquivos"
msgstr "Exportação de rotina %s"
#: db_routines.php:290 libraries/db_routines.lib.php:911
#, fuzzy, php-format
#, php-format
#| msgid "Invalid server index: \"%s\""
msgid "Invalid routine type: \"%s\""
msgstr "Índice de servidor inválido: \"%s\""
msgstr "Tipo de rotina inválido: \"%s\""
#: db_routines.php:311
msgid "Sorry, we failed to restore the dropped routine."
msgstr ""
msgstr "Desculpa, mas falhamos ao restaurar a rotina."
#: db_routines.php:312
msgid "The backed up query was:"
msgstr ""
msgstr "A consulta de backup foi:"
#: db_routines.php:316
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been dropped"
msgid "Routine %1$s has been modified."
msgstr "Tabela %s foi eliminada"
msgstr "A rotina %1$s foi modificada."
#: db_routines.php:329
#, fuzzy, php-format
#, php-format
#| msgid "Table %1$s has been created."
msgid "Routine %1$s has been created."
msgstr "A tabela %1$s foi criada."
msgstr "A rotina %1$s foi criada."
#: db_routines.php:337
msgid "<b>One or more errors have occured while processing your request:</b>"
msgstr ""
"<b>Um ou mais erros ocorreram durante o processamento de sua requisição:</b>"
#: db_routines.php:381
#, fuzzy
#| msgid "Create relation"
msgid "Create routine"
msgstr "Criar relacionamento"
msgstr "Criar rotina"
#: db_routines.php:385
#, fuzzy
#| msgid "Edit server"
msgid "Edit routine"
msgstr "Editar servidor"
msgstr "Editar rotina"
#: db_routines.php:436
msgid ""
@ -678,7 +675,6 @@ msgid "Search in database"
msgstr "Procurar no Banco de Dados"
#: db_search.php:275
#, fuzzy
#| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
msgid "Words or values to search for (wildcard: \"%\"):"
msgstr "Palavra(s) ou valor(es) para procurar (coringa: \"%\"):"
@ -692,7 +688,6 @@ msgid "Words are separated by a space character (\" \")."
msgstr "Palavras são separadas por um caracter de espaço (\" \")."
#: db_search.php:298
#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside tables:"
msgstr "Dentro da(s) tabela(s):"
@ -1118,7 +1113,6 @@ msgstr "Isto não é um número!"
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:49
#, fuzzy
#| msgid "Total"
msgid "Total count"
msgstr "Total"
@ -1167,23 +1161,21 @@ msgid "Edit"
msgstr "Editar"
#: js/messages.php:64 server_status.php:420
#, fuzzy
#| msgid "Server Choice"
msgid "Live traffic chart"
msgstr "Seleção do Servidor"
msgstr "Gráfico de tráfego em tempo real"
#: js/messages.php:65 server_status.php:423
msgid "Live conn./process chart"
msgstr ""
#: js/messages.php:66 server_status.php:445
#, fuzzy
msgid "Live query chart"
msgstr "consulta SQL"
msgstr "Gráfico de consulta em tempo real"
#: js/messages.php:68
msgid "Static data"
msgstr ""
msgstr "Dado(s) estático(s)"
#. l10n: Total number of queries
#: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@ -1196,7 +1188,7 @@ msgstr "Total"
#. l10n: Other, small valued, queries
#: js/messages.php:72 server_status.php:602
msgid "Other"
msgstr ""
msgstr "Outro"
#. l10n: Thousands separator
#: js/messages.php:74 libraries/common.lib.php:1322
@ -1210,35 +1202,33 @@ msgstr "."
#: js/messages.php:78
msgid "KiB sent since last refresh"
msgstr ""
msgstr "KiB enviados desde a última atualização"
#: js/messages.php:79
msgid "KiB received since last refresh"
msgstr ""
msgstr "KiB recebidos desde a última atualização"
#: js/messages.php:80
#, fuzzy
#| msgid "Server Choice"
msgid "Server traffic (in KiB)"
msgstr "Seleção do Servidor"
msgstr "Tráfego do Servidor (em KiB)"
#: js/messages.php:81
msgid "Connections since last refresh"
msgstr ""
msgstr "Conexões desde a última atualização"
#: js/messages.php:82 server_status.php:794
msgid "Processes"
msgstr "Processos"
#: js/messages.php:83
#, fuzzy
#| msgid "Connections"
msgid "Connections / Processes"
msgstr "Conexões"
msgstr "Conexões / Processos"
#: js/messages.php:84
msgid "Issued queries since last refresh"
msgstr ""
msgstr "Consultas emitidas desde a última atualização"
#: js/messages.php:85
#, fuzzy

218
po/ru.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-24 21:23+0200\n"
"PO-Revision-Date: 2011-07-03 19:50+0200\n"
"Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
"Language-Team: russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
@ -687,10 +687,9 @@ msgid "Words are separated by a space character (\" \")."
msgstr "Слова разделяются пробелом (\" \")."
#: db_search.php:298
#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside tables:"
msgstr "В таблице/таблицах:"
msgstr "В таблицах:"
#: db_search.php:328
msgid "Inside column:"
@ -1199,41 +1198,38 @@ msgstr "."
#: js/messages.php:78
msgid "KiB sent since last refresh"
msgstr ""
msgstr "Отправлено KiB с момента последнего обновления"
#: js/messages.php:79
msgid "KiB received since last refresh"
msgstr ""
msgstr "Принято KiB с момента последнего обновления"
#: js/messages.php:80
#, fuzzy
#| msgid "Server traffic"
msgid "Server traffic (in KiB)"
msgstr "Трафик сервера"
msgstr "Трафик сервера (в KiB)"
#: js/messages.php:81
msgid "Connections since last refresh"
msgstr ""
msgstr "Соединений с момента последнего обновления"
#: js/messages.php:82 server_status.php:794
msgid "Processes"
msgstr "Процессы"
#: js/messages.php:83
#, fuzzy
#| msgid "Connections"
msgid "Connections / Processes"
msgstr "Соединения"
msgstr "Соединения / Процессы"
#: js/messages.php:84
msgid "Issued queries since last refresh"
msgstr ""
msgstr "Выполнено запросов с момента последнего обновления"
#: js/messages.php:85
#, fuzzy
#| msgid "SQL queries"
msgid "Issued queries"
msgstr "SQL запросы"
msgstr "Выполнено запросов"
#: js/messages.php:87 server_status.php:402
msgid "Query statistics"
@ -1334,13 +1330,12 @@ msgstr "Удаление"
#: js/messages.php:124
msgid "The definition of a stored function must contain a RETURN statement!"
msgstr ""
msgstr "Определение хранимой функции должно содержать выражение RETURN!"
#: js/messages.php:125
#, fuzzy
#| msgid "Missing value in the form!"
msgid "Value too long in the form!"
msgstr "Не заполнены необходимые поля формы!"
msgstr "Значение в форме имеет слишком большую длину!"
#: js/messages.php:128
msgid ""
@ -1919,7 +1914,7 @@ msgstr "Путь к файлам темы %s не найден!"
#: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40
msgid "Theme"
msgstr ""
msgstr "Тема"
#: libraries/auth/config.auth.lib.php:76
msgid "Cannot connect: invalid settings."
@ -2120,16 +2115,17 @@ msgid "Check Privileges"
msgstr "Проверить привилегии"
#: libraries/common.inc.php:587
#, fuzzy
#| msgid "Could not save configuration"
msgid "Failed to read configuration file"
msgstr "Не получилось сохранить настройки"
msgstr "Ошибка при чтении конфигурационного файла"
#: libraries/common.inc.php:588
msgid ""
"This usually means there is a syntax error in it, please check any errors "
"shown below."
msgstr ""
"Обычно это означает наличие синтаксических ошибок, пожалуйста, проверьте "
"выведенные ниже ошибки."
#: libraries/common.inc.php:595
#, php-format
@ -2375,7 +2371,7 @@ msgstr "Файлы для загрузки отсутствуют"
#: libraries/common.lib.php:2849 libraries/common.lib.php:2850
msgid "Execute"
msgstr ""
msgstr "Выполнить"
#: libraries/config.values.php:45 libraries/config.values.php:47
#: libraries/config.values.php:51
@ -3232,8 +3228,8 @@ msgid ""
"storage[/a] in documentation"
msgstr ""
"Настройка phpMyAdmin для установки расширенных возможностей. Смотрите в "
"документации раздел описывающий [a@../Documentation.html#linked-tables]"
"хранение конфигурации[/a]"
"документации раздел описывающий [a@Documentation.html#linked-tables]хранение "
"конфигурации[/a]"
#: libraries/config/messages.inc.php:206
msgid "Changes tracking"
@ -4787,22 +4783,22 @@ msgid "The %s extension is missing. Please check your PHP configuration."
msgstr "Расширение %s не найдено. Пожалуйста, проверьте ваши настройки PHP."
#: libraries/db_events.inc.php:30
#, fuzzy, php-format
#, php-format, fuzzy
#| msgid "Export contents"
msgid "Export of event %s"
msgstr "Экспортировать содержимое"
#: libraries/db_events.inc.php:34
#, fuzzy, php-format
#, php-format
#| msgid "Export contents"
msgid "Export of event \"%s\""
msgstr "Экспортировать содержимое"
msgstr "Экспорт события \"%s\""
#: libraries/db_events.inc.php:40
#, fuzzy, php-format
#, php-format
#| msgid "No tables found in database"
msgid "No event with name %s found in database %s"
msgstr "Таблиц в базе данных не найдено"
msgstr "В базе данных %2$s не найдено событие с именем %1$s"
#: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101
#: libraries/export/sql.php:609
@ -4810,10 +4806,9 @@ msgid "Events"
msgstr "События"
#: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60
#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no events to display."
msgstr "Файлы для загрузки отсутствуют"
msgstr "Отсутствуют события для отображения."
#: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:661
#: libraries/db_routines.lib.php:807 libraries/db_routines.lib.php:1156
@ -4825,25 +4820,24 @@ msgstr "Имя"
#: libraries/db_events.inc.php:129
msgid "The event scheduler is enabled"
msgstr ""
msgstr "Включен планировщик событий"
#: libraries/db_events.inc.php:129
msgid "The event scheduler is disabled"
msgstr ""
msgstr "Отключен планировщик событий"
#: libraries/db_events.inc.php:131
msgid "Turn it on"
msgstr ""
msgstr "Включить"
#: libraries/db_events.inc.php:131
msgid "Turn it off"
msgstr ""
msgstr "Выключить"
#: libraries/db_events.inc.php:141
#, fuzzy
#| msgid "Add a new server"
msgid "Add an event"
msgstr "Добавить новый сервер"
msgstr "Добавить событие"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
#: libraries/db_links.inc.php:44
@ -4879,32 +4873,29 @@ msgid "Triggers"
msgstr "Триггеры"
#: libraries/db_routines.lib.php:630
#, fuzzy
#| msgid "Details..."
msgid "Details"
msgstr "Детали..."
msgstr "Детали"
#: libraries/db_routines.lib.php:633
#, fuzzy
#| msgid "Routines"
msgid "Routine name"
msgstr "Процедуры"
msgstr "Имя процедуры"
#: libraries/db_routines.lib.php:650
#, fuzzy, php-format
#, php-format
#| msgid "Change"
msgid "Change to %s"
msgstr "Изменить"
msgstr "Изменить на %s"
#: libraries/db_routines.lib.php:655
msgid "Parameters"
msgstr ""
msgstr "Параметры"
#: libraries/db_routines.lib.php:660
#, fuzzy
#| msgid "Direct links"
msgid "Direction"
msgstr "Прямые линии связей"
msgstr "Направление"
#: libraries/db_routines.lib.php:663 libraries/tbl_properties.inc.php:105
msgid "Length/Values"
@ -4929,62 +4920,55 @@ msgid "Options"
msgstr "Параметры"
#: libraries/db_routines.lib.php:678
#, fuzzy
#| msgid "Add prefix"
msgid "Add parameter"
msgstr "Добавить префикс"
msgstr "Добавить параметр"
#: libraries/db_routines.lib.php:681
#, fuzzy
#| msgid "Remove database"
msgid "Remove last parameter"
msgstr "Удалить базу данных"
msgstr "Удалить последний параметр"
#: libraries/db_routines.lib.php:686 libraries/db_routines.lib.php:1159
msgid "Return type"
msgstr "Возвращаемый тип"
#: libraries/db_routines.lib.php:692
#, fuzzy
#| msgid "Length/Values"
msgid "Return length/values"
msgstr "Длина/значения"
msgstr "Вернуть длину/значения"
#: libraries/db_routines.lib.php:697
#, fuzzy
#| msgid "Table options"
msgid "Return options"
msgstr "Параметры таблицы"
msgstr "Вернуть параметры"
#: libraries/db_routines.lib.php:716
#, fuzzy
#| msgid "Description"
msgid "Definition"
msgstr "Описание"
msgstr "Определение"
#: libraries/db_routines.lib.php:720
msgid "Is deterministic"
msgstr ""
msgstr "Определяющий"
#: libraries/db_routines.lib.php:724
msgid "Definer"
msgstr ""
msgstr "Определитель"
#: libraries/db_routines.lib.php:729
#, fuzzy
#| msgid "Security"
msgid "Security type"
msgstr "Безопасность"
msgstr "Тип безопасности"
#: libraries/db_routines.lib.php:736
msgid "SQL data access"
msgstr ""
msgstr "Доступ к SQL данным"
#: libraries/db_routines.lib.php:800 libraries/db_routines.lib.php:803
#, fuzzy
#| msgid "Routines"
msgid "Routine parameters"
msgstr "Процедуры"
msgstr "Параметры процедуры"
#: libraries/db_routines.lib.php:810 tbl_change.php:284 tbl_change.php:322
msgid "Function"
@ -4999,59 +4983,55 @@ msgstr "Значение"
#: libraries/db_routines.lib.php:916
msgid "You must provide a routine name"
msgstr ""
msgstr "Необходимо задать имя процедуры"
#: libraries/db_routines.lib.php:935
#, php-format
msgid "Invalid direction \"%s\" given for parameter."
msgstr ""
msgstr "\"%s\" является ошибочным параметром."
#: libraries/db_routines.lib.php:946 libraries/db_routines.lib.php:987
msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
msgstr ""
"Вы должны задать длину/значения для параметров процедуры имеющих тип ENUM, "
"SET, VARCHAR и VARBINARY."
#: libraries/db_routines.lib.php:971
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
msgstr "Вы должны задать имя и тип для каждого параметра процедуры."
#: libraries/db_routines.lib.php:1028
msgid "You must provide a routine definition."
msgstr ""
msgstr "Вы должны задать определение процедуры."
#: libraries/db_routines.lib.php:1151
#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no routines to display."
msgstr "Файлы для загрузки отсутствуют"
msgstr "Нет процедур для отображения."
#: libraries/db_routines.lib.php:1192
#, fuzzy
#| msgid "Add index"
msgid "Add routine"
msgstr "Добавить индекс"
msgstr "Добавить процедуру"
#: libraries/db_routines.lib.php:1195
#, fuzzy
#| msgid "You don't have sufficient privileges to be here right now!"
msgid "You do not have the necessary privileges to create a new routine"
msgstr "Для доступа к данной странице у вас недостаточно прав!"
msgstr "У вас недостаточно прав для создания новой процедуры"
#: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084
msgid ""
"May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
"3.11[/a]"
msgstr ""
"Может быть приблизительно. Смотрите [a@./Documentation."
"html#faq3_11@Documentation]FAQ 3.11[/a]"
"Может быть примерно. Смотрите "
"[a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]"
#: libraries/dbi/mysql.dbi.lib.php:111 libraries/dbi/mysqli.dbi.lib.php:112
msgid "Connection for controluser as defined in your configuration failed."
msgstr ""
"Не удалось установить подключение для пользователя указанного в директиве "
"controluser, с помощью параметров определенных в конфигурационном файле "
"config.inc.php."
msgstr "Ошибка при указании соединения для controluser в конфигурации."
#: libraries/dbi/mysql.dbi.lib.php:324 libraries/dbi/mysql.dbi.lib.php:326
#: libraries/dbi/mysqli.dbi.lib.php:351
@ -5060,7 +5040,7 @@ msgstr "Сервер не отвечает"
#: libraries/dbi/mysql.dbi.lib.php:324 libraries/dbi/mysqli.dbi.lib.php:351
msgid "(or the local MySQL server's socket is not correctly configured)"
msgstr "(либо сокет локального MySQL-сервера некорректно настроен)"
msgstr "(либо локальный сокет MySQL неверно настроен)"
#: libraries/dbi/mysql.dbi.lib.php:333
msgid "Details..."
@ -5460,15 +5440,15 @@ msgstr "Преобразование"
#: libraries/display_tbl.lib.php:650
msgid "Geometry"
msgstr ""
msgstr "Геометрия"
#: libraries/display_tbl.lib.php:651
msgid "Well Known Text"
msgstr ""
msgstr "Текст (WKT)"
#: libraries/display_tbl.lib.php:652
msgid "Well Known Binary"
msgstr ""
msgstr "Бинарный (WKB)"
#: libraries/display_tbl.lib.php:1303
msgid "Copy"
@ -5514,7 +5494,7 @@ msgstr "Отобразить график"
#: libraries/display_tbl.lib.php:2509
msgid "Visualize GIS data"
msgstr ""
msgstr "Визуализация GIS данных"
#: libraries/display_tbl.lib.php:2529
msgid "Create view"
@ -5525,27 +5505,26 @@ msgid "Link not found"
msgstr "Связь не найдена"
#: libraries/display_triggers.inc.php:35
#, fuzzy, php-format
#, php-format
#| msgid "Export contents"
msgid "Export of trigger %s"
msgstr "Экспортировать содержимое"
msgstr "Экспорт триггера %s"
#: libraries/display_triggers.inc.php:39
#, php-format
msgid "Export of trigger \"%s\""
msgstr ""
msgstr "Экспорт триггера \"%s\""
#: libraries/display_triggers.inc.php:47
#, fuzzy, php-format
#, php-format
#| msgid "No valid image path for theme %s found!"
msgid "No trigger with name %s found"
msgstr "Не найден правильный путь к изображениям для темы %s!"
msgstr "Не найден триггер с именем %s"
#: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66
#, fuzzy
#| msgid "There are no files to upload"
msgid "There are no triggers to display."
msgstr "Файлы для загрузки отсутствуют"
msgstr "Отсутствуют триггеры для отображения."
#: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943
msgid "Time"
@ -5556,10 +5535,9 @@ msgid "Event"
msgstr "Событие"
#: libraries/display_triggers.inc.php:120
#, fuzzy
#| msgid "Add a new server"
msgid "Add a trigger"
msgstr "Добавить новый сервер"
msgstr "Добавить триггер"
#: libraries/engines/bdb.lib.php:20 main.php:211
msgid "Version information"
@ -6327,10 +6305,9 @@ msgid "Open new phpMyAdmin window"
msgstr "Открыть phpMyAdmin в новом окне"
#: libraries/gis_visualization.lib.php:129
#, fuzzy
#| msgid "No data found for the chart."
msgid "No data found for GIS visualization."
msgstr "Данные для графика не найдены."
msgstr "Данные для визуализации GIS не найдены."
#: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
msgid "SQL result"
@ -7338,10 +7315,9 @@ msgid "PARTITION definition"
msgstr "Определение разделов (PARTITION)"
#: libraries/tbl_properties.inc.php:776
#, fuzzy
#| msgid "+ Add a new value"
msgid "+ Add a value"
msgstr "+ Добавить новое значение"
msgstr "+ Добавить значение"
#: libraries/transformations/application_octetstream__download.inc.php:9
msgid ""
@ -8683,22 +8659,22 @@ msgid "Refresh rate"
msgstr "Частота обновления"
#: server_status.php:31
#, fuzzy, php-format
#, php-format
#| msgid "minutes"
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "минуты"
msgstr[1] "минуты"
msgstr[2] "минуты"
msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
#: server_status.php:33
#, fuzzy, php-format
#, php-format
#| msgid "second"
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "секунда"
msgstr[1] "секунда"
msgstr[2] "секунда"
msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
#: server_status.php:134
#, php-format
@ -8782,10 +8758,9 @@ msgid "All status variables"
msgstr "Все переменные состояния"
#: server_status.php:413 server_status.php:439
#, fuzzy
#| msgid "Refresh rate"
msgid "Refresh rate:"
msgstr "Частота обновления"
msgstr "Частота обновления:"
#: server_status.php:462
msgid "Containing the word:"
@ -9228,7 +9203,7 @@ msgstr "Количество записей с помощью fsync(), сдел
#: server_status.php:906
msgid "The number of pending log file fsyncs."
msgstr ""
"Количество незавершенных попыток синхронизации с помощью операции fsync()."
"Количество незавершенных попыток синхронизации с помощью операции fsync."
#: server_status.php:907
msgid "Pending log file writes."
@ -9382,7 +9357,7 @@ msgstr "Количество открытых файлов."
msgid "The number of streams that are open (used mainly for logging)."
msgstr ""
"Количество открытых потоков (применяется к файлам журналов). Потоком "
"называется файл, открытый с помощью функции fopen()."
"называется файл, открытый с помощью функции fopen."
#: server_status.php:935
msgid "The number of tables that are open."
@ -9700,7 +9675,7 @@ msgstr ""
#: server_variables.php:58
msgid "Setting variable failed"
msgstr ""
msgstr "Не удалось установить переменную"
#: server_variables.php:77
msgid "Server variables and settings"
@ -10213,10 +10188,9 @@ msgid "View dump (schema) of table"
msgstr "Отобразить дамп (схему) таблицы"
#: tbl_gis_visualization.php:111
#, fuzzy
#| msgid "Display servers selection"
msgid "Display GIS Visualization"
msgstr "Отображать выбор сервера"
msgstr "Визуализация GIS данных"
#: tbl_gis_visualization.php:157
msgid "Width"
@ -10227,42 +10201,37 @@ msgid "Height"
msgstr "Высота"
#: tbl_gis_visualization.php:165
#, fuzzy
#| msgid "Textarea columns"
msgid "Label column"
msgstr "Столбцов в текстовом поле"
msgstr "Название столбца"
#: tbl_gis_visualization.php:167
#, fuzzy
#| msgid "- none -"
msgid "-- None --"
msgstr "- не выбран -"
msgstr "-- Пусто --"
#: tbl_gis_visualization.php:180
#, fuzzy
#| msgid "Total count"
msgid "Spatial column"
msgstr "Общее количество"
msgstr "Пространственный столбец"
#: tbl_gis_visualization.php:201
msgid "Use OpenStreetMaps as Base Layer"
msgstr ""
msgstr "Используйте в качестве основного слоя OpenStreetMaps"
#: tbl_gis_visualization.php:204
msgid "Redraw"
msgstr "Пересоздать"
#: tbl_gis_visualization.php:206
#, fuzzy
#| msgid "Save as file"
msgid "Save to file"
msgstr "Сохранить как файл"
msgstr "Сохранить в файл"
#: tbl_gis_visualization.php:207
#, fuzzy
#| msgid "Table name"
msgid "File name"
msgstr "Имя таблицы"
msgstr "Имя файла"
#: tbl_indexes.php:66
msgid "The name of the primary key must be \"PRIMARY\"!"
@ -10295,7 +10264,7 @@ msgstr "Тип индекса&nbsp;:"
#: tbl_indexes.php:189
msgid ""
"(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
msgstr "(Имя \"PRIMARY\" должен иметь <b>только</b> первичный индекс!)"
msgstr "(Имя \"PRIMARY\" <b>должен</b> иметь <b>только</b> первичный индекс!)"
#: tbl_indexes.php:263
#, php-format
@ -10505,7 +10474,7 @@ msgstr "Сортировка:"
#: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611
msgid "Spatial"
msgstr ""
msgstr "Пространственный"
#: tbl_structure.php:165 tbl_structure.php:169
msgid "Browse distinct values"
@ -10524,10 +10493,9 @@ msgid "Add unique index"
msgstr "Добавить уникальный индекс"
#: tbl_structure.php:176 tbl_structure.php:177
#, fuzzy
#| msgid "Add index"
msgid "Add SPATIAL index"
msgstr "Добавить индекс"
msgstr "Добавить пространственный индекс"
#: tbl_structure.php:178 tbl_structure.php:179
msgid "Add FULLTEXT index"

View File

@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-25 10:41+0200\n"
"PO-Revision-Date: 2011-07-03 19:04+0200\n"
"Last-Translator: Domen <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53
@ -4780,10 +4780,9 @@ msgid "Turn it off"
msgstr "Izklopi ga"
#: libraries/db_events.inc.php:141
#, fuzzy
#| msgid "Add a new Event"
msgid "Add an event"
msgstr "Dodaj nov dogodek"
msgstr "Dodaj dogodek"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
#: libraries/db_links.inc.php:44
@ -5467,10 +5466,9 @@ msgid "Event"
msgstr "Dogodek"
#: libraries/display_triggers.inc.php:120
#, fuzzy
#| msgid "Add a new Trigger"
msgid "Add a trigger"
msgstr "Dodaj nov sprožilec"
msgstr "Dodaj sprožilec"
#: libraries/engines/bdb.lib.php:20 main.php:211
msgid "Version information"
@ -7242,10 +7240,9 @@ msgid "PARTITION definition"
msgstr "Definicija PARTITION"
#: libraries/tbl_properties.inc.php:776
#, fuzzy
#| msgid "+ Add a new value"
msgid "+ Add a value"
msgstr "+ Dodaj novo vrednost"
msgstr "+ Dodaj vrednost"
#: libraries/transformations/application_octetstream__download.inc.php:9
msgid ""

129
po/uk.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-07-03 07:35-0400\n"
"PO-Revision-Date: 2011-06-17 10:55+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"PO-Revision-Date: 2011-07-03 18:10+0200\n"
"Last-Translator: <vovka2008@gmail.com>\n"
"Language-Team: ukrainian <uk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -538,10 +538,9 @@ msgstr "Відповідь MySQL: "
#: db_routines.php:210 db_routines.php:242 db_routines.php:270
#: db_routines.php:409
#, fuzzy
#| msgid "Processing Request"
msgid "Error in processing request"
msgstr "Обробка запиту"
msgstr "Помилка при обробці запиту"
#: db_routines.php:211 db_routines.php:243 db_routines.php:271
#: db_routines.php:410
@ -833,10 +832,9 @@ msgid "Replace table prefix"
msgstr "Замінити дані таблиці даними з файлу"
#: db_structure.php:518 libraries/mult_submits.inc.php:251
#, fuzzy
#| msgid "Replace table data with file"
msgid "Copy table with prefix"
msgstr "Замінити дані таблиці даними з файлу"
msgstr "Копіювати таблицю з префіксом"
#: db_structure.php:560 libraries/schema/User_Schema.class.php:383
msgid "Data Dictionary"
@ -861,15 +859,15 @@ msgstr "БД"
#: db_tracking.php:86
msgid "Last version"
msgstr ""
msgstr "Остання версія"
#: db_tracking.php:87 tbl_tracking.php:645
msgid "Created"
msgstr ""
msgstr "Створено"
#: db_tracking.php:88 tbl_tracking.php:646
msgid "Updated"
msgstr ""
msgstr "Оновлено"
#: db_tracking.php:89 libraries/server_links.inc.php:51 server_status.php:801
#: sql.php:942 tbl_tracking.php:647
@ -919,7 +917,7 @@ msgstr ""
#: db_tracking.php:229
msgid "Database Log"
msgstr ""
msgstr "Журнал бази даних"
#: enum_editor.php:21 libraries/tbl_properties.inc.php:773
#, php-format
@ -1081,7 +1079,7 @@ msgstr ""
#: js/messages.php:37
msgid "This operation could take a long time. Proceed anyway?"
msgstr ""
msgstr "Ця операція може зайняти багато часу. Продовжити ?"
#: js/messages.php:40
msgid "You are about to DISABLE a BLOB Repository!"
@ -1125,10 +1123,9 @@ msgstr "Паролі не однакові!"
#: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703
#: server_privileges.php:2108 server_privileges.php:2302
#, fuzzy
#| msgid "Any user"
msgid "Add user"
msgstr "Довільний користувач"
msgstr "Додати користувача"
#: js/messages.php:57
msgid "Reloading Privileges"
@ -1141,7 +1138,7 @@ msgstr "Видалити відмічених користувачів"
#: js/messages.php:59 libraries/tbl_properties.inc.php:772
#: tbl_tracking.php:244 tbl_tracking.php:409
msgid "Close"
msgstr ""
msgstr "Закрити"
#: js/messages.php:62 js/messages.php:134 libraries/Index.class.php:459
#: libraries/common.lib.php:566 libraries/common.lib.php:1097
@ -1183,7 +1180,7 @@ msgstr "Разом"
#. l10n: Other, small valued, queries
#: js/messages.php:72 server_status.php:602
msgid "Other"
msgstr ""
msgstr "Інше"
#. l10n: Thousands separator
#: js/messages.php:74 libraries/common.lib.php:1322
@ -1218,10 +1215,9 @@ msgid "Processes"
msgstr "Процеси"
#: js/messages.php:83
#, fuzzy
#| msgid "Connections"
msgid "Connections / Processes"
msgstr "З'єднань"
msgstr "З'єднань / Процесів"
#: js/messages.php:84
msgid "Issued queries since last refresh"
@ -1239,11 +1235,11 @@ msgstr "Статистика запиту"
#: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593
#: pmd_general.php:669 pmd_general.php:723 pmd_general.php:786
msgid "Cancel"
msgstr ""
msgstr "Скасувати"
#: js/messages.php:94
msgid "Loading"
msgstr ""
msgstr "Завантаження"
#: js/messages.php:95
msgid "Processing Request"
@ -1252,7 +1248,7 @@ msgstr "Обробка запиту"
#: js/messages.php:96 libraries/db_events.inc.php:39
#: libraries/display_triggers.inc.php:46 libraries/import/ods.php:80
msgid "Error in Processing Request"
msgstr ""
msgstr "Помилка при обробці запиту"
#: js/messages.php:97
msgid "Dropping Column"
@ -1293,10 +1289,9 @@ msgid "Create Table"
msgstr "Створити Таблицю"
#: js/messages.php:112
#, fuzzy
#| msgid "Use Tables"
msgid "Insert Table"
msgstr "Використовувати таблиці"
msgstr "Вставити таблицю"
#: js/messages.php:113
#, fuzzy
@ -1315,16 +1310,14 @@ msgid "Searching"
msgstr "Пошук"
#: js/messages.php:118
#, fuzzy
#| msgid "Hide search criteria"
msgid "Hide search results"
msgstr "Сховати критерії пошуку"
msgstr "Сховати результати пошуку"
#: js/messages.php:119
#, fuzzy
#| msgid "Show search criteria"
msgid "Show search results"
msgstr "Показати критерії пошуку"
msgstr "Показати результати пошуку"
#: js/messages.php:120
#, fuzzy
@ -1376,11 +1369,11 @@ msgstr "Зберегти"
#: js/messages.php:136 libraries/display_tbl.lib.php:645 pmd_general.php:158
#: tbl_change.php:316 tbl_change.php:322
msgid "Hide"
msgstr ""
msgstr "Приховати"
#: js/messages.php:137 tbl_row_action.php:28
msgid "No rows selected"
msgstr ""
msgstr "Рядків не вибрано"
#: js/messages.php:138 libraries/display_tbl.lib.php:2347 querywindow.php:90
#: querywindow.php:94 querywindow.php:97 tbl_structure.php:152
@ -1433,7 +1426,7 @@ msgstr "Згенерувати пароль"
#: js/messages.php:159 libraries/replication_gui.lib.php:364
msgid "Generate"
msgstr ""
msgstr "Згенерувати"
#: js/messages.php:160
msgid "Change Password"
@ -1607,11 +1600,11 @@ msgstr "Вівторок"
#: js/messages.php:239
msgid "Wednesday"
msgstr ""
msgstr "Середа"
#: js/messages.php:240
msgid "Thursday"
msgstr ""
msgstr "Четвер"
#: js/messages.php:241
msgid "Friday"
@ -1619,7 +1612,7 @@ msgstr "П'ятниця"
#: js/messages.php:242
msgid "Saturday"
msgstr ""
msgstr "Субота"
#. l10n: Short week day name
#: js/messages.php:246 libraries/common.lib.php:1483
@ -1710,7 +1703,7 @@ msgstr "Секунда"
#: libraries/Config.class.php:1158
msgid "Font size"
msgstr ""
msgstr "Розмір шрифту"
#: libraries/File.class.php:279
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@ -1732,7 +1725,7 @@ msgstr ""
#: libraries/File.class.php:291
msgid "Failed to write file to disk."
msgstr ""
msgstr "Неможливо записати файл на диск."
#: libraries/File.class.php:294
msgid "File upload stopped by extension."
@ -1740,7 +1733,7 @@ msgstr ""
#: libraries/File.class.php:297
msgid "Unknown error in file upload."
msgstr ""
msgstr "Невідома помилка при завантаженні файлу."
#: libraries/File.class.php:499
msgid ""
@ -1774,7 +1767,7 @@ msgstr "Кількість елементів"
#: libraries/Index.class.php:439 libraries/db_routines.lib.php:748
#: tbl_tracking.php:272 tbl_tracking.php:321
msgid "Comment"
msgstr ""
msgstr "Коментар"
#: libraries/Index.class.php:465
msgid "The primary key has been dropped"
@ -1866,7 +1859,7 @@ msgstr ""
#: libraries/Table.class.php:1050 tbl_get_field.php:25
msgid "Invalid table name"
msgstr ""
msgstr "Неправильна назва таблиці"
#: libraries/Table.class.php:1065
#, php-format
@ -1961,7 +1954,7 @@ msgstr ""
#: libraries/auth/cookie.auth.lib.php:211
msgid "Server:"
msgstr ""
msgstr "Сервер:"
#: libraries/auth/cookie.auth.lib.php:216
msgid "Username:"
@ -1983,7 +1976,7 @@ msgstr "З цього моменту Cookies повинні бути дозво
#: libraries/auth/signon.auth.lib.php:234
msgid ""
"Login without a password is forbidden by configuration (see AllowNoPassword)"
msgstr ""
msgstr "Авторизація без паролю заборонена в настройках (див. AllowNoPassword)"
#: libraries/auth/cookie.auth.lib.php:568
#: libraries/auth/signon.auth.lib.php:238
@ -2021,7 +2014,7 @@ msgstr ""
#: libraries/auth/swekey/swekey.auth.lib.php:202
msgid "Authenticating..."
msgstr ""
msgstr "Авторизуємося..."
#: libraries/blobstreaming.lib.php:236
msgid "PBMS error"
@ -2111,7 +2104,7 @@ msgstr "Перевірити права"
#: libraries/common.inc.php:587
msgid "Failed to read configuration file"
msgstr ""
msgstr "Неможливо прочитати конфігураційний файл."
#: libraries/common.inc.php:588
msgid ""
@ -2218,7 +2211,7 @@ msgstr "Створити PHP код"
#: libraries/common.lib.php:1131 libraries/config/messages.inc.php:475
#: server_status.php:410 server_status.php:436 server_status.php:457
msgid "Refresh"
msgstr ""
msgstr "Оновити"
#: libraries/common.lib.php:1140
msgid "Skip Validate SQL"
@ -2359,7 +2352,7 @@ msgstr ""
#: libraries/common.lib.php:2849 libraries/common.lib.php:2850
msgid "Execute"
msgstr ""
msgstr "Виконати"
#: libraries/config.values.php:45 libraries/config.values.php:47
#: libraries/config.values.php:51
@ -2383,10 +2376,9 @@ msgid "Open"
msgstr ""
#: libraries/config.values.php:75
#, fuzzy
#| msgid "Unclosed quote"
msgid "Closed"
msgstr "Не закриті лапки"
msgstr "Закрито"
#: libraries/config.values.php:96 libraries/export/htmlword.php:25
#: libraries/export/latex.php:42 libraries/export/odt.php:34
@ -2454,7 +2446,7 @@ msgstr ""
#: libraries/config/FormDisplay.class.php:535
#: libraries/config/validate.lib.php:352 libraries/config/validate.lib.php:439
msgid "Incorrect value"
msgstr ""
msgstr "Некоректне значення"
#: libraries/config/FormDisplay.class.php:87
#: libraries/config/validate.lib.php:453
@ -2535,10 +2527,9 @@ msgid "Improves efficiency of screen refresh"
msgstr ""
#: libraries/config/messages.inc.php:18
#, fuzzy
#| msgid "Enabled"
msgid "Enable Ajax"
msgstr "дозволено"
msgstr "Дозволити Ajax"
#: libraries/config/messages.inc.php:19
msgid ""
@ -2598,7 +2589,7 @@ msgstr ""
#: libraries/config/messages.inc.php:31
msgid "Bzip2"
msgstr ""
msgstr "Bzip2"
#: libraries/config/messages.inc.php:32
msgid ""
@ -2766,7 +2757,7 @@ msgstr ""
#: libraries/config/messages.inc.php:69
msgid "Maximum execution time"
msgstr ""
msgstr "Максимальний час виконання"
#: libraries/config/messages.inc.php:70 prefs_manage.php:299
msgid "Save as file"
@ -2891,7 +2882,7 @@ msgstr "Метод експорту"
#: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116
msgid "Save on server"
msgstr ""
msgstr "Зберегти на сервері"
#: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117
#: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
@ -3006,15 +2997,15 @@ msgstr "CSV дані"
#: libraries/config/messages.inc.php:160
msgid "Developer"
msgstr ""
msgstr "Розробник"
#: libraries/config/messages.inc.php:161
msgid "Settings for phpMyAdmin developers"
msgstr ""
msgstr "Параметри для розробників phpMyAdmin"
#: libraries/config/messages.inc.php:162
msgid "Edit mode"
msgstr ""
msgstr "Режим редагування"
#: libraries/config/messages.inc.php:163
msgid "Customize edit mode"
@ -3045,7 +3036,7 @@ msgstr ""
#: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89
#: prefs_manage.php:231 setup/frames/menu.inc.php:20
msgid "Import"
msgstr ""
msgstr "Імпорт"
#: libraries/config/messages.inc.php:171
msgid "Import defaults"
@ -3057,7 +3048,7 @@ msgstr ""
#: libraries/config/messages.inc.php:173
msgid "Import / export"
msgstr ""
msgstr "Імпорт / Експорт"
#: libraries/config/messages.inc.php:174
msgid "Set import and export directories and compression options"
@ -3082,7 +3073,7 @@ msgstr ""
#: libraries/config/messages.inc.php:181 libraries/select_server.lib.php:36
#: setup/frames/index.inc.php:110
msgid "Servers"
msgstr ""
msgstr "Сервери"
#: libraries/config/messages.inc.php:182
msgid "Servers display options"
@ -3098,7 +3089,7 @@ msgstr ""
#: libraries/config/messages.inc.php:186
msgid "Microsoft Office"
msgstr ""
msgstr "Microsoft Office"
#: libraries/config/messages.inc.php:188
msgid "Open Document"
@ -3106,7 +3097,7 @@ msgstr "Відкрити Документ"
#: libraries/config/messages.inc.php:190
msgid "Other core settings"
msgstr ""
msgstr "Інші параметри ядра"
#: libraries/config/messages.inc.php:191
msgid "Settings that didn't fit enywhere else"
@ -3136,7 +3127,7 @@ msgstr ""
#: libraries/config/messages.inc.php:196
msgid "Security"
msgstr ""
msgstr "Безпека"
#: libraries/config/messages.inc.php:197
msgid ""
@ -3154,11 +3145,11 @@ msgstr "Аутентифікація"
#: libraries/config/messages.inc.php:200
msgid "Authentication settings"
msgstr ""
msgstr "Параметри аутентифікації"
#: libraries/config/messages.inc.php:201
msgid "Server configuration"
msgstr ""
msgstr "Конфігурація сервера"
#: libraries/config/messages.inc.php:202
msgid ""
@ -3280,11 +3271,11 @@ msgstr ""
#: libraries/config/messages.inc.php:233
msgid "GZip"
msgstr ""
msgstr "GZip"
#: libraries/config/messages.inc.php:234
msgid "Extra parameters for iconv"
msgstr ""
msgstr "Додаткові параметри для iconv"
#: libraries/config/messages.inc.php:235
msgid ""
@ -3338,7 +3329,7 @@ msgstr "Імена колонок і першому рядку"
#: libraries/config/messages.inc.php:255 libraries/import/ods.php:27
msgid "Do not import empty rows"
msgstr ""
msgstr "Не імпортувати пусті рядки"
#: libraries/config/messages.inc.php:256
msgid "Import currencies ($5.00 to 5.00)"
@ -3358,7 +3349,7 @@ msgstr ""
#: libraries/config/messages.inc.php:261
msgid "Do not use AUTO_INCREMENT for zero values"
msgstr ""
msgstr "Не використовувати AUTO_INCREMENT для нульових значень"
#: libraries/config/messages.inc.php:264
msgid "Initial state for sliders"
@ -3598,7 +3589,7 @@ msgstr ""
#: libraries/config/messages.inc.php:318
msgid "Memory limit"
msgstr ""
msgstr "Ліміт пам'яті"
#: libraries/config/messages.inc.php:319
msgid "These are Edit, Inline edit, Copy and Delete links"
@ -3776,11 +3767,11 @@ msgstr ""
#: libraries/config/messages.inc.php:363
msgid "Allow logins without a password"
msgstr ""
msgstr "Дозволити авторизацію без паролю"
#: libraries/config/messages.inc.php:364
msgid "Allow root login"
msgstr ""
msgstr "Дозволити авторизацію для root"
#: libraries/config/messages.inc.php:365
msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"

View File

@ -19,6 +19,9 @@ require_once './libraries/common.lib.php';
*/
require_once './libraries/db_table_exists.lib.php';
// load additional configuration variables
require_once './libraries/data_mysql.inc.php';
/**
* Sets global variables.
* Here it's better to use a if, instead of the '?' operator

View File

@ -129,31 +129,57 @@ if (! isset($param) || $param[0] == '') {
<td><?php echo $fields_collation[$i]; ?></td>
<td><select name="func[]">
<?php
// determine valid operators
if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
echo "\n" . ' '
. '<option value="' . htmlspecialchars($fc) . '">'
. htmlspecialchars($fc) . '</option>';
}
// enum operators
$operators = array(
'=',
'!=',
);
} elseif (preg_match('@char|blob|text|set@i', $fields_type[$i])) {
foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
echo "\n" . ' '
. '<option value="' . htmlspecialchars($fc) . '">'
. htmlspecialchars($fc) . '</option>';
}
// text operators
$operators = array(
'LIKE',
'LIKE %...%',
'NOT LIKE',
'=',
'!=',
'REGEXP',
'REGEXP ^...$',
'NOT REGEXP',
"= ''",
"!= ''",
'IN (...)',
'NOT IN (...)',
'BETWEEN',
'NOT BETWEEN',
);
} else {
foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
echo "\n" . ' '
. '<option value="' . htmlspecialchars($fc) . '">'
. htmlspecialchars($fc) . '</option>';
}
// numeric operators
$operators = array(
'=',
'>',
'>=',
'<',
'<=',
'!=',
'LIKE',
'NOT LIKE',
'IN (...)',
'NOT IN (...)',
'BETWEEN',
'NOT BETWEEN',
);
} // end if... else...
// if field can be NULL, add IS NULL and IS NOT NULL
if ($fields_null[$i]) {
foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
echo "\n" . ' '
. '<option value="' . htmlspecialchars($fc) . '">'
. htmlspecialchars($fc) . '</option>';
}
$operators[] = 'IS NULL';
$operators[] = 'IS NOT NULL';
}
foreach ($operators as $op) {
echo "\n" . ' '
. '<option value="' . htmlspecialchars($op) . '">' . htmlspecialchars($op) . '</option>';
}
?>
@ -327,11 +353,17 @@ else {
$sql_query .= ' WHERE ' . $where;
} else {
$w = $charsets = array();
$unary_operators = array(
'IS NULL' => 1,
'IS NOT NULL' => 1,
"= ''" => 1,
"!= ''" => 1
);
$cnt_func = count($func);
reset($func);
while (list($i, $func_type) = each($func)) {
list($charsets[$i]) = explode('_', $collations[$i]);
if (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) {
if (isset($unary_operators[$func_type])) {
$fields[$i] = '';
$w[] = PMA_backquote($names[$i]) . ' ' . $func_type;

View File

@ -5,3 +5,4 @@
/* Component containers
----------------------------------*/
.ui-widget { font-size: 1em; }
#ui-timepicker-div { z-index: 1003; }

View File

@ -5,3 +5,4 @@
/* Component containers
----------------------------------*/
.ui-widget { font-size: 1em; }
#ui-timepicker-div { z-index: 1003; }