Merge branch 'master' into plugins-and-OOP

This commit is contained in:
Alex Marin 2012-07-17 14:01:54 +03:00
commit 26f0a4ebf0
35 changed files with 2539 additions and 1757 deletions

View File

@ -49,6 +49,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done
- bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed
- bug #3526916 [interface] Search fails with JS error when tooltips disabled
- bug #3544366 [interface] Event comments not saved
3.5.2.0 (2012-07-07)
- bug #3521416 [interface] JS error when editing index

View File

@ -1561,7 +1561,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dt id="cfg_ShowTooltipAliasDB">$cfg['ShowTooltipAliasDB'] boolean</dt>
<dd>If tool-tips are enabled and a DB comment is set, this will flip the
comment and the real name. That means that if you have a table called
comment and the real name. That means that if you have a database called
'user0001' and add the comment 'MyName' on it, you will see the name
'MyName' used consequently in the left frame and the tool-tip shows
the real name of the DB.</dd>

View File

@ -317,14 +317,14 @@ class Advisor
// Actually evaluate the code
ob_start();
eval('$value = '.$expr.';');
eval('$value = ' . $expr . ';');
$err = ob_get_contents();
ob_end_clean();
// Error handling
if ($err) {
throw new Exception(
strip_tags($err) . '<br />Executed code: $value = ' . $expr . ';'
strip_tags($err) . '<br />Executed code: $value = ' . htmlspecialchars($expr) . ';'
);
}
return $value;

View File

@ -9,12 +9,12 @@
/**
* Misc functions used all over the scripts.
*
*
* @package PhpMyAdmin
*/
class PMA_CommonFunctions
{
/**
* PMA_CommonFunctions instance
*
@ -23,8 +23,8 @@ class PMA_CommonFunctions
* @var object
*/
private static $_instance;
/**
* Creates a new class instance
*
@ -33,8 +33,8 @@ class PMA_CommonFunctions
private function __construct()
{
}
/**
* Returns the singleton PMA_CommonFunctions object
*
@ -47,7 +47,7 @@ class PMA_CommonFunctions
}
return self::$_instance;
}
/**
* Detects which function to use for pow.
@ -168,6 +168,10 @@ class PMA_CommonFunctions
public function getImage($image, $alternate = '', $attributes = array())
{
static $sprites; // cached list of available sprites (if any)
if (defined(TESTSUITE)) {
// prevent caching in testsuite
unset($sprites);
}
$url = '';
$is_sprite = false;
@ -1306,10 +1310,10 @@ class PMA_CommonFunctions
$php_link = ' [' . $this->linkOrButton($php_link, $_message) . ']';
if (isset($GLOBALS['show_as_php'])) {
$runquery_link = 'import.php'
. PMA_generate_common_url($url_params);
$php_link .= ' ['
. $this->linkOrButton($runquery_link, __('Submit Query'))
. ']';
@ -2172,7 +2176,7 @@ class PMA_CommonFunctions
* would have to check if the error message file is always available
*
* @param array $params The names of the parameters needed by the calling script
* @param bool $request Whether to include this list in checking for
* @param bool $request Whether to include this list in checking for
* special params
*
* @return void
@ -2348,19 +2352,19 @@ class PMA_CommonFunctions
} else {
$con_val = '= \''
. $this->sqlAddSlashes($row[$i], false, true) . '\'';
}
}
}
if ($con_val != null) {
$condition .= $con_val . ' AND';
if ($meta->primary_key > 0) {
if ($meta->primary_key > 0) {
$primary_key .= $condition;
$primary_key_array[$con_key] = $con_val;
} elseif ($meta->unique_key > 0) {
$primary_key_array[$con_key] = $con_val;
} elseif ($meta->unique_key > 0) {
$unique_key .= $condition;
$unique_key_array[$con_key] = $con_val;
$unique_key_array[$con_key] = $con_val;
}
$nonprimary_condition .= $condition;
@ -2373,18 +2377,18 @@ class PMA_CommonFunctions
// but use conjunction of all values if no primary key
$clause_is_unique = true;
if ($primary_key) {
if ($primary_key) {
$preferred_condition = $primary_key;
$condition_array = $primary_key_array;
} elseif ($unique_key) {
} elseif ($unique_key) {
$preferred_condition = $unique_key;
$condition_array = $unique_key_array;
} elseif (! $force_unique) {
} elseif (! $force_unique) {
$preferred_condition = $nonprimary_condition;
$condition_array = $nonprimary_condition_array;
$clause_is_unique = false;
$clause_is_unique = false;
}
$where_clause = trim(preg_replace('|\s?AND$|', '', $preferred_condition));
@ -2636,7 +2640,7 @@ class PMA_CommonFunctions
. PMA_generate_common_url($_url_params) . '" target="'
. $frame . '">' . $caption1 . '</a>';
$_url_params['pos'] = $pos - $max_count;
$_url_params['pos'] = $pos - $max_count;
$list_navigator_html .= '<a' . $title2 . ' href="' . $script
. PMA_generate_common_url($_url_params) . '" target="'
. $frame . '">' . $caption2 . '</a>';
@ -2758,8 +2762,8 @@ class PMA_CommonFunctions
*/
public function getExternalBug(
$functionality, $component, $minimum_version, $bugref
) {
$ext_but_html = '';
) {
$ext_but_html = '';
if (($component == 'mysql') && (PMA_MYSQL_INT_VERSION < $minimum_version)) {
$ext_but_html .= $this->showHint(
sprintf(
@ -2768,7 +2772,7 @@ class PMA_CommonFunctions
PMA_linkURL('http://bugs.mysql.com/') . $bugref
)
);
}
}
return $ext_but_html;
}
@ -3447,7 +3451,7 @@ class PMA_CommonFunctions
/* Optional escaping */
if (! is_null($escape)) {
foreach ($replace as $key => $val) {
foreach ($replace as $key => $val) {
$replace[$key] = ($escape == 'backquote')
? $this->$escape($val)
: $escape($val);
@ -4198,7 +4202,7 @@ class PMA_CommonFunctions
return $values;
}
}
?>

View File

@ -93,19 +93,6 @@ class PMA_DbSearch
$this->_setSearchParams();
}
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

File diff suppressed because it is too large Load Diff

View File

@ -40,20 +40,6 @@ class PMA_Menu
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

View File

@ -68,20 +68,6 @@ class PMA_Table
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

View File

@ -83,20 +83,6 @@ class PMA_TableSearch
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

View File

@ -54,21 +54,20 @@ function PMA_getFormParametersForInsertForm($db, $table, $where_clauses,
*/
function PMA_getStuffForEditMode($where_clause, $table, $db)
{
$found_unique_key = false;
if (isset($where_clause)) {
$where_clause_array = PMA_getWhereClauseArray($where_clause);
list($whereClauses, $resultArray, $rowsArray, $found_unique_key)
= PMA_analyzeWhereClauses(
$where_clause_array, $table, $db, $found_unique_key
$where_clause_array, $table, $db
);
return array(
false, $whereClauses,
$resultArray, $rowsArray,
$where_clause_array, $found_unique_key
);
);
} else {
list($results, $row) = PMA_loadFirstRowInEditMode($table, $db);
return array(true, null, $results, $row, null, $found_unique_key);
return array(true, null, $results, $row, null, false);
}
}
@ -93,34 +92,35 @@ function PMA_getWhereClauseArray($where_clause)
/**
* Analysing where clauses array
*
* @param array $where_clause_array array of where clauses
* @param string $table name of the table
* @param string $db name of the database
* @param boolean $found_unique_key boolean variable for unique key
* @param array $where_clause_array array of where clauses
* @param string $table name of the table
* @param string $db name of the database
*
* @return array $where_clauses, $result, $rows
*/
function PMA_analyzeWhereClauses(
$where_clause_array, $table, $db, $found_unique_key
$where_clause_array, $table, $db
) {
$rows = array();
$result = array();
$where_clauses = array();
$found_unique_key = false;
foreach ($where_clause_array as $key_id => $where_clause) {
$local_query = 'SELECT * FROM '
$local_query = 'SELECT * FROM '
. PMA_CommonFunctions::getInstance()->backquote($db) . '.'
. PMA_CommonFunctions::getInstance()->backquote($table)
. ' WHERE ' . $where_clause . ';';
$result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]);
$result[$key_id] = PMA_DBI_query($local_query, null, PMA_DBI_QUERY_STORE);
$rows[$key_id] = PMA_DBI_fetch_assoc($result[$key_id]);
$where_clauses[$key_id] = str_replace('\\', '\\\\', $where_clause);
$found_unique_key = PMA_showEmptyResultMessageOrSetUniqueCondition(
$rows, $key_id,
$where_clause_array, $local_query,
$result, $found_unique_key
$has_unique_condition = PMA_showEmptyResultMessageOrSetUniqueCondition(
$rows, $key_id, $where_clause_array, $local_query, $result
);
if ($has_unique_condition) {
$found_unique_key = true;
}
}
return array($where_clauses, $result, $rows, $found_unique_key);
}
@ -128,18 +128,19 @@ function PMA_analyzeWhereClauses(
/**
* Show message for empty reult or set the unique_condition
*
* @param array $rows MySQL returned rows
* @param string $key_id ID in current key
* @param array $where_clause_array array of where clauses
* @param string $local_query query performed
* @param array $result MySQL result handle
* @param boolean $found_unique_key boolean variable for unique key
* @param array $rows MySQL returned rows
* @param string $key_id ID in current key
* @param array $where_clause_array array of where clauses
* @param string $local_query query performed
* @param array $result MySQL result handle
*
* @return boolean $found_unique_key
* @return boolean $has_unique_condition
*/
function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
$where_clause_array, $local_query, $result, $found_unique_key
$where_clause_array, $local_query, $result
) {
$has_unique_condition = false;
// No row returned
if (! $rows[$key_id]) {
unset($rows[$key_id], $where_clause_array[$key_id]);
@ -157,11 +158,11 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id,
);
if (! empty($unique_condition)) {
$found_unique_key = true;
$has_unique_condition = true;
}
unset($unique_condition, $tmp_clause_is_unique);
}
return $found_unique_key;
return $has_unique_condition;
}
/**
@ -481,14 +482,14 @@ function PMA_getFunctionColumn($column, $is_upload, $column_name_appendix,
|| strstr($column['True_Type'], 'set')
|| in_array($column['pma_type'], $no_support_types)
) {
$html_output .= ' <td class="center">--</td>' . "\n";
$html_output .= '<td class="center">--</td>' . "\n";
} else {
$html_output .= '<td>' . "\n";
$html_output .= '<select name="funcs' . $column_name_appendix . '"' .
$unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_function)
. '" id="field_' . $idindex . '_1">';
$html_output .= '<select name="funcs' . $column_name_appendix . '"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_function) . '"'
. ' id="field_' . $idindex . '_1">';
$html_output .= PMA_CommonFunctions::getInstance()
->getFunctionsForField($column, $insert_mode) . "\n";
@ -737,14 +738,18 @@ function PMA_getForeignLink($column, $backup_field, $column_name_appendix,
list($db, $table) = $paramTableDbArray;
$html_output = '';
$html_output .= $backup_field . "\n";
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="foreign" />';
$html_output .= '<input type="text" name="fields' . $column_name_appendix . '"'
. 'class="textfield" ' . $unnullify_trigger
$html_output .= '<input type="text" name="fields' . $column_name_appendix . '" '
. 'class="textfield" '
. $unnullify_trigger . ' '
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '" '
. 'id="field_' . ($idindex) . '_3" '
. 'value="' . htmlspecialchars($data) . '" />'
. '<a class="hide foreign_values_anchor" target="_blank" '
. 'value="' . htmlspecialchars($data) . '" />';
$html_output .= '<a class="hide foreign_values_anchor" target="_blank" '
. 'onclick="window.open(this.href,\'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false;" '
. 'href="browse_foreigners.php?'
. PMA_generate_common_url($db, $table) . '&amp;field='
@ -773,18 +778,21 @@ function PMA_dispRowForeignData($backup_field, $column_name_appendix,
) {
$html_output = '';
$html_output .= $backup_field . "\n";
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="foreign" />'
. '<select name="fields' . $column_name_appendix . '"'
. $unnullify_trigger
. 'class="textfield"' . ($tabindex + $tabindex_for_value). '"'
. 'id="field_' . $idindex . '_3"'
. PMA_foreignDropdown(
$foreignData['disp_row'], $foreignData['foreign_field'],
$foreignData['foreign_display'], $data,
$GLOBALS['cfg']['ForeignKeyMaxLimit']
)
. '</select>';
$html_output .= '<input type="hidden"'
. ' name="fields_type' . $column_name_appendix . '"'
. ' value="foreign" />';
$html_output .= '<select name="fields' . $column_name_appendix . '"'
. ' ' . $unnullify_trigger
. ' class="textfield"'
. ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
. ' id="field_' . $idindex . '_3">';
$html_output .= PMA_foreignDropdown(
$foreignData['disp_row'], $foreignData['foreign_field'],
$foreignData['foreign_display'], $data,
$GLOBALS['cfg']['ForeignKeyMaxLimit']
);
$html_output .= '</select>';
return $html_output;
}
@ -820,18 +828,18 @@ function PMA_getTextarea($column, $backup_field, $column_name_appendix,
} elseif ($GLOBALS['cfg']['LongtextDoubleTextarea']
&& strstr($column['pma_type'], 'longtext')
) {
$textAreaRows = $GLOBALS['cfg']['TextareaRows']*2;
$textareaCols = $GLOBALS['cfg']['TextareaCols']*2;
$textAreaRows = $GLOBALS['cfg']['TextareaRows'] * 2;
$textareaCols = $GLOBALS['cfg']['TextareaCols'] * 2;
}
$html_output = $backup_field . "\n"
. '<textarea name="fields' . $column_name_appendix . '"'
. 'class="' . $the_class . '"'
. 'rows="' . $textAreaRows . '"'
. 'cols="' . $textareaCols . '"'
. 'dir="' . $text_dir . '"'
. 'id="field_' . ($idindex) . '_3"'
. $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '">'
. ' class="' . $the_class . '"'
. ' rows="' . $textAreaRows . '"'
. ' cols="' . $textareaCols . '"'
. ' dir="' . $text_dir . '"'
. ' id="field_' . ($idindex) . '_3"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '">'
. $special_chars_encoded
. '</textarea>';
@ -903,9 +911,9 @@ function PMA_getColumnEnumValues($column, $extracted_columnspec)
// Removes automatic MySQL escape format
$val = str_replace('\'\'', '\'', str_replace('\\\\', '\\', $val));
$column['values'][] = array(
'plain' => $val,
'html' => htmlspecialchars($val),
);
'plain' => $val,
'html' => htmlspecialchars($val),
);
}
return $column['values'];
}
@ -929,14 +937,13 @@ function PMA_getDropDownDependingOnLength(
$tabindex, $tabindex_for_value, $idindex, $data, $column_enum_values
) {
$html_output = '<select name="fields' . $column_name_appendix . '"'
. $unnullify_trigger
. 'class="textfield"'
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. 'id="field_' . ($idindex) . '_3">'
. '<option value="">&nbsp;</option>' . "\n";
. ' ' . $unnullify_trigger
. ' class="textfield"'
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. ' id="field_' . ($idindex) . '_3">';
$html_output .= '<option value="">&nbsp;</option>' . "\n";
foreach ($column_enum_values as $enum_value) {
$html_output .= ' ';
$html_output .= '<option value="' . $enum_value['html'] . '"';
if ($data == $enum_value['plain']
|| ($data == ''
@ -978,7 +985,7 @@ function PMA_getRadioButtonDependingOnLength(
. ' class="textfield"'
. ' value="' . $enum_value['html'] . '"'
. ' id="field_' . ($idindex) . '_3_' . $j . '"'
. $unnullify_trigger;
. ' ' . $unnullify_trigger;
if ($data == $enum_value['plain']
|| ($data == ''
&& (! isset($_REQUEST['where_clause']) || $column['Null'] != 'YES')
@ -1025,13 +1032,13 @@ function PMA_getPmaTypeSet(
$html_output .= '<input type="hidden" name="fields_type'
. $column_name_appendix . '" value="set" />';
$html_output .= '<select name="fields' . $column_name_appendix . '[]' . '"'
. 'class="textfield"'
. 'size="' . $select_size . '"'
. 'multiple="multiple"' . $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. 'id="field_' . ($idindex) . '_3">';
. ' class="textfield"'
. ' size="' . $select_size . '"'
. ' multiple="multiple"'
. ' ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value) . '"'
. ' id="field_' . ($idindex) . '_3">';
foreach ($column_set_values as $column_set_value) {
$html_output .= ' ';
$html_output .= '<option value="' . $column_set_value['html'] . '"';
if (isset($vset[$column_set_value['plain']])) {
$html_output .= ' selected="selected"';
@ -1128,10 +1135,10 @@ function PMA_getBinaryAndBlobColumn(
if ($is_upload && $column['is_blob']) {
$html_output .= '<br />'
. '<input type="file" name="fields_upload'
. $vkey . '[' . $column['Field_md5']
. ']" class="textfield" id="field_' . $idindex . '_3" size="10" '
. $unnullify_trigger . '/>&nbsp;';
. '<input type="file"'
. ' name="fields_upload' . $vkey . '[' . $column['Field_md5'] . ']"'
. ' class="textfield" id="field_' . $idindex . '_3" size="10"'
. ' ' . $unnullify_trigger . '/>&nbsp;';
list($html_out, $biggest_max_file_size) = PMA_getMaxUploadSize(
$column, $biggest_max_file_size
);
@ -1171,10 +1178,10 @@ function PMA_getHTMLinput($column, $column_name_appendix, $special_chars,
$the_class .= ' datetimefield';
}
return '<input type="text" name="fields' . $column_name_appendix . '"'
. 'value="' . $special_chars . '" size="' . $fieldsize . '"'
. 'class="' . $the_class . '"' . $unnullify_trigger
. 'tabindex="' . ($tabindex + $tabindex_for_value). '"'
. 'id="field_' . ($idindex) . '_3" />';
. ' value="' . $special_chars . '" size="' . $fieldsize . '"'
. ' class="' . $the_class . '" ' . $unnullify_trigger
. ' tabindex="' . ($tabindex + $tabindex_for_value). '"'
. ' id="field_' . ($idindex) . '_3" />';
}
/**
@ -1226,7 +1233,8 @@ function PMA_getMaxUploadSize($column, $biggest_max_file_size)
'tinyblob' => '256',
'blob' => '65536',
'mediumblob' => '16777216',
'longblob' => '4294967296'); // yeah, really
'longblob' => '4294967296' // yeah, really
);
$this_field_max_size = $max_upload_size; // from PHP max
if ($this_field_max_size > $max_field_sizes[$column['pma_type']]) {
@ -1382,22 +1390,26 @@ function PMA_getHTMLforGisDataTypes()
*/
function PMA_getContinueInsertionForm($table, $db, $where_clause_array, $err_url)
{
$html_output = '<form id="continueForm" method="post" action="tbl_replace.php" name="continueForm" >'
$html_output = '<form id="continueForm" method="post"'
. ' action="tbl_replace.php" name="continueForm">'
. PMA_generate_common_hidden_inputs($db, $table)
. '<input type="hidden" name="goto" value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
. '<input type="hidden" name="err_url" value="' . htmlspecialchars($err_url) . '" />'
. '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_REQUEST['sql_query']) . '" />';
. '<input type="hidden" name="goto"'
. ' value="' . htmlspecialchars($GLOBALS['goto']) . '" />'
. '<input type="hidden" name="err_url"'
. ' value="' . htmlspecialchars($err_url) . '" />'
. '<input type="hidden" name="sql_query"'
. ' value="' . htmlspecialchars($_REQUEST['sql_query']) . '" />';
if (isset($_REQUEST['where_clause'])) {
foreach ($where_clause_array as $key_id => $where_clause) {
$html_output .= '<input type="hidden" name="where_clause['
. $key_id . ']" value="'
. htmlspecialchars(trim($where_clause)) . '" />'. "\n";
$html_output .= '<input type="hidden"'
. ' name="where_clause[' . $key_id . ']"'
. ' value="' . htmlspecialchars(trim($where_clause)) . '" />'. "\n";
}
}
$tmp = '<select name="insert_rows" id="insert_rows">' . "\n";
$option_values = array(1,2,5,10,15,20,30,40);
$option_values = array(1, 2, 5, 10, 15, 20, 30, 40);
foreach ($option_values as $value) {
$tmp .= '<option value="' . $value . '"';
@ -1640,7 +1652,9 @@ function PMA_getSpecialCharsAndBackupFieldForExistingRow(
if ($_SESSION['tmp_user_values']['display_binary_as_hex']
&& $GLOBALS['cfg']['ShowFunctionFields']
) {
$current_row[$column['Field']] = bin2hex($current_row[$column['Field']]);
$current_row[$column['Field']] = bin2hex(
$current_row[$column['Field']]
);
$column['display_binary_as_hex'] = true;
} else {
$current_row[$column['Field']]
@ -2000,7 +2014,7 @@ function PMA_getDisplayValueForForeignTableColumn($where_comparison,
);
// Field to display from the foreign table?
if (isset($display_field) && strlen($display_field)) {
$dispsql = 'SELECT ' . $common_functions->backquote($display_field)
$dispsql = 'SELECT ' . $common_functions->backquote($display_field)
. ' FROM ' . $common_functions->backquote($map[$relation_field]['foreign_db'])
. '.' . $common_functions->backquote($map[$relation_field]['foreign_table'])
. ' WHERE ' . $common_functions->backquote($map[$relation_field]['foreign_field'])
@ -2075,6 +2089,7 @@ function PMA_getLinkForRelationalDisplayField($map, $relation_field,
* [field_name][field_key]
* @param array $edited_values transform fields list
* @param array $extra_data extra data array
* @param string $include_file file containing the transformation plugin
*
* @return array $extra_data
*/
@ -2172,10 +2187,12 @@ function PMA_getCurrentValueAsAnArrayForMultipleEdit($multi_edit_colummns,
* @param boolean $is_insert boolean value whether insert or not
* @param array $query_values SET part of the sql query
* @param array $query_fields array of query fileds
* @param string $current_value_as_an_array current value in the column as an array
* @param string $current_value_as_an_array current value in the column
* as an array
* @param array $value_sets array of valu sets
* @param string $key an md5 of the column name
* @param array $multi_edit_columns_null_prev array of multiple edit columnd null previous
* @param array $multi_edit_columns_null_prev array of multiple edit columns
* null previous
*
* @return array ($query_values, $query_fields)
*/
@ -2194,7 +2211,9 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
$query_values[] = $current_value_as_an_array;
// first inserted row so prepare the list of fields
if (empty($value_sets)) {
$query_fields[] = $common_functions->backquote($multi_edit_columns_name[$key]);
$query_fields[] = $common_functions->backquote(
$multi_edit_columns_name[$key]
);
}
}
@ -2205,7 +2224,8 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
// field had the null checkbox before the update
// field no longer has the null checkbox
$query_values[] = $common_functions->backquote($multi_edit_columns_name[$key])
$query_values[]
= $common_functions->backquote($multi_edit_columns_name[$key])
. ' = ' . $current_value_as_an_array;
} elseif (empty($multi_edit_funcs[$key])
&& isset($multi_edit_columns_prev[$key])
@ -2219,7 +2239,8 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_
if (empty($multi_edit_columns_null_prev[$key])
|| empty($multi_edit_columns_null[$key])
) {
$query_values[] = $common_functions->backquote($multi_edit_columns_name[$key])
$query_values[]
= $common_functions->backquote($multi_edit_columns_name[$key])
. ' = ' . $current_value_as_an_array;
}
}

View File

@ -575,6 +575,11 @@ function PMA_EVN_getQueryFromRequest()
}
}
}
if (! empty($_REQUEST['item_comment'])) {
$query .= "COMMENT '" . $common_functions->sqlAddslashes(
$_REQUEST['item_comment']
) . "' ";
}
$query .= 'DO ';
if (! empty($_REQUEST['item_definition'])) {
$query .= $_REQUEST['item_definition'];

View File

@ -37,19 +37,6 @@ class PMA_Schema_PDF extends PMA_PDF
private $_ff = PMA_PDF_FONT;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*
@ -406,19 +393,6 @@ class Table_Stats
private $_ff = PMA_PDF_FONT;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*
@ -886,6 +860,20 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
private $leftMargin = 10;
private $rightMargin = 10;
private $_tablewidth;
private $_common_functions;
/**
* Get CommmonFunctions
*
* @return CommonFunctions object
*/
public function getCommonFunctions()
{
if (is_null($this->_common_functions)) {
$this->_common_functions = PMA_CommonFunctions::getInstance();
}
return $this->_common_functions;
}
/**
* The "PMA_Pdf_Relation_Schema" constructor

View File

@ -25,20 +25,6 @@ class PMA_User_Schema
public $action;
private $_common_functions;
/**
* Set CommmonFunctions
*
* @param PMA_CommonFunctions $commonFunctions
*
* @return void
*/
public function setCommonFunctions(PMA_CommonFunctions $commonFunctions)
{
$this->_common_functions = $commonFunctions;
}
/**
* Get CommmonFunctions
*

211
main.php
View File

@ -91,7 +91,7 @@ if ($server > 0
/**
* Displays the mysql server related links
*/
if ($server > 0 && !PMA_DRIZZLE) {
if ($server > 0 && ! PMA_DRIZZLE) {
include_once 'libraries/check_user_privileges.lib.php';
// Logout for advanced authentication
@ -120,10 +120,22 @@ if ($server > 0
. ' <label for="select_collation_connection">' . "\n"
. ' ' . __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. $common_functions->showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n"
. $common_functions->showMySQLDocu(
'MySQL_Database_Administration',
'Charset-connection'
)
. ': ' . "\n"
. ' </label>' . "\n"
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true)
. PMA_generateCharsetDropdownBox(
PMA_CSDROPDOWN_COLLATION,
'collation_connection',
'select_collation_connection',
$collation_connection,
true,
4,
true
)
. ' </form>' . "\n"
. ' </li>' . "\n";
} // end of if ($server > 0 && !PMA_DRIZZLE)
@ -176,13 +188,22 @@ echo '<div id="main_pane_right">';
if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
echo '<div class="group">';
echo '<h2>' . __('Database server') . '</h2>';
echo '<ul>' . "\n";
PMA_printListItem(__('Server') . ': ' . $server_info, 'li_server_info');
PMA_printListItem(__('Software') . ': ' . $common_functions->getServerType(), 'li_server_type');
PMA_printListItem(__('Software version') . ': ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT, 'li_server_version');
PMA_printListItem(
__('Server') . ': ' . $server_info,
'li_server_info'
);
PMA_printListItem(
__('Software') . ': ' . $common_functions->getServerType(),
'li_server_type'
);
PMA_printListItem(
__('Software version') . ': ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT,
'li_server_version'
);
PMA_printListItem(
__('Protocol version') . ': ' . PMA_DBI_get_proto_info(),
'li_mysql_proto'
@ -221,16 +242,25 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
__('Database client version') . ': ' . $client_version_str,
'li_mysql_client_version'
);
$php_ext_string = __('PHP extension') . ': '
. $GLOBALS['cfg']['Server']['extension'] . ' '
. $common_functions->showPHPDocu(
'book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'
);
PMA_printListItem(
__('PHP extension') . ': ' . $GLOBALS['cfg']['Server']['extension']. ' '
. $common_functions->showPHPDocu('book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'),
$php_ext_string,
'li_used_php_extension'
);
}
}
if ($cfg['ShowPhpInfo']) {
PMA_printListItem(__('Show PHP information'), 'li_phpinfo', 'phpinfo.php?' . $common_url_query);
PMA_printListItem(
__('Show PHP information'),
'li_phpinfo',
'phpinfo.php?' . $common_url_query
);
}
echo ' </ul>';
echo ' </div>';
@ -242,18 +272,64 @@ echo '<ul>';
$class = null;
// We rely on CSP to allow access to http://www.phpmyadmin.net, but IE lacks
// support here and does not allow request to http once using https.
if ($GLOBALS['cfg']['VersionCheck'] && (! $GLOBALS['PMA_Config']->get('is_https') || PMA_USR_BROWSER_AGENT != 'IE')) {
if ($GLOBALS['cfg']['VersionCheck']
&& (! $GLOBALS['PMA_Config']->get('is_https') || PMA_USR_BROWSER_AGENT != 'IE')
) {
$class = 'jsversioncheck';
}
PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class);
PMA_printListItem(__('Documentation'), 'li_pma_docs', 'Documentation.html', null, '_blank');
PMA_printListItem(__('Wiki'), 'li_pma_wiki', PMA_linkURL('http://wiki.phpmyadmin.net/'), null, '_blank');
PMA_printListItem(
__('Version information') . ': ' . PMA_VERSION,
'li_pma_version',
null,
null,
null,
null,
$class
);
PMA_printListItem(
__('Documentation'),
'li_pma_docs',
'Documentation.html',
null,
'_blank'
);
PMA_printListItem(
__('Wiki'),
'li_pma_wiki',
PMA_linkURL('http://wiki.phpmyadmin.net/'),
null,
'_blank'
);
// does not work if no target specified, don't know why
PMA_printListItem(__('Official Homepage'), 'li_pma_homepage', PMA_linkURL('http://www.phpMyAdmin.net/'), null, '_blank');
PMA_printListItem(__('Contribute'), 'li_pma_contribute', PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'), null, '_blank');
PMA_printListItem(__('Get support'), 'li_pma_support', PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'), null, '_blank');
PMA_printListItem(__('List of changes'), 'li_pma_changes', PMA_linkURL('changelog.php'), null, '_blank');
PMA_printListItem(
__('Official Homepage'),
'li_pma_homepage',
PMA_linkURL('http://www.phpMyAdmin.net/'),
null,
'_blank'
);
PMA_printListItem(
__('Contribute'),
'li_pma_contribute',
PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'),
null,
'_blank'
);
PMA_printListItem(
__('Get support'),
'li_pma_support',
PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'),
null,
'_blank'
);
PMA_printListItem(
__('List of changes'),
'li_pma_changes',
PMA_linkURL('changelog.php'),
null,
'_blank'
);
?>
</ul>
</div>
@ -278,7 +354,10 @@ if ($server != 0
&& $cfg['Server']['user'] == 'root'
&& $cfg['Server']['password'] == ''
) {
trigger_error(__('Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole by setting a password for user \'root\'.'), E_USER_WARNING);
trigger_error(
__('Your configuration file contains settings (root with no password) that correspond to the default MySQL privileged account. Your MySQL server is running with this default, is open to intrusion, and you really should fix this security hole by setting a password for user \'root\'.'),
E_USER_WARNING
);
}
/**
@ -286,7 +365,10 @@ if ($server != 0
* break it, see bug 1063821.
*/
if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
trigger_error(__('You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause some data to be corrupted!'), E_USER_WARNING);
trigger_error(
__('You have enabled mbstring.func_overload in your PHP configuration. This option is incompatible with phpMyAdmin and might cause some data to be corrupted!'),
E_USER_WARNING
);
}
/**
@ -294,7 +376,10 @@ if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
* to tell user something might be broken without it, see bug #1063149.
*/
if (! @extension_loaded('mbstring')) {
trigger_error(__('The mbstring PHP extension was not found and you seem to be using a multibyte charset. Without the mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'), E_USER_WARNING);
trigger_error(
__('The mbstring PHP extension was not found and you seem to be using a multibyte charset. Without the mbstring extension phpMyAdmin is unable to split strings correctly and it may result in unexpected results.'),
E_USER_WARNING
);
}
/**
@ -302,14 +387,22 @@ if (! @extension_loaded('mbstring')) {
*/
$gc_time = (int)@ini_get('session.gc_maxlifetime');
if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
trigger_error(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
trigger_error(
__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'),
E_USER_WARNING
);
}
/**
* Check whether LoginCookieValidity is limited by LoginCookieStore.
*/
if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']) {
trigger_error(__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
if ($GLOBALS['cfg']['LoginCookieStore'] != 0
&& $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']
) {
trigger_error(
__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'),
E_USER_WARNING
);
}
/**
@ -318,7 +411,10 @@ if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStor
if (! empty($_SESSION['auto_blowfish_secret'])
&& empty($GLOBALS['cfg']['blowfish_secret'])
) {
trigger_error(__('The configuration file now needs a secret passphrase (blowfish_secret).'), E_USER_WARNING);
trigger_error(
__('The configuration file now needs a secret passphrase (blowfish_secret).'),
E_USER_WARNING
);
}
/**
@ -326,14 +422,22 @@ if (! empty($_SESSION['auto_blowfish_secret'])
* production environment.
*/
if (file_exists('config')) {
trigger_error(__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'), E_USER_WARNING);
trigger_error(
__('Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'),
E_USER_WARNING
);
}
if ($server > 0) {
$cfgRelation = PMA_getRelationsParam();
if (! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
if (! $cfgRelation['allworks']
&& $cfg['PmaNoRelation_DisableWarning'] == false
) {
$msg = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
$msg->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$msg->addParam(
'<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">',
false
);
$msg->addParam('</a>', false);
/* Show error if user has configured something, notice elsewhere */
if (!empty($cfg['Servers'][$server]['pmadb'])) {
@ -346,14 +450,18 @@ if ($server > 0) {
/**
* Warning about different MySQL library and server version
* (a difference on the third digit does not count).
* If someday there is a constant that we can check about mysqlnd, we can use it instead
* of strpos().
* If someday there is a constant that we can check about mysqlnd,
* we can use it instead of strpos().
* If no default server is set, PMA_DBI_get_client_info() is not defined yet.
* Drizzle can speak MySQL protocol, so don't warn about version mismatch for Drizzle servers.
* Drizzle can speak MySQL protocol, so don't warn about version mismatch for
* Drizzle servers.
*/
if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
$_client_info = PMA_DBI_get_client_info();
if ($server > 0 && strpos($_client_info, 'mysqlnd') === false && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)) {
if ($server > 0
&& strpos($_client_info, 'mysqlnd') === false
&& substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(PMA_MYSQL_INT_VERSION, 0, 3)
) {
trigger_error(
PMA_sanitize(
sprintf(
@ -391,7 +499,9 @@ if ($cfg['SuhosinDisableWarning'] == false
/**
* Warning about mcrypt.
*/
if (!function_exists('mcrypt_encrypt') && !$GLOBALS['cfg']['McryptDisableWarning']) {
if (! function_exists('mcrypt_encrypt')
&& ! $GLOBALS['cfg']['McryptDisableWarning']
) {
PMA_warnMissingExtension('mcrypt');
}
@ -407,25 +517,34 @@ if (file_exists('libraries/language_stats.inc.php')) {
* handling incomplete translations here and focus on english
* speaking users.
*/
if (isset($GLOBALS['language_stats'][$lang]) && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']) {
trigger_error('You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate" target="_blank">contributing</a>.', E_USER_NOTICE);
if (isset($GLOBALS['language_stats'][$lang])
&& $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']
) {
trigger_error(
'You are using an incomplete translation, please help to make it better by <a href="http://www.phpmyadmin.net/home_page/improve.php#translate" target="_blank">contributing</a>.',
E_USER_NOTICE
);
}
}
/**
* prints list item for main page
*
* @param string $name displayed text
* @param string $id id, used for css styles
* @param string $url make item as link with $url as target
* @param string $mysql_help_page display a link to MySQL's manual
* @param string $target special target for $url
* @param string $a_id id for the anchor, used for jQuery to hook in functions
* @param string $class class for the li element
* @param string $a_class class for the anchor element
* @param string $name displayed text
* @param string $id id, used for css styles
* @param string $url make item as link with $url as target
* @param string $mysql_help_page display a link to MySQL's manual
* @param string $target special target for $url
* @param string $a_id id for the anchor,
* used for jQuery to hook in functions
* @param string $class class for the li element
* @param string $a_class class for the anchor element
*
* @return void
*/
function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null, $target = null, $a_id = null, $class = null, $a_class = null)
{
function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = null,
$target = null, $a_id = null, $class = null, $a_class = null
) {
echo '<li id="' . $id . '"';
if (null !== $class) {
echo ' class="' . $class . '"';
@ -434,7 +553,7 @@ function PMA_printListItem($name, $id = null, $url = null, $mysql_help_page = nu
if (null !== $url) {
echo '<a href="' . $url . '"';
if (null !== $target) {
echo ' target="' . $target . '"';
echo ' target="' . $target . '"';
}
if (null != $a_id) {
echo ' id="' . $a_id .'"';

View File

@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-06-26 16:48+0200\n"
"PO-Revision-Date: 2012-07-09 15:14+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: czech <cs@li.org>\n"
"Language: cs\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Weblate 1.0\n"
"X-Generator: Weblate 1.1\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
#: libraries/DisplayResults.class.php:609 server_privileges.php:1851
@ -7888,7 +7888,6 @@ msgstr ""
"musí být prázdný."
#: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31
#, fuzzy
#| msgid ""
#| "LINUX ONLY: Launches an external application and feeds it the column data "
#| "via standard input. Returns the standard output of the application. The "
@ -7915,13 +7914,14 @@ msgstr ""
"JEN PRO LINUX: Spustí externí program, na jeho standardní vstup pošle obsah "
"pole a zobrazí výstup programu. Výchozí je program Tidy, který pěkně "
"zformátuje HTML. Z bezpečnostních důvodů musíte jména povolených programů "
"zapsat do souboru libraries/transformations/text_plain__external.inc.php. "
"První parametr je číslo programu, který má být spuštěn a druhý parametr "
"udává parametry tohoto programu. Třetí parametr určuje, zda mají být ve "
"výstupu nahrazeny HTML entity (např. pro zobrazení zdrojového kódu HTML) "
"(výchozí je 1, tedy převádět na entity), čtvrtý (při nastavení na 1) zajistí "
"přidání parametru NOWRAP k vypisovanému textu, čímž se zachová formátování "
"(výchozí je 1)."
"zapsat do souboru "
"libraries/plugins/transformations/Text_Plain_External.class.php. První "
"parametr je číslo programu, který má být spuštěn a druhý parametr udává "
"parametry tohoto programu. Třetí parametr určuje, zda mají být ve výstupu "
"nahrazeny HTML entity (např. pro zobrazení zdrojového kódu HTML) (výchozí je "
"1, tedy převádět na entity), čtvrtý (při nastavení na 1) zajistí přidání "
"parametru NOWRAP k vypisovanému textu, čímž se zachová formátování (výchozí "
"je 1)."
#: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31
msgid ""

135
po/da.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-07-05 23:51+0200\n"
"PO-Revision-Date: 2012-07-12 23:18+0200\n"
"Last-Translator: Aputsiaq Niels Janussen <aj@isit.gl>\n"
"Language-Team: danish <da@li.org>\n"
"Language: da\n"
@ -3255,42 +3255,57 @@ msgstr "Tema"
msgid ""
"A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255"
msgstr ""
"Et heltal på 1 byte, signeret interval er -128 til 127, usigneret interval "
"er 0 til 255"
#: libraries/Types.class.php:297
msgid ""
"A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to "
"65,535"
msgstr ""
"Et heltal på 2 byte, signeret interval er -32.768 til 32.767, usigneret "
"interval er 0 til 65.535"
#: libraries/Types.class.php:299
msgid ""
"A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is "
"0 to 16,777,215"
msgstr ""
"Et heltal på 3 byte, signeret interval er -8.388.608 til 8.388.607, "
"usigneret interval er 0 til 16.777.215"
#: libraries/Types.class.php:301
msgid ""
"A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned "
"range is 0 to 4,294,967,295."
msgstr ""
"Et heltal på 4 byte, signeret interval er -2.147.483.648 til 2.147.483.647, "
"usigneret interval er 0 til 4.294.967.295."
#: libraries/Types.class.php:303
msgid ""
"An 8-byte integer, signed range is -9,223,372,036,854,775,808 to "
"9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615"
msgstr ""
"Et heltal på 8 byte, signeret interval er -9.223.372.036.854.755.808 til "
"9.223.372.036.854.755.807, usigneret interval er 0 til "
"18.446.744.073.709.55.615"
#: libraries/Types.class.php:305 libraries/Types.class.php:711
msgid ""
"A fixed-point number (M, D) - the maximum number of digits (M) is 65 "
"(default 10), the maximum number of decimals (D) is 30 (default 0)"
msgstr ""
"Et fast decimaltal (M, D) - det maksimale antal af tal (M) er 65 (standard "
"10), det maksimale antal decimaler (D) er 30 (standard 0)"
#: libraries/Types.class.php:307
msgid ""
"A small floating-point number, allowable values are -3.402823466E+38 to "
"-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38"
msgstr ""
"Et lille, flydende decimaltal. Tilladte værdier er -3.402823466E+38 til "
"-1.175494351E-38, 0, samt 1.175494351E-38 til 3.402823466E+38"
#: libraries/Types.class.php:309
msgid ""
@ -3298,28 +3313,37 @@ msgid ""
"-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and "
"2.2250738585072014E-308 to 1.7976931348623157E+308"
msgstr ""
"Et dobbeltpræcisions, flydende decimaltal. Tilladte værdier er "
"-1.7976931348623157E+308 til -2.2250738585072014E-308, 0, samt "
"2.2250738585072014E-308 til 1.7976931348623157E+308"
#: libraries/Types.class.php:311
msgid ""
"Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for "
"FLOAT)"
msgstr ""
"Synonym for DOUBLE (undtagelse: i REAL_AS_FLOAT SQL-tilstanden er det et "
"synonym for FLOAT)"
#: libraries/Types.class.php:313
msgid ""
"A bit-field type (M), storing M of bits per value (default is 1, maximum is "
"64)"
msgstr ""
"Et bit-felttype (M), der lagrer M bits per værdi (standard er 1, maksimum er "
"64)"
#: libraries/Types.class.php:315
msgid ""
"A synonym for TINYINT(1), a value of zero is considered false, nonzero "
"values are considered true"
msgstr ""
"Et synonym for TINYINT(1), en værdi på nul anses som falsk, værdier som ikke "
"er nul anses som sande"
#: libraries/Types.class.php:317
msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
msgstr ""
msgstr "Et alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
#: libraries/Types.class.php:319 libraries/Types.class.php:721
#, php-format
@ -3330,13 +3354,16 @@ msgstr "En dato, understøttet interval er %1$s til %2$s"
#: libraries/Types.class.php:321 libraries/Types.class.php:723
#, php-format
msgid "A date and time combination, supported range is %1$s to %2$s"
msgstr ""
msgstr "En kombination af dato og tid, understøttet interval er %1$s til %2$s"
#: libraries/Types.class.php:323
msgid ""
"A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, "
"stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)"
msgstr ""
"Et tidsstempel, intervallet er 1970-01-01 00:00:01 UTC til 2038-01-09 "
"03:14:07 UTC, lagret som antallet af sekunder siden epoken (1970-01-01 "
"00:00:00 UTC)"
#: libraries/Types.class.php:325 libraries/Types.class.php:727
#, php-format
@ -3349,12 +3376,16 @@ msgid ""
"A year in four-digit (4, default) or two-digit (2) format, the allowable "
"values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000"
msgstr ""
"Et år med formater på fire cifre (4, standard) eller to cifre (2), hvor "
"tilladte værdier er 70 (1970) til 69 (2069) eller 1901 til 2155 og 0000"
#: libraries/Types.class.php:329
msgid ""
"A fixed-length (0-255, default 1) string that is always right-padded with "
"spaces to the specified length when stored"
msgstr ""
"En streng med fast længde (0-255, standard er 1), der altid har mellemrum "
"til højre i den angivet længde når den lagres"
#: libraries/Types.class.php:331 libraries/Types.class.php:729
#, php-format
@ -5802,9 +5833,9 @@ msgid ""
"alias, the table name itself stays unchanged"
msgstr ""
"Når denne sættes til [kbd]nested[/kbd] bruges alias for tabelnavnet kun til "
"at splitte/samle tabellerne i henhold til direktivet $cfg"
"['LeftFrameTableSeparator'], så kun mappen benævnes som aliaset; tabelnavnet "
"selv forbliver uændret."
"at splitte/samle tabellerne i henhold til direktivet "
"$cfg['LeftFrameTableSeparator'], så kun mappen benævnes som aliaset; "
"tabelnavnet selv forbliver uændret"
#: libraries/config/messages.inc.php:486
msgid "Display table comment instead of its name"
@ -6054,7 +6085,7 @@ msgstr "Open Document tekst"
#: libraries/config/validate.lib.php:212
msgid "Could not initialize Drizzle connection library"
msgstr "Kunne ikke initialisere Drizzle forbindelsesbibliotek."
msgstr "Kunne ikke initialisere Drizzle forbindelsesbibliotek"
#: libraries/config/validate.lib.php:221 libraries/config/validate.lib.php:229
msgid "Could not connect to Drizzle server"
@ -6748,7 +6779,7 @@ msgid ""
"transaction log data. The default is 16MB."
msgstr ""
"Mængden af hukommelse allokeret til mellemlageret for transaktionslogdata. "
"Standard er 16MB"
"Standard er 16MB."
#: libraries/engines/pbxt.lib.php:43
msgid "Log file threshold"
@ -6759,8 +6790,8 @@ msgid ""
"The size of a transaction log before rollover, and a new log is created. The "
"default value is 16MB."
msgstr ""
"Størrelsen af en transajktionslog før den ruller over og en ny log oprettes. "
"Standardværdien er 16MB"
"Størrelsen af en transaktionslog før den ruller over og en ny log oprettes. "
"Standardværdien er 16MB."
#: libraries/engines/pbxt.lib.php:48
msgid "Transaction buffer size"
@ -6841,7 +6872,7 @@ msgstr "Voksestørrelsen af rækkefil"
#: libraries/engines/pbxt.lib.php:79
msgid "The grow size of the row pointer (.xtr) files."
msgstr "Voksestørrelsen af rækkepointerfiler (.xtr)"
msgstr "Vækststørrelsen af rækkepointerfiler (.xtr)."
#: libraries/engines/pbxt.lib.php:83
msgid "Log file count"
@ -6864,8 +6895,8 @@ msgid ""
"Documentation and further information about PBXT can be found on the "
"%sPrimeBase XT Home Page%s."
msgstr ""
"Dokumentation og yderliger information om PBXT kan findes på %sPrimeBase XT "
"hjemmeside%s"
"Dokumentation og yderligere information om PBXT kan findes på %sPrimeBase XT "
"hjemmeside%s."
#: libraries/engines/pbxt.lib.php:135
msgid "Related Links"
@ -7830,7 +7861,7 @@ msgstr "ESRI formfil"
#: libraries/plugins/import/ImportShp.class.php:149
#, php-format
msgid "There was an error importing the ESRI shape file: \"%s\"."
msgstr "Der var en fejl i importen af ESRI formfilen \"%s\""
msgstr "Der var en fejl i importen af ESRI-formfilen: \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:202
msgid ""
@ -7969,8 +8000,8 @@ msgid ""
"Converts an (IPv4) Internet network address into a string in Internet "
"standard dotted format."
msgstr ""
"Konverterer en IPV4 internet adresse til en streng i internet standard x.x.x."
"x adresseformat"
"Konverterer en IPV4-internetadresse til en streng i internet-standard "
"x.x.x.x adresseformat."
#: libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php:31
msgid "Formats text as SQL query with syntax highlighting."
@ -8308,7 +8339,7 @@ msgstr "Du skal angive en gyldig intervalværdi for hændelsen."
#: libraries/rte/rte_events.lib.php:559
msgid "You must provide a valid execution time for the event."
msgstr "Du skal angive et gyldigt kørselstidspunkt for hændelsen"
msgstr "Du skal angive et gyldigt kørselstidspunkt for hændelsen."
#: libraries/rte/rte_events.lib.php:563
msgid "You must provide a valid type for the event."
@ -9180,10 +9211,11 @@ msgid ""
"cookie validity configured in phpMyAdmin, because of this, your login will "
"expire sooner than configured in phpMyAdmin."
msgstr ""
"Din PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cooki "
"gyldighed konfigureret i phpMyAdmin; på grund af dette vil din login session "
"udløbe tidligere end konfigureret i phpMyAdmin"
"Dit PHP-parameter "
"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-"
"maxlifetime@_blank]session.gc_maxlifetime[/a] er mindre end cookie-"
"gyldigheden konfigureret i phpMyAdmin; på grund af dette vil din logind-"
"session udløbe tidligere end konfigureret i phpMyAdmin."
#: main.php:312
msgid ""
@ -9452,7 +9484,7 @@ msgstr "Importer fra fil"
#: prefs_manage.php:249
msgid "Import from browser's storage"
msgstr "Import fra browserens lager."
msgstr "Import fra browserens lager"
#: prefs_manage.php:252
msgid "Settings will be imported from your browser's local storage."
@ -9464,7 +9496,7 @@ msgstr "Du har ingen gemte indstillinger!"
#: prefs_manage.php:262 prefs_manage.php:315
msgid "This feature is not supported by your web browser"
msgstr "Denne funktion er ikke understøttet af din browser."
msgstr "Denne funktion er ikke understøttet af din browser"
#: prefs_manage.php:267
msgid "Merge with current configuration"
@ -9494,7 +9526,8 @@ msgstr "Eksisterende indstillinger vil blive overskrevet!"
#: prefs_manage.php:326
msgid "You can reset all your settings and restore them to default values."
msgstr ""
"Du han nulstille alle dine indstillinger og gendanne dem med standardværdier"
"Du kan nulstille alle dine indstillinger og gendanne dem med "
"standardværdier."
#: querywindow.php:66
msgid "Import files"
@ -9996,7 +10029,7 @@ msgstr "Tilføj privilegier på følgende database"
#: server_privileges.php:2316
msgid "Wildcards % and _ should be escaped with a \\ to use them literally"
msgstr ""
"Jokertegn % og _ skal escapes med en \\ for brug af dem som almindelige tegn."
"Jokertegn % og _ skal escapes med en \\ for brug af dem som almindelige tegn"
#: server_privileges.php:2319
msgid "Add privileges on the following table"
@ -10160,9 +10193,9 @@ msgid ""
"should see a message informing you, that this server <b>is</b> configured as "
"master"
msgstr ""
"Når du har genstartet MySQL serveren, så klik på Go knappen. Bagefter bør du "
"Når du har genstartet MySQL-serveren, så klik på knappen Go. Bagefter bør du "
"se en besked, der fortæller, at denne server <b>er</b> konfigureret som "
"master."
"master"
#: server_replication.php:322
msgid "Slave SQL Thread not running!"
@ -10371,8 +10404,8 @@ msgid ""
"The Advisor system can provide recommendations on server variables by "
"analyzing the server status variables."
msgstr ""
"Rådgiversystemer kan give anbefalinger om servervariable ved at analysere "
"serverens statusvariable"
"Rådgiversystemet kan give anbefalinger om servervariabler ved at analysere "
"serverens statusvariabler."
#: server_status.php:930
msgid ""
@ -10381,7 +10414,7 @@ msgid ""
"system."
msgstr ""
"Bemærk dog, at dette system giver anbefalinger baseret på simple beregninger "
"og tommelfingerregler, som ikke passer med dit system"
"og tommelfingerregler, som ikke nødvendigvis passer med dit system."
#: server_status.php:932
msgid ""
@ -11478,7 +11511,7 @@ msgstr "Valgte måltabeller er blevet synkroniseret med kildetabeller."
#: server_synchronize.php:1123
msgid "Target database has been synchronized with source database"
msgstr "Måldatabasen er blevet synkroniseret med kildedatabase."
msgstr "Måldatabasen er blevet synkroniseret med kildedatabasen"
#: server_synchronize.php:1191
msgid "Executed queries"
@ -11845,7 +11878,7 @@ msgstr "Du bør bruge mysqli af ydelsesgrunde."
#: setup/lib/index.lib.php:396
msgid "You allow for connecting to the server without a password."
msgstr "Du tillader forbindelse til serveren uden adgangskode"
msgstr "Du tillader forbindelse til serveren uden adgangskode."
#: setup/lib/index.lib.php:420
msgid "Key is too short, it should have at least 8 characters."
@ -11862,7 +11895,7 @@ msgstr "Forkerte data"
#: sql.php:271
#, php-format
msgid "Using bookmark \"%s\" as default browse query."
msgstr "Bruger bogmærke \"%s\" som standard gennemsynsforespørgsel"
msgstr "Bruger bogmærket \"%s\" som standard-forespørgsel til gennemsyn."
#: sql.php:430
#, fuzzy
@ -12540,8 +12573,8 @@ msgid ""
"To have more accurate averages it is recommended to let the server run for "
"longer than a day before running this analyzer"
msgstr ""
"For at få mere korrekte gennemsnit anbefales det at lade serveren køre "
"længere end en dag før dette analyseværktøj anvendes."
"For at få mere korrekte gennemsnit, anbefales det at lade serveren køre "
"længere end én dag, før dette analyseværktøj anvendes"
#: libraries/advisory_rules.txt:54
#, php-format
@ -12597,7 +12630,7 @@ msgstr ""
msgid "The slow query rate should be below 5%%, your value is %s%%."
msgstr ""
"Andelen af langsomme forespørgsler bør være under 5%%. Den aktuelle værdi er "
"%s%%"
"%s%%."
#: libraries/advisory_rules.txt:70
msgid "Slow query rate"
@ -12642,7 +12675,7 @@ msgstr ""
#: libraries/advisory_rules.txt:82
#, php-format
msgid "long_query_time is currently set to %ds."
msgstr "long_query_time er sat til %ds"
msgstr "long_query_time er i øjeblikket sat til %ds."
#: libraries/advisory_rules.txt:84
msgid "Slow query logging"
@ -12670,7 +12703,7 @@ msgstr "Udgivelsesserie"
#: libraries/advisory_rules.txt:96
msgid "The MySQL server version less than 5.1."
msgstr "Versionen af MySQL server er mindre end 5.1"
msgstr "Versionen af MySQL-serveren er lavere end 5.1."
#: libraries/advisory_rules.txt:97
msgid ""
@ -12691,7 +12724,7 @@ msgstr "Underversion"
#: libraries/advisory_rules.txt:103
msgid "Version less than 5.1.30 (the first GA release of 5.1)."
msgstr "Version mindre end 5.1.30 (den første GA release af 5.1)"
msgstr "Versionen er mindre end 5.1.30 (den første GA-udgivelse i 5.1)."
#: libraries/advisory_rules.txt:104
msgid ""
@ -12703,7 +12736,7 @@ msgstr ""
#: libraries/advisory_rules.txt:110
msgid "Version less than 5.5.8 (the first GA release of 5.5)."
msgstr "Version mindre end 5.5.8 (den første GA release af 5.5)"
msgstr "Version mindre end 5.5.8 (den første GA-udgivelse i 5.5)."
#: libraries/advisory_rules.txt:111
msgid "You should upgrade, to a stable version of MySQL 5.5"
@ -12785,7 +12818,7 @@ msgstr "Forespørgsel-mellemlager deaktiveret"
#: libraries/advisory_rules.txt:149
msgid "The query cache is not enabled."
msgstr "Forespørgsel-mellemlager er ikke aktiveret"
msgstr "Forespørgsel-mellemlager er ikke aktiveret."
#: libraries/advisory_rules.txt:150
msgid ""
@ -12809,7 +12842,7 @@ msgstr "Metode for forespørgsels-mellemlager"
#: libraries/advisory_rules.txt:156
msgid "Suboptimal caching method."
msgstr "Suboptimal metode for mellemlager"
msgstr "Suboptimal metode for mellemlager."
#: libraries/advisory_rules.txt:157
msgid ""
@ -12914,9 +12947,9 @@ msgid ""
"that the query cache is an alternating pattern of free and used blocks. This "
"value should be below 20%%."
msgstr ""
"Mellemlageret er aktuelt fragmenteret med %s%%. 1%% fragmentering betyder, "
"Mellemlageret er aktuelt fragmenteret med %s%%. 100%% fragmentering betyder, "
"at forespørgselmellemlageret er et skiftende mønster af frie og ubrugte "
"blokke. Denne værdi bør være under 20%%"
"blokke. Denne værdi bør være under 20%%."
#: libraries/advisory_rules.txt:181
msgid "Query cache low memory prunes"
@ -12927,8 +12960,8 @@ msgid ""
"Cached queries are removed due to low query cache memory from the query "
"cache."
msgstr ""
"Mellemlagrede forespørgsler er fjernet pga lav hukommelse i "
"forspørgselmellemlageret"
"Mellemlagrede forespørgsler er fjernet pga. lav hukommelse i "
"forespørgselmellemlageret."
#: libraries/advisory_rules.txt:185
msgid ""
@ -13459,8 +13492,8 @@ msgstr "Frekvens af venten på tabellås"
#, php-format
msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
msgstr ""
"Frekvens af venten på tabellås: %s. Denne værdi bør være mindre end 1 pr "
"time."
"Frekvens af venten på tabellås: %s. Denne værdi bør være mindre end 1 per "
"time"
#: libraries/advisory_rules.txt:355
msgid "Thread cache"
@ -13507,7 +13540,7 @@ msgstr "Tråde som er langsomme til at starte"
#: libraries/advisory_rules.txt:372
msgid "There are too many threads that are slow to launch."
msgstr "Der er for mange tråde, som starter for langsomt"
msgstr "Der er for mange tråde, som starter for langsomt."
#: libraries/advisory_rules.txt:373
msgid ""
@ -13606,7 +13639,7 @@ msgid ""
"Aborted connections rate is at %s, this value should be less than 1 per hour"
msgstr ""
"Frekvensen af aborterede forbindelser er %s. Denne værdi bør være mindre end "
"1 pr time."
"1 per time"
#: libraries/advisory_rules.txt:406
msgid "Percentage of aborted clients"
@ -13640,7 +13673,7 @@ msgstr "Frekvens af aborterede klienter"
msgid "Aborted client rate is at %s, this value should be less than 1 per hour"
msgstr ""
"Frekvensen af aborterede klienter er %s. Denne værdi bør være mindre end 1 "
"pr time."
"per time"
#: libraries/advisory_rules.txt:422
msgid "Is InnoDB disabled?"

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-07-01 18:22+0200\n"
"Last-Translator: J. M. <me@mynetx.net>\n"
"PO-Revision-Date: 2012-07-13 00:19+0200\n"
"Last-Translator: Maxi Lampert <maxilampert@yahoo.de>\n"
"Language-Team: none\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@ -10561,7 +10561,7 @@ msgstr "Netzwerk-Datenverkehr seit Start: %s"
#: server_status.php:1086
#, php-format
msgid "This MySQL server has been running for %1$s. It started up on %2$s."
msgstr "Dieser MySQL-Server läuft bereits %1$s. Er wurde um %2$s gestartet."
msgstr "Dieser MySQL-Server läuft bereits %1$s. Er wurde am %2$s gestartet."
#: server_status.php:1097
msgid ""
@ -12799,7 +12799,7 @@ msgstr "Langsame Anfragen Überwachung"
#: libraries/advisory_rules.txt:87
msgid "The slow query log is disabled."
msgstr "Die Überwachung langsamer Anfragen ist deaktiveirt."
msgstr "Die Überwachung langsamer Anfragen ist deaktiviert."
#: libraries/advisory_rules.txt:88
msgid ""

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-06-26 20:02+0200\n"
"PO-Revision-Date: 2012-07-09 17:51+0200\n"
"Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
"Language-Team: spanish <es@li.org>\n"
"Language: es\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Weblate 1.0\n"
"X-Generator: Weblate 1.1\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
#: libraries/DisplayResults.class.php:609 server_privileges.php:1851
@ -8066,7 +8066,6 @@ msgstr ""
"usa esta última, la primer opción tiene que ser una cadena vacía."
#: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31
#, fuzzy
#| msgid ""
#| "LINUX ONLY: Launches an external application and feeds it the column data "
#| "via standard input. Returns the standard output of the application. The "
@ -8094,10 +8093,10 @@ msgstr ""
"columna mediante entrada estándar. Devuelve la salidad de la aplicación. El "
"valor predeterminado es Tidy para mostrar código HTML agradable para la "
"impresión. Por razones de seguridad, debe editar manualmente el archivo "
"libraries/transformations/text_plain__external.inc.php y agregar las "
"herramientas que permitirá ejecutar. La primera opción será el número del "
"programa que querrá utilizar y la segunda opción son los parámetros para el "
"programa. Si el tercer parámetro es 1 (el valor predeterminado), se "
"libraries/plugins/transformations/Text_Plain_External.class.php y agregar "
"las herramientas que permitirá ejecutar. La primera opción será el número "
"del programa que querrá utilizar y la segunda opción los parámetros para "
"dicho programa. Si el tercer parámetro es 1 (el valor predeterminado), se "
"convertirá la salida utilizando htmlspecialchars(). La cuarta opción, de ser "
"1 (el valor predeterminado), evitará separar la salida en varias líneas "
"asegurando que aparezca completa en una sola línea."

View File

@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-06-26 18:35+0200\n"
"Last-Translator: Gyu-sun Youm <omniavinco@gmail.com>\n"
"PO-Revision-Date: 2012-07-11 16:17+0200\n"
"Last-Translator: Hyun-Sung Yun <bemax38@gmail.com>\n"
"Language-Team: korean <ko@li.org>\n"
"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 1.0\n"
"X-Generator: Weblate 1.1\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
#: libraries/DisplayResults.class.php:609 server_privileges.php:1851
@ -885,7 +885,7 @@ msgstr "출력"
msgid ""
"Chose \"GeomFromText\" from the \"Function\" column and paste the below "
"string into the \"Value\" field"
msgstr ""
msgstr "\"기능\"컬럼에서 \"GeomFromText\"를 선택하고 아래 문자를 복사하여 \"값\"필드에 붙여넣으십시오."
#: import.php:88
#, php-format
@ -1155,7 +1155,6 @@ msgstr "마지막 새로고침 이후 Questions"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:85
#, fuzzy
msgid "Questions (executed statements by the server)"
msgstr "Questions(서버에 의해 실행된 문장)"
@ -1294,7 +1293,7 @@ msgstr "EB"
#: js/messages.php:128
#, php-format
msgid "%d table(s)"
msgstr "%d개 테이블 "
msgstr "%d개 테이블(s)"
#. l10n: Questions is the name of a MySQL Status variable
#: js/messages.php:131
@ -1345,11 +1344,12 @@ msgstr "모니터링 정지"
#: js/messages.php:143
msgid "general_log and slow_query_log are enabled."
msgstr ""
msgstr "general_log 와 slow_query_log 가 활성화 되었습니다."
#: js/messages.php:144
#, fuzzy
msgid "general_log is enabled."
msgstr ""
msgstr "general_log 가 활성화 되었습니다."
#: js/messages.php:145
msgid "slow_query_log is enabled."
@ -1388,8 +1388,7 @@ msgstr "long_query_time이 %d초로 설정되였습니다."
msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
"다음 설정은 서버 전체에 적용됩니다. 서버 재기동시 기본 설정으로 초기화됩니다."
msgstr "다음 설정은 서버 전체에 적용되고 서버 재기동시 기본 설정으로 초기화됩니다:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:153
@ -1413,7 +1412,7 @@ msgstr "%s 사용안함"
#: js/messages.php:159
#, php-format
msgid "Set long_query_time to %ds"
msgstr "long_query_time을 %d초로 설정합니다."
msgstr "long_query_time을 %d초로 설정합니다"
#: js/messages.php:160
msgid ""
@ -1458,9 +1457,8 @@ msgid "From general log"
msgstr "일반 로그로부터"
#: js/messages.php:172
#, fuzzy
msgid "Analysing logs"
msgstr "로그를 불러오고 있습니다."
msgstr "로그 분석중"
#: js/messages.php:173
msgid "Analysing & loading logs. This may take a while."
@ -1488,17 +1486,16 @@ msgstr ""
#: js/messages.php:177
msgid "Log data loaded. Queries executed in this time span:"
msgstr "로그자료가 적재되였습니다. 그동안 질의가 실행되였습니다."
msgstr "로그자료가 로드되었습니다. 쿼리들이 실행되었던 기간:"
#: js/messages.php:179
msgid "Jump to Log table"
msgstr "로그 테이블로 이동"
#: js/messages.php:180
#, fuzzy
#| msgid "No databases"
msgid "No data found"
msgstr "데이터베이스가 없습니다"
msgstr "자료가 없습니다"
#: js/messages.php:181
msgid "Log analysed, but no data found in this time span."
@ -1509,7 +1506,6 @@ msgid "Analyzing..."
msgstr "분석중..."
#: js/messages.php:184
#, fuzzy
#| msgid "Explain SQL"
msgid "Explain output"
msgstr "SQL 해석"
@ -1527,24 +1523,22 @@ msgid "Total time:"
msgstr "전체 시간:"
#: js/messages.php:188
#, fuzzy
#| msgid "Profiling"
msgid "Profiling results"
msgstr "프로파일링"
msgstr "프로파일링 결과"
#: js/messages.php:189
msgctxt "Display format"
msgid "Table"
msgstr "테이블 "
msgstr "테이블"
#: js/messages.php:190
msgid "Chart"
msgstr "차트"
#: js/messages.php:191
#, fuzzy
msgid "Edit chart"
msgstr "필드 추가하기"
msgstr "차트 편집"
#: js/messages.php:192
#, fuzzy
@ -1574,19 +1568,17 @@ msgid "Sum of grouped rows:"
msgstr "그룹화된 행의 합계:"
#: js/messages.php:201
#, fuzzy
#| msgid "Total"
msgid "Total:"
msgstr "전체 사용량"
msgstr "전체:"
#: js/messages.php:203
#, fuzzy
msgid "Loading logs"
msgstr "로그를 불러오고 있습니다."
msgstr "로그를 불러오는 중"
#: js/messages.php:204
msgid "Monitor refresh failed"
msgstr "모니터링 리프리쉬가 실패하였습니다."
msgstr "모니터링 리프리쉬가 실패하였습니다"
#: js/messages.php:205
msgid ""
@ -1594,6 +1586,8 @@ msgid ""
"This is most likely because your session expired. Reloading the page and "
"reentering your credentials should help."
msgstr ""
"새로운 차트 데이터를 요청하는 동안 서버에서 잘못된 응답을 반환했습니다.대부분의 경우 세션이 만료되었기 때문입니다.페이지를 다시 로드하고 "
"새로 인증받는 것이 도움이 될것입니다."
#: js/messages.php:206
msgid "Reload page"
@ -1611,7 +1605,7 @@ msgstr "구성 파일을 분석할 수 없습니다. 유효한 JSON 코드가
msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
msgstr "가져온 설정과 차트 격자를 그리는데 실패했습니다. 기본 설정으로 적용중..."
#: js/messages.php:212 libraries/Menu.class.php:309
#: libraries/Menu.class.php:396 libraries/Menu.class.php:493
@ -1621,14 +1615,13 @@ msgid "Import"
msgstr "가져오기"
#: js/messages.php:213
#, fuzzy
#| msgid "Local monitor configuration incompatible"
msgid "Import monitor configuration"
msgstr "호환되지 않는 로컬 모니터 설정입니다."
msgstr "모니터 설정 가져오기"
#: js/messages.php:214
msgid "Please select the file you want to import"
msgstr ""
msgstr "가져올 파일을 선택해 주시기 바랍니다"
#: js/messages.php:216
msgid "Analyse Query"
@ -1644,7 +1637,7 @@ msgstr "가능한 성능 문제"
#: js/messages.php:222
msgid "Issue"
msgstr ""
msgstr "이슈"
#: js/messages.php:223
msgid "Recommendation"
@ -1676,15 +1669,15 @@ msgstr "취소"
#: js/messages.php:235
msgid "Loading"
msgstr "불러오고 있습니다."
msgstr "불러오는 중"
#: js/messages.php:236
msgid "Processing Request"
msgstr "요청을 처리중입니다."
msgstr "요청을 처리중입니다"
#: js/messages.php:237 libraries/rte/rte_export.lib.php:41
msgid "Error in Processing Request"
msgstr "요청 처리중 에러가 발생했습니다."
msgstr "요청 처리중 에러가 발생했습니다"
#: js/messages.php:238 server_databases.php:90
msgid "No databases selected."
@ -1692,11 +1685,11 @@ msgstr "데이터베이스를 선택하지 않았습니다."
#: js/messages.php:239
msgid "Dropping Column"
msgstr "열을 삭제하고 있습니다."
msgstr "열을 삭제하고 있습니다"
#: js/messages.php:240
msgid "Adding Primary Key"
msgstr "기본 키를 추가하고 있습니다."
msgstr "기본 키를 추가하고 있습니다"
#: js/messages.php:241 pmd_general.php:415 pmd_general.php:572
#: pmd_general.php:620 pmd_general.php:696 pmd_general.php:750
@ -1706,27 +1699,27 @@ msgstr "확인"
#: js/messages.php:242
msgid "Click to dismiss this notification"
msgstr "클릭하면 이 알림을 받지 않습니다."
msgstr "클릭하면 이 알림을 받지 않습니다"
#: js/messages.php:245
msgid "Renaming Databases"
msgstr "데이터베이스 이름을 변경중입니다."
msgstr "데이터베이스 이름을 변경중입니다"
#: js/messages.php:246
msgid "Reload Database"
msgstr "데이터베이스를 다시 불러오고 있습니다."
msgstr "데이터베이스를 다시 불러오"
#: js/messages.php:247
msgid "Copying Database"
msgstr "데이터베이스를 복사중입니다."
msgstr "데이터베이스를 복사중입니다"
#: js/messages.php:248
msgid "Changing Charset"
msgstr "언어를 변경하고 있습니다."
msgstr "언어를 변경하고 있습니다"
#: js/messages.php:249
msgid "Table must have at least one column"
msgstr "테이블은 적어도 1개 이상의 컬럼이 있어야 합니다."
msgstr "테이블은 적어도 1개 이상의 컬럼이 있어야 합니다"
#: js/messages.php:254
msgid "Insert Table"
@ -1809,7 +1802,7 @@ msgstr "%d 값 추가"
#: js/messages.php:279
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다."
msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다"
#: js/messages.php:282
msgid "Hide query box"
@ -1821,7 +1814,7 @@ msgstr "질의 상자 보이기"
#: js/messages.php:285 tbl_row_action.php:21
msgid "No rows selected"
msgstr "선택된 행이 없습니다."
msgstr "선택된 행이 없습니다"
#: js/messages.php:286 libraries/DisplayResults.class.php:4320
#: querywindow.php:84 tbl_structure.php:148 tbl_structure.php:577
@ -1836,7 +1829,7 @@ msgstr "질의 실행 시간"
#: libraries/DisplayResults.class.php:531
#, php-format
msgid "%d is not valid row number."
msgstr ""
msgstr "%d는 올바른 행번호가 아닙니다."
#: js/messages.php:291 libraries/config/FormDisplay.tpl.php:387
#: libraries/insert_edit.lib.php:1487
@ -1862,7 +1855,6 @@ msgid "Zoom Search"
msgstr "추가 검색"
#: js/messages.php:300
#, fuzzy
msgid "Each point represents a data row."
msgstr "각 포인트는 데이터 행을 나타냅니다."

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-07-09 03:26+0200\n"
"PO-Revision-Date: 2012-07-09 16:04+0200\n"
"Last-Translator: Nicholas Arnesen <baretester@live.no>\n"
"Language-Team: norwegian <no@li.org>\n"
"Language: nb\n"
@ -1922,7 +1922,7 @@ msgstr ""
#: js/messages.php:308
msgid "Click a data point to view and possibly edit the data row."
msgstr ""
msgstr "Velg et datapunkt for å vise, og muligens endre raden med data."
#: js/messages.php:310
msgid "The plot can be resized by dragging it along the bottom right corner."
@ -2514,7 +2514,6 @@ msgid "Inline edit of this query"
msgstr "Inline redigering av denne spørringa"
#: libraries/CommonFunctions.class.php:1405
#, fuzzy
msgctxt "Inline edit query"
msgid "Inline"
msgstr "Innebygd"
@ -2541,15 +2540,13 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
msgstr "%s dager, %s timer, %s minutter og %s sekunder"
#: libraries/CommonFunctions.class.php:2204
#, fuzzy
#| msgid "Routines"
msgid "Missing parameter:"
msgstr "Rutiner"
msgstr "Mangler parametere:"
#: libraries/CommonFunctions.class.php:2624
#: libraries/CommonFunctions.class.php:2628
#: libraries/DisplayResults.class.php:578
#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
@ -2559,7 +2556,6 @@ msgstr "Start"
#: libraries/CommonFunctions.class.php:2629
#: libraries/DisplayResults.class.php:581 server_binlog.php:140
#: server_binlog.php:142
#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
@ -2569,7 +2565,6 @@ msgstr "Forrige"
#: libraries/CommonFunctions.class.php:2664
#: libraries/DisplayResults.class.php:637 server_binlog.php:175
#: server_binlog.php:177
#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
@ -2578,11 +2573,10 @@ msgstr "Neste"
#: libraries/CommonFunctions.class.php:2662
#: libraries/CommonFunctions.class.php:2665
#: libraries/DisplayResults.class.php:662
#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "Slutt"
msgstr "Siste"
#: libraries/CommonFunctions.class.php:2741
#, php-format
@ -2595,10 +2589,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
msgstr "Funksjonaliteten %s er påvirket av en kjent feil, se %s"
#: libraries/CommonFunctions.class.php:2950
#, fuzzy
#| msgid "Click to select"
msgid "Click to toggle"
msgstr "Klikk for å velge"
msgstr "Klikk for å endre"
#: libraries/CommonFunctions.class.php:3381
#: libraries/CommonFunctions.class.php:3388
@ -2666,7 +2659,7 @@ msgstr "Det er ingen filer å laste opp"
#: libraries/CommonFunctions.class.php:3602
#: libraries/CommonFunctions.class.php:3603
msgid "Execute"
msgstr ""
msgstr "Utfør"
#: libraries/CommonFunctions.class.php:4146
msgid "Print"
@ -3694,6 +3687,8 @@ msgid ""
"This usually means there is a syntax error in it, please check any errors "
"shown below."
msgstr ""
"Dette mener vanligvis at det er en syntaksfeil i det, sjekk mulige feil som "
"vises under."
#: libraries/common.inc.php:581
#, php-format
@ -3750,15 +3745,15 @@ msgstr "Begge"
#: libraries/config.values.php:57
msgid "Nowhere"
msgstr ""
msgstr "Ingensteds"
#: libraries/config.values.php:58
msgid "Left"
msgstr ""
msgstr "Venstre"
#: libraries/config.values.php:59
msgid "Right"
msgstr ""
msgstr "Høyre"
#: libraries/config.values.php:98
msgid "Open"
@ -3973,9 +3968,8 @@ msgstr ""
"autentisering"
#: libraries/config/messages.inc.php:25
#, fuzzy
msgid "Blowfish secret"
msgstr "Blowfish hemmelighet"
msgstr "Blowfish hemmelig kode"
#: libraries/config/messages.inc.php:26
msgid "Highlight selected rows"
@ -4034,24 +4028,26 @@ msgid ""
"Defines the minimum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
"Definerer minimum størrelse for innskrivningfelt laget for CHAR og VARCHAR "
"kolonner"
#: libraries/config/messages.inc.php:37
#, fuzzy
#| msgid "Customize export options"
msgid "Minimum size for input field"
msgstr "Endre eksportstandarder"
msgstr "Minste størrelse for innskrivningsfelt"
#: libraries/config/messages.inc.php:38
msgid ""
"Defines the maximum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
"Definerer maks størrelse for innskrivningsfelt laget for CHAR og VARCHAR "
"kolonner"
#: libraries/config/messages.inc.php:39
#, fuzzy
#| msgid "Maximum size for temporary sort files"
msgid "Maximum size for input field"
msgstr "Maksimum størrelse for midlertidige sorteringsfiler"
msgstr "Maksimum størrelse for innskrivningsfelt"
#: libraries/config/messages.inc.php:40
msgid "Number of columns for CHAR/VARCHAR textareas"
@ -4171,10 +4167,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:67
#, fuzzy
#| msgid "Table maintenance"
msgid "Disable multi table maintenance"
msgstr "Tabellvedlikehold"
msgstr "Deaktiver multitabellvedlikehold"
#: libraries/config/messages.inc.php:68
msgid "Edit SQL queries in popup window"
@ -4366,7 +4361,7 @@ msgstr "SQL kompatibilitetsmodus"
#: libraries/config/messages.inc.php:126
#: libraries/plugins/export/ExportSql.class.php:332
msgid "<code>CREATE TABLE</code> options:"
msgstr ""
msgstr "<code>OPPRETT TABELL</code> valg:"
#: libraries/config/messages.inc.php:127
msgid "Creation/Update/Check dates"
@ -4706,6 +4701,11 @@ msgid ""
"strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], "
"Copyright 2002 Upright Database Technology. All rights reserved.[/em]"
msgstr ""
"Om du ønsker å bruke SQL-vurderingsservicen så må du være klar over at "
"[strong] alle SQL-spørringer blir lagret anonymt for statistisk "
"bruk[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL-"
"vurderer(engelsk)[/a], Kopirettigheter 2002 Upright Database Technology. "
"Alle rettigheter reservert.[/em]"
#: libraries/config/messages.inc.php:226
msgid "Startup"
@ -4848,7 +4848,6 @@ msgid "Do not import empty rows"
msgstr "Ikke importer tomme rader"
#: libraries/config/messages.inc.php:264
#, fuzzy
#| msgid "Import currencies ($5.00 to 5.00)"
msgid "Import currencies ($5.00 to 5.00)"
msgstr "Importer valuta ($5.00 til 5.00)"
@ -4866,7 +4865,6 @@ msgid "Partial import: skip queries"
msgstr "Delvis import: hopp over spørringer"
#: libraries/config/messages.inc.php:269
#, fuzzy
#| msgid "Do not use AUTO_INCREMENT for zero values"
msgid "Do not use AUTO_INCREMENT for zero values"
msgstr "Ikke bruk AUTO_INCREMENT for nullverdier"
@ -4988,10 +4986,9 @@ msgid "Maximum number of recently used tables; set 0 to disable"
msgstr "Maks antall tabeller vist i tabellista"
#: libraries/config/messages.inc.php:298
#, fuzzy
#| msgid "Untracked tables"
msgid "Recently used tables"
msgstr "Ikke overvåkede tabeller"
msgstr "Sist brukte tabeller"
#: libraries/config/messages.inc.php:299
#, fuzzy
@ -5130,14 +5127,13 @@ msgid "Memory limit"
msgstr "Minnetak"
#: libraries/config/messages.inc.php:325
#, fuzzy
#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "Dette er rediger, innsmettet rediger, kopier og slettede lenker"
msgstr "Disse er Rediger-, kopi- og slettelenker"
#: libraries/config/messages.inc.php:326
msgid "Where to show the table row links"
msgstr ""
msgstr "Hvor tabell-lenkene skal vises"
#: libraries/config/messages.inc.php:327
msgid "Use natural order for sorting table and database names"
@ -5192,7 +5188,7 @@ msgstr ""
#: libraries/config/messages.inc.php:338
msgid "Missing phpMyAdmin configuration storage tables"
msgstr ""
msgstr "Mangler phpMyAdmin konfigurasjonslagertabeller"
#: libraries/config/messages.inc.php:340
msgid "Iconic table operations"
@ -5207,7 +5203,6 @@ msgid "Protect binary columns"
msgstr "Beskytt binære kolonner"
#: libraries/config/messages.inc.php:343
#, fuzzy
#| msgid ""
#| " if you want DB-based query history (requires pmadb). If disabled, s "
#| "lizes JS-routines to display query history (lost by window close)."
@ -5241,7 +5236,7 @@ msgstr "Standard spørringsvindufane"
#: libraries/config/messages.inc.php:350
msgid "Query window height (in pixels)"
msgstr ""
msgstr "Spørringsvinduets høyde (i piksler)"
#: libraries/config/messages.inc.php:351
msgid "Query window height"

View File

@ -4,9 +4,9 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-05-17 14:07+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: iMutrix\n"
"PO-Revision-Date: 2012-07-12 10:11+0000\n"
"Last-Translator: Jan Kowalski <pst3qga@tormail.org>\n"
"Language-Team: pl_PL\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -14254,9 +14254,9 @@ msgstr "concurrent_insert jest ustawiony na 0"
#~ "column, click the \"Choose column to display\" icon, then click on the "
#~ "appropriate column name."
#~ msgstr ""
#~ "Wyświetlania kolumna jest pokazywana w kolorze różowym. Aby ustawić/"
#~ "zmienić kolumny jak wyświetlanie kolumn, kliknij \"Wybierz kolumny do "
#~ "wyświetlenia\", a następnie kliknij odpowiednią nazwę kolumny."
#~ "Wyświetlania kolumna jest pokazywana w kolorze różowym. Aby ustawić/zmienić "
#~ "kolumny jak wyświetlanie kolumn, kliknij \"Wybierz kolumny do wyświetlenia\", "
#~ "a następnie kliknij odpowiednią nazwę kolumny."
#~ msgid "The number of free memory blocks in query cache."
#~ msgstr "Liczba wolnych bloków pamięci w podręcznym buforze zapytań."

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-07-08 20:32+0200\n"
"Last-Translator: Keven do Nascimento Carneiro <kevennascimento@ovi.com>\n"
"PO-Revision-Date: 2012-07-16 22:05+0200\n"
"Last-Translator: Bruno Rafael <brunorafael@oi.com.br>\n"
"Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@ -3000,15 +3000,14 @@ msgid "Designer"
msgstr "Designer"
#: libraries/Menu.class.php:484
#, fuzzy
#| msgid "User"
msgid "Users"
msgstr "Usuário"
msgstr "Usuários"
#: libraries/Menu.class.php:505 server_synchronize.php:1320
#: server_synchronize.php:1327
msgid "Synchronize"
msgstr ""
msgstr "Sincronizar"
#: libraries/Menu.class.php:510 server_binlog.php:73 server_status.php:619
msgid "Binary log"
@ -3660,7 +3659,7 @@ msgstr "Você deveria atualizar para %s %s ou posterior."
#: libraries/common.inc.php:1076
msgid "GLOBALS overwrite attempt"
msgstr ""
msgstr "Tentativa de sobrescrever GLOBALS"
#: libraries/common.inc.php:1083
msgid "possible exploit"
@ -6764,17 +6763,20 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:28
msgid "Index cache size"
msgstr ""
msgstr "Tamanho de cache de índice"
#: libraries/engines/pbxt.lib.php:29
msgid ""
"This is the amount of memory allocated to the index cache. Default value is "
"32MB. The memory allocated here is used only for caching index pages."
msgstr ""
"Esta é a quantidade de memória alocada para o cache de índice. O valor "
"padrão é 32MB. A memória alocada aqui é usada apenas para cache de páginas "
"index."
#: libraries/engines/pbxt.lib.php:33
msgid "Record cache size"
msgstr ""
msgstr "Tamanho de cache de gravação"
#: libraries/engines/pbxt.lib.php:34
msgid ""
@ -6782,6 +6784,10 @@ msgid ""
"table data. The default value is 32MB. This memory is used to cache changes "
"to the handle data (.xtd) and row pointer (.xtr) files."
msgstr ""
"Esta é a quantidade de memória alocada para o cache de gravação usado no "
"cache de dados de tabela. O valor padrão é 32MB. Esta memória será usada "
"para fazer cache de alterações para a manipulação de dados (.xtd) e arquivos "
"apontadores de linha (.xtr)."
#: libraries/engines/pbxt.lib.php:38
msgid "Log cache size"
@ -6792,16 +6798,20 @@ msgid ""
"The amount of memory allocated to the transaction log cache used to cache on "
"transaction log data. The default is 16MB."
msgstr ""
"Quantidade de memória alocada para o cache de log de transação usada para "
"manter cache no log da transação de dados. O valor padrão é 16MB."
#: libraries/engines/pbxt.lib.php:43
msgid "Log file threshold"
msgstr ""
msgstr "Limite de arquivo de log"
#: libraries/engines/pbxt.lib.php:44
msgid ""
"The size of a transaction log before rollover, and a new log is created. The "
"default value is 16MB."
msgstr ""
"Tamanho do log de transação antes da mudança e o novo log criado. O valor "
"padrão é 16MB."
#: libraries/engines/pbxt.lib.php:48
msgid "Transaction buffer size"
@ -6812,20 +6822,24 @@ msgid ""
"The size of the global transaction log buffer (the engine allocates 2 "
"buffers of this size). The default is 1MB."
msgstr ""
"O tamanho do buffer do log global de transações (a engine aloca 2 buffers "
"deste tamanho). O padrão é 1MB."
#: libraries/engines/pbxt.lib.php:53
msgid "Checkpoint frequency"
msgstr ""
msgstr "Frequência de ponto de verificação"
#: libraries/engines/pbxt.lib.php:54
msgid ""
"The amount of data written to the transaction log before a checkpoint is "
"performed. The default value is 24MB."
msgstr ""
"A quantidade dados escritos no log de transação antes que um ponto de "
"checagem é realizado. O valor padrão é 24MB."
#: libraries/engines/pbxt.lib.php:58
msgid "Data log threshold"
msgstr ""
msgstr "Início do log de dados"
#: libraries/engines/pbxt.lib.php:59
msgid ""
@ -6834,16 +6848,22 @@ msgid ""
"value of this variable can be increased to increase the total amount of data "
"that can be stored in the database."
msgstr ""
"Tamanho máximo do log de dados. O valor padrão é 64MB. PBXT pode criar no "
"máximo 32000 logs da dados, que são usados por todas as tabelas. Então o "
"valor desta variável pode ser incrementado para aumentar a quantidade total "
"dos dados que podem ser armazenados no banco de dados."
#: libraries/engines/pbxt.lib.php:63
msgid "Garbage threshold"
msgstr ""
msgstr "Início do lixo"
#: libraries/engines/pbxt.lib.php:64
msgid ""
"The percentage of garbage in a data log file before it is compacted. This is "
"a value between 1 and 99. The default is 50."
msgstr ""
"O percentual de lixo em um arquivo de dados de log antes de compactá-lo. "
"Este valor está entre 1 e 99. O padrão é 50."
#: libraries/engines/pbxt.lib.php:68
msgid "Log buffer size"
@ -6855,26 +6875,29 @@ msgid ""
"The engine allocates one buffer per thread, but only if the thread is "
"required to write a data log."
msgstr ""
"Tamanho de buffer usado quando escreve dados no log. O padrão é 256MB. A "
"engine aloca um buffer por thread, mas apenas se a thread requisitar escrita "
"de dados de log."
#: libraries/engines/pbxt.lib.php:73
msgid "Data file grow size"
msgstr ""
msgstr "Tamanho que um arquivo de dados pode atingir"
#: libraries/engines/pbxt.lib.php:74
msgid "The grow size of the handle data (.xtd) files."
msgstr ""
msgstr "Tamanho que um arquivo de controle de dados (.xtd) pode atingir."
#: libraries/engines/pbxt.lib.php:78
msgid "Row file grow size"
msgstr ""
msgstr "Tamanho que a linha de um arquivo pode atingir"
#: libraries/engines/pbxt.lib.php:79
msgid "The grow size of the row pointer (.xtr) files."
msgstr ""
msgstr "Tamanho que um ponteiro de linha (.xtr) pode atingir."
#: libraries/engines/pbxt.lib.php:83
msgid "Log file count"
msgstr ""
msgstr "Soma de arquivos de log"
#: libraries/engines/pbxt.lib.php:84
msgid ""
@ -6883,6 +6906,10 @@ msgid ""
"will be deleted, otherwise they are renamed and given the next highest "
"number."
msgstr ""
"Este é o número de arquivos de log de transação (pbxt/system/xlog*.xt) que o "
"sistema irá manter. Se o número de logs exceder esse valor, os arquivos de "
"log antigos serão deletados, ou então eles serão renomeados e terão o "
"próximo número maior."
#: libraries/engines/pbxt.lib.php:133
#, php-format
@ -6890,6 +6917,8 @@ msgid ""
"Documentation and further information about PBXT can be found on the "
"%sPrimeBase XT Home Page%s."
msgstr ""
"Documentação e mais informações sobre PBXT podem ser encontradas na %"
"sPrimeBase XT Home Page%s."
#: libraries/engines/pbxt.lib.php:135
msgid "Related Links"
@ -6897,7 +6926,7 @@ msgstr "Links relacionados"
#: libraries/engines/pbxt.lib.php:137
msgid "The PrimeBase XT Blog by Paul McCullagh"
msgstr ""
msgstr "O PrimeBase XT Blog por Paul McCullagh"
#: libraries/gis_visualization.lib.php:135
msgid "No data found for GIS visualization."
@ -6915,16 +6944,18 @@ msgstr ""
#: libraries/import.lib.php:1172
msgid "View a structure's contents by clicking on its name"
msgstr ""
msgstr "Visualize o conteúdo da estrutura clicando neste nome"
#: libraries/import.lib.php:1173
msgid ""
"Change any of its settings by clicking the corresponding \"Options\" link"
msgstr ""
"Altere qualquer uma destas configurações clicando no link \"Opções\" "
"correspondente"
#: libraries/import.lib.php:1174
msgid "Edit structure by following the \"Structure\" link"
msgstr ""
msgstr "Edite a estrutura clicando em \"Estrutura\""
#: libraries/import.lib.php:1178
#, php-format
@ -7036,7 +7067,7 @@ msgstr "Nenhuma"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:153
msgid "Convert to Kana"
msgstr ""
msgstr "Converter para Kana"
#: libraries/mult_submits.inc.php:279
msgid "From"
@ -7044,7 +7075,7 @@ msgstr "Do"
#: libraries/mult_submits.inc.php:282
msgid "To"
msgstr ""
msgstr "Para"
#: libraries/mult_submits.inc.php:287 libraries/mult_submits.inc.php:300
#: libraries/sql_query_form.lib.php:423
@ -7053,7 +7084,7 @@ msgstr "Submeter"
#: libraries/mult_submits.inc.php:292
msgid "Add table prefix"
msgstr ""
msgstr "Adicionar prefixo de tabela"
#: libraries/mult_submits.inc.php:295
msgid "Add prefix"
@ -7269,7 +7300,7 @@ msgstr "Documentação do phpMyAdmin"
#: libraries/navigation_header.inc.php:94
#: libraries/navigation_header.inc.php:95
msgid "Reload navigation frame"
msgstr ""
msgstr "Recarregar frame de navegação"
#: libraries/plugin_interface.lib.php:350
msgid "This format has no options"
@ -7419,6 +7450,7 @@ msgstr "Substituir NULL com:"
#: libraries/plugins/export/ExportExcel.class.php:52
msgid "Remove carriage return/line feed characters within columns"
msgstr ""
"Remover retorno do carro/caractere de alimentação de linha dentro de colunas"
#: libraries/plugins/export/ExportExcel.class.php:67
msgid "Excel edition:"
@ -7549,7 +7581,7 @@ msgstr "Versão do PHP"
#: libraries/plugins/export/ExportMediawiki.class.php:39
#: libraries/plugins/import/ImportMediawiki.class.php:52
msgid "MediaWiki Table"
msgstr ""
msgstr "Tabela MediaWiki"
#: libraries/plugins/export/ExportMediawiki.class.php:77
#, fuzzy
@ -7576,13 +7608,15 @@ msgstr "Título do Relatório:"
#: libraries/plugins/export/ExportPhparray.class.php:39
msgid "PHP array"
msgstr ""
msgstr "Array PHP"
#: libraries/plugins/export/ExportSql.class.php:152
msgid ""
"Display comments <i>(includes info such as export timestamp, PHP version, "
"and server version)</i>"
msgstr ""
"Mostrar comentários <i>(incluindo informação como data e hora de exportação, "
"versão do PHP e versão do servidor)</i>"
#: libraries/plugins/export/ExportSql.class.php:160
msgid "Additional custom header comment (\\n splits lines):"
@ -7593,11 +7627,15 @@ msgid ""
"Include a timestamp of when databases were created, last updated, and last "
"checked"
msgstr ""
"Incluir data e hora quando bancos de dados forem criados, atualizados pela "
"última vez e checados pela última vez."
#: libraries/plugins/export/ExportSql.class.php:224
msgid ""
"Database system or older MySQL server to maximize output compatibility with:"
msgstr ""
"Sistema de banco de dados ou servidor de MySQL antigo para maximizar saída "
"de compatível com:"
#: libraries/plugins/export/ExportSql.class.php:242
#: libraries/plugins/export/ExportSql.class.php:310
@ -7615,6 +7653,8 @@ msgid ""
"Enclose table and column names with backquotes <i>(Protects column and table "
"names formed with special characters or keywords)</i>"
msgstr ""
"Envolver nomes de tabela e colunas com crase <i>(Proteger nomes de colunas e "
"tabelas formados com caracteres especiais ou palavras chaves)</i>"
#: libraries/plugins/export/ExportSql.class.php:381
#: libraries/plugins/export/ExportSql.class.php:1610
@ -7623,23 +7663,23 @@ msgstr ""
#: libraries/plugins/export/ExportSql.class.php:388
msgid "Instead of <code>INSERT</code> statements, use:"
msgstr ""
msgstr "Em vez de declarar <code>INSERT</code>, use:"
#: libraries/plugins/export/ExportSql.class.php:396
msgid "<code>INSERT DELAYED</code> statements"
msgstr ""
msgstr "declarações <code>INSERT DELAYED</code>"
#: libraries/plugins/export/ExportSql.class.php:406
msgid "<code>INSERT IGNORE</code> statements"
msgstr ""
msgstr "declarações <code>INSERT IGNORE</code>"
#: libraries/plugins/export/ExportSql.class.php:421
msgid "Function to use when dumping data:"
msgstr ""
msgstr "Função usada quando despejar dados:"
#: libraries/plugins/export/ExportSql.class.php:434
msgid "Syntax to use when inserting data:"
msgstr ""
msgstr "Sintaxe para usar quando inserir dados:"
#: libraries/plugins/export/ExportSql.class.php:442
msgid ""
@ -7647,6 +7687,9 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
"(1,2,3)</code>"
msgstr ""
"incluir nomes de columas em cada declaração <code>INSERT</code><br /> &nbsp; "
"&nbsp; &nbsp; Exemplo: <code>INSERT INTO tbl_name (col_A,col_B,col_C) "
"VALUES (1,2,3)</code>"
#: libraries/plugins/export/ExportSql.class.php:447
msgid ""
@ -7654,30 +7697,43 @@ msgid ""
"&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
msgstr ""
"inserir múltiplas linhas em cada declaração <code>INSERT</code><br /> &nbsp; "
"&nbsp; &nbsp; Exemplo: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
"(7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:452
msgid ""
"both of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
msgstr ""
"acima referidos<br /> &nbsp; &nbsp; &nbsp; Exemplo: <code>INSERT INTO "
"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
#: libraries/plugins/export/ExportSql.class.php:457
#, fuzzy
msgid ""
"neither of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO "
"tbl_name VALUES (1,2,3)</code>"
msgstr ""
"Nenhuma das opções acima<br /> &nbsp; &nbsp; &nbsp; Exemplo: <code>INSERT "
"INTO tbl_name VALUES (1,2,3)</code>"
#: libraries/plugins/export/ExportSql.class.php:478
msgid ""
"Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
"0x616263)</i>"
msgstr ""
"Esvaziar colunas binárias em notação hexadecimal <i>(por exemplo, \"abc\" "
"seria 0x616263)</i>"
#: libraries/plugins/export/ExportSql.class.php:490
msgid ""
"Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and "
"reloaded between servers in different time zones)</i>"
msgstr ""
"Esvaziar colunas TIMESTAMP em UTC <i>(habilitar colunas de TIMESTAMP para "
"serem esvaziadas e recarregadas entre servidores em zonas horárias "
"diferentes)</i>"
#: libraries/plugins/export/ExportSql.class.php:544
#: libraries/plugins/export/ExportXml.class.php:104
@ -7716,7 +7772,7 @@ msgstr "XML"
#: libraries/plugins/export/ExportXml.class.php:93
msgid "Object creation options (all are recommended)"
msgstr ""
msgstr "Opções de criação de objeto (todas são recomendadas)"
#: libraries/plugins/export/ExportXml.class.php:121
msgid "Views"
@ -7732,6 +7788,8 @@ msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
msgstr ""
"A primeira linha do arquivo contem os nomes da colunas da tabela <i>(se não "
"estiver checado, a primeira linha irá torna-se parte dos dados)</i>"
#: libraries/plugins/import/ImportCsv.class.php:117
msgid ""
@ -7739,6 +7797,9 @@ msgid ""
"database, list the corresponding column names here. Column names must be "
"separated by commas and not enclosed in quotations."
msgstr ""
"Se os dados em cada linha do arquivo não estiverem na mesma ordem que no "
"banco de dados, liste os nomes correspondestes da colunas aqui. Os nomes das "
"colunas devem estar separados por vírgulas e não deve conter aspas."
#: libraries/plugins/import/ImportCsv.class.php:126
msgid "Column names: "
@ -7758,6 +7819,8 @@ msgid ""
"Invalid column (%s) specified! Ensure that columns names are spelled "
"correctly, separated by commas, and not enclosed in quotes."
msgstr ""
"Coluna inválida (%s) especificada. Assegure-se que o nome desta coluna está "
"escrito corretamente, separado por vírgulas e entre aspas."
#: libraries/plugins/import/ImportCsv.class.php:319
#: libraries/plugins/import/ImportCsv.class.php:594
@ -7797,11 +7860,11 @@ msgstr "Formato inválido na linha %d da entrada CSV."
#: libraries/plugins/import/ImportOds.class.php:73
msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
msgstr ""
msgstr "Importar percentuais com decimais adequados <i>(ex. 12.00% to .12)</i>"
#: libraries/plugins/import/ImportOds.class.php:78
msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
msgstr ""
msgstr "Importar moedas <i>(ex. R$5.00 para 5.00)</i>"
#: libraries/plugins/import/ImportOds.class.php:151
#: libraries/plugins/import/ImportXml.class.php:126
@ -7810,26 +7873,30 @@ msgid ""
"The XML file specified was either malformed or incomplete. Please correct "
"the issue and try again."
msgstr ""
"O arquivo XML especificado está mal formado ou incompleto. Favor corrigir o "
"problema e tentar novamente."
#: libraries/plugins/import/ImportShp.class.php:49
msgid "ESRI Shape File"
msgstr ""
msgstr "Arquivo em formato ESRI"
#: libraries/plugins/import/ImportShp.class.php:149
#, php-format
msgid "There was an error importing the ESRI shape file: \"%s\"."
msgstr ""
msgstr "Ocorreu um erro ao importar o arquivo do tipo ESRI: \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:202
msgid ""
"You tried to import an invalid file or the imported file contains invalid "
"data"
msgstr ""
"Você tentou importar um arquivo inválido ou o arquivo importado contém dados "
"inválidos"
#: libraries/plugins/import/ImportShp.class.php:208
#, php-format
msgid "MySQL Spatial Extension does not support ESRI type \"%s\"."
msgstr ""
msgstr "Extensão Espacial MySQL não suporta o tipo ESRI \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:256
msgid "The imported file does not contain any data"
@ -7841,7 +7908,7 @@ msgstr "Modo de compatibilidade SQL:"
#: libraries/plugins/import/ImportSql.class.php:68
msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
msgstr ""
msgstr "Não use <code>AUTO_INCREMENT</code> para valores zerados"
#: libraries/plugins/import/PMA_ShapeRecord.class.php:58
#, php-format
@ -8062,34 +8129,40 @@ msgstr "Tabelas persistentes recentemente usadas"
#: libraries/relation.lib.php:227
msgid "Persistent tables' UI preferences"
msgstr ""
msgstr "Persistir tabelas de preferência de UI"
#: libraries/relation.lib.php:249
msgid "User preferences"
msgstr ""
msgstr "Preferências do usuário"
#: libraries/relation.lib.php:255
msgid "Quick steps to setup advanced features:"
msgstr ""
msgstr "Passos rápidos para a instalação de recursos avançados:"
#: libraries/relation.lib.php:259
msgid ""
"Create the needed tables with the <code>examples/create_tables.sql</code>."
msgstr ""
"Criar tabelas necessárias com o <code>examples/create_tables.sql</code>."
#: libraries/relation.lib.php:265
msgid "Create a pma user and give access to these tables."
msgstr ""
msgstr "Criar um usuário pma e dar acesso a essas tabelas."
#: libraries/relation.lib.php:270
msgid ""
"Enable advanced features in configuration file (<code>config.inc.php</"
"code>), for example by starting from <code>config.sample.inc.php</code>."
msgstr ""
"Ativar recursos avançados no arquivo de configuração "
"(<code>config.inc.php</code>), por exemplo iniciando em "
"<code>config.sample.inc.php</code>."
#: libraries/relation.lib.php:278
msgid "Re-login to phpMyAdmin to load the updated configuration file."
msgstr ""
"Logar novamente no phpMyAdmin para carregar o arquivo de configuração "
"atualizado."
#: libraries/relation.lib.php:1393
msgid "no description"
@ -8101,17 +8174,20 @@ msgstr "Desmarcar todos"
#: libraries/replication_gui.lib.php:54
msgid "Slave configuration"
msgstr ""
msgstr "Configuração do escravo"
#: libraries/replication_gui.lib.php:54 server_replication.php:385
msgid "Change or reconfigure master server"
msgstr ""
msgstr "Alterar ou reconfigurar o servidor mestre"
#: libraries/replication_gui.lib.php:55
msgid ""
"Make sure, you have unique server-id in your configuration file (my.cnf). If "
"not, please add the following line into [mysqld] section:"
msgstr ""
"Certifique-se de que você tem um ID de servidor único no seu arquivo de "
"configuração (my.cfn). Senão, favor adicionar a seguinte linha dentro da "
"seção [mysqld]:"
#: libraries/replication_gui.lib.php:58 libraries/replication_gui.lib.php:59
#: libraries/replication_gui.lib.php:265 libraries/replication_gui.lib.php:268
@ -8147,10 +8223,12 @@ msgid ""
"Only slaves started with the --report-host=host_name option are visible in "
"this list."
msgstr ""
"Apenas os escravos iniciados com a opção --report-host=host_name estão "
"visíveis nesta lista."
#: libraries/replication_gui.lib.php:256 server_replication.php:224
msgid "Add slave replication user"
msgstr ""
msgstr "Adicionar escravo de replicação de usuário"
#: libraries/replication_gui.lib.php:270 server_privileges.php:909
msgid "Any user"
@ -8184,6 +8262,8 @@ msgid ""
"When Host table is used, this field is ignored and values stored in Host "
"table are used instead."
msgstr ""
"Quanto a tabela Host é usada, este campo é ignorado e os valores armazenados "
"na tabela Host são usados no lugar."
#: libraries/replication_gui.lib.php:378
msgid "Generate Password"
@ -8279,49 +8359,49 @@ msgstr "Após a conclusão manter"
#: libraries/rte/rte_events.lib.php:483 libraries/rte/rte_routines.lib.php:993
#: libraries/rte/rte_triggers.lib.php:368
msgid "Definer"
msgstr ""
msgstr "Definidor"
#: libraries/rte/rte_events.lib.php:528
#: libraries/rte/rte_routines.lib.php:1059
#: libraries/rte/rte_triggers.lib.php:407
msgid "The definer must be in the \"username@hostname\" format"
msgstr ""
msgstr "O definidor deve estar no formato \"username@hostname\""
#: libraries/rte/rte_events.lib.php:535
msgid "You must provide an event name"
msgstr ""
msgstr "Você deve informar o nome do evento"
#: libraries/rte/rte_events.lib.php:547
msgid "You must provide a valid interval value for the event."
msgstr ""
msgstr "Você deve informar um valor de intervalo válido para o evento."
#: libraries/rte/rte_events.lib.php:559
msgid "You must provide a valid execution time for the event."
msgstr ""
msgstr "Você deve informar um tempo de execução válido para o evento."
#: libraries/rte/rte_events.lib.php:563
msgid "You must provide a valid type for the event."
msgstr ""
msgstr "Você deve informar um tipo válido para o evento."
#: libraries/rte/rte_events.lib.php:582
msgid "You must provide an event definition."
msgstr ""
msgstr "Você deve informar uma definição do evento."
#: libraries/rte/rte_footer.lib.php:31 server_privileges.php:2598
msgid "New"
msgstr ""
msgstr "Novo"
#: libraries/rte/rte_footer.lib.php:93
msgid "OFF"
msgstr ""
msgstr "Desligado"
#: libraries/rte/rte_footer.lib.php:98
msgid "ON"
msgstr ""
msgstr "Ligado"
#: libraries/rte/rte_footer.lib.php:110
msgid "Event scheduler status"
msgstr ""
msgstr "Status do agendador de eventos"
#: libraries/rte/rte_list.lib.php:55
msgid "Returns"
@ -8374,7 +8454,7 @@ msgstr "Nome das rotinas"
#: libraries/rte/rte_routines.lib.php:913
msgid "Parameters"
msgstr ""
msgstr "Parâmetros"
#: libraries/rte/rte_routines.lib.php:918
msgid "Direction"
@ -8406,7 +8486,7 @@ msgstr "Opções de retorno"
#: libraries/rte/rte_routines.lib.php:989
msgid "Is deterministic"
msgstr ""
msgstr "É determinístico"
#: libraries/rte/rte_routines.lib.php:998
msgid "Security type"
@ -8414,16 +8494,16 @@ msgstr "Tipo de segurança"
#: libraries/rte/rte_routines.lib.php:1005
msgid "SQL data access"
msgstr ""
msgstr "Acesso de dados SQL"
#: libraries/rte/rte_routines.lib.php:1075
msgid "You must provide a routine name"
msgstr ""
msgstr "Você deve informar o nome da rotina"
#: libraries/rte/rte_routines.lib.php:1101
#, php-format
msgid "Invalid direction \"%s\" given for parameter."
msgstr ""
msgstr "Direção inválida \"%s\" dada para o parâmetro."
#: libraries/rte/rte_routines.lib.php:1115
#: libraries/rte/rte_routines.lib.php:1157
@ -8431,18 +8511,20 @@ msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
msgstr ""
"Você deve informar tamanhos/comprimentos para os parâmetros de rotina do "
"tipo ENUM, SET, VARCHAR and VARBINARY."
#: libraries/rte/rte_routines.lib.php:1133
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
msgstr "Você deve informar um nome e um tipo para cada parâmetro de rotina."
#: libraries/rte/rte_routines.lib.php:1145
msgid "You must provide a valid return type for the routine."
msgstr ""
msgstr "Você deve informar um tipo de retorno válido para a rotina."
#: libraries/rte/rte_routines.lib.php:1191
msgid "You must provide a routine definition."
msgstr ""
msgstr "Você deve informar uma definição da rotina."
#: libraries/rte/rte_routines.lib.php:1286
#, php-format
@ -8495,15 +8577,15 @@ msgstr "Tempo"
#: libraries/rte/rte_triggers.lib.php:414
msgid "You must provide a trigger name"
msgstr ""
msgstr "Você deve informar o nome da trigger"
#: libraries/rte/rte_triggers.lib.php:419
msgid "You must provide a valid timing for the trigger"
msgstr ""
msgstr "Você deve informar um tempo válido para a trigger"
#: libraries/rte/rte_triggers.lib.php:424
msgid "You must provide a valid event for the trigger"
msgstr ""
msgstr "Você deve informar um evento válido para a trigger"
#: libraries/rte/rte_triggers.lib.php:430
msgid "You must provide a valid table name"
@ -8511,7 +8593,7 @@ msgstr "Você precisa colocar um nome de tabela válido"
#: libraries/rte/rte_triggers.lib.php:436
msgid "You must provide a trigger definition."
msgstr ""
msgstr "Você deve informar uma definição para a trigger."
#: libraries/rte/rte_words.lib.php:22
msgid "Add routine"
@ -8583,10 +8665,10 @@ msgid "You do not have the necessary privileges to create an event"
msgstr "Você não tem permissões suficientes para criar um novo evento"
#: libraries/rte/rte_words.lib.php:51
#, fuzzy, php-format
#, php-format
#| msgid "No tables found in database"
msgid "No event with name %1$s found in database %2$s"
msgstr "Nenhuma tabela encontrada no banco de dados"
msgstr "Nenhum evento com o nome %1$s foi encontrado no banco de dados %2$s"
#: libraries/rte/rte_words.lib.php:52
msgid "There are no events to display."
@ -8622,11 +8704,11 @@ msgstr "Esquema do Banco de Dados \"%s\" - Página %s"
#: libraries/schema/Export_Relation_Schema.class.php:206
msgid "This page does not contain any tables!"
msgstr ""
msgstr "Esta página não contem todas tabelas!"
#: libraries/schema/Export_Relation_Schema.class.php:232
msgid "SCHEMA ERROR: "
msgstr ""
msgstr "ERRO DE ESQUEMA:"
#: libraries/schema/Pdf_Relation_Schema.class.php:940
#: libraries/schema/Pdf_Relation_Schema.class.php:1261
@ -8658,10 +8740,9 @@ msgid "Page name"
msgstr "Numero da página"
#: libraries/schema/User_Schema.class.php:158
#, fuzzy
#| msgid "Automatic layout"
msgid "Automatic layout based on"
msgstr "Leiaute automático"
msgstr "Leiaute automático baseado em"
#: libraries/schema/User_Schema.class.php:161
msgid "Internal relations"
@ -8669,31 +8750,29 @@ msgstr "Relações internas"
#: libraries/schema/User_Schema.class.php:171
msgid "FOREIGN KEY"
msgstr ""
msgstr "CHAVE ESTRANGEIRA"
#: libraries/schema/User_Schema.class.php:206
msgid "Please choose a page to edit"
msgstr "Escolha a página para editar"
#: libraries/schema/User_Schema.class.php:211
#, fuzzy
#| msgid "Select Tables"
msgid "Select page"
msgstr "Tabelas selecionadas"
msgstr "Selecionar página"
#: libraries/schema/User_Schema.class.php:279
msgid "Select Tables"
msgstr "Tabelas selecionadas"
#: libraries/schema/User_Schema.class.php:417
#, fuzzy
#| msgid "Relational schema"
msgid "Display relational schema"
msgstr "Esquema relacional"
msgstr "Mostrar esquema relacional"
#: libraries/schema/User_Schema.class.php:427
msgid "Select Export Relational Type"
msgstr ""
msgstr "Selecione o Tipo de Exportação Relacional"
#: libraries/schema/User_Schema.class.php:448
msgid "Show grid"
@ -8713,7 +8792,7 @@ msgstr "Mostrar todas as tabelas com o mesmo tamanho"
#: libraries/schema/User_Schema.class.php:460
msgid "Only show keys"
msgstr ""
msgstr "Mostrar apenas chaves"
#: libraries/schema/User_Schema.class.php:462
msgid "Landscape"
@ -8724,10 +8803,9 @@ msgid "Portrait"
msgstr "Retrato"
#: libraries/schema/User_Schema.class.php:465
#, fuzzy
#| msgid "Creation"
msgid "Orientation"
msgstr "Criação"
msgstr "Orientação"
#: libraries/schema/User_Schema.class.php:478
msgid "Paper size"
@ -8757,10 +8835,9 @@ msgid "Unknown language: %1$s."
msgstr "Linguagem desconhecida: %1$s."
#: libraries/select_server.lib.php:37 libraries/select_server.lib.php:42
#, fuzzy
#| msgid "Server"
msgid "Current Server"
msgstr "Servidor"
msgstr "Servidor Atual"
#: libraries/server_synchronize.lib.php:1546 server_synchronize.php:1353
#, fuzzy
@ -8770,16 +8847,16 @@ msgstr "Procurar no Banco de Dados"
#: libraries/server_synchronize.lib.php:1549
#: libraries/server_synchronize.lib.php:1559
msgid "Current server"
msgstr ""
msgstr "Servidor atual"
#: libraries/server_synchronize.lib.php:1551
#: libraries/server_synchronize.lib.php:1561
msgid "Remote server"
msgstr ""
msgstr "Servidor remoto"
#: libraries/server_synchronize.lib.php:1555
msgid "Difference"
msgstr ""
msgstr "Diferença"
#: libraries/server_synchronize.lib.php:1556 server_synchronize.php:1355
#, fuzzy

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
"PO-Revision-Date: 2012-06-29 16:10+0200\n"
"Last-Translator: Michal Remiš <michal.remis@gmail.com>\n"
"PO-Revision-Date: 2012-07-13 13:53+0200\n"
"Last-Translator: Martin Lacina <martin@whistler.sk>\n"
"Language-Team: slovak <sk@li.org>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
@ -280,16 +280,16 @@ msgid "The database name is empty!"
msgstr "Meno databázy je prázdne!"
#: db_operations.php:328
#, fuzzy, php-format
#, php-format
#| msgid "Database %s has been renamed to %s"
msgid "Database %1$s has been renamed to %2$s"
msgstr "Databáza %s bola premenovaná na %s"
msgstr "Databáza %1$s bola premenovaná na %2$s"
#: db_operations.php:332
#, fuzzy, php-format
#, php-format
#| msgid "Database %s has been copied to %s"
msgid "Database %1$s has been copied to %2$s"
msgstr "Databáza %s bola skopírovaná do %s"
msgstr "Databáza %1$s bola skopírovaná do %2$s"
#: db_operations.php:466
msgid "Rename database to"
@ -995,10 +995,10 @@ msgid "\"DROP DATABASE\" statements are disabled."
msgstr "Príkaz \"DROP DATABASE\" je zakázaný."
#: js/messages.php:30
#, fuzzy, php-format
#, php-format
#| msgid "Do you really want to "
msgid "Do you really want to execute \"%s\"?"
msgstr "Skutočne chcete vykonať príkaz "
msgstr "Skutočne chcete vykonať príkaz \"%s\"?"
#: js/messages.php:31 libraries/mult_submits.inc.php:307 sql.php:414
msgid "You are about to DESTROY a complete database!"
@ -1508,7 +1508,6 @@ msgid "Jump to Log table"
msgstr "Prejsť na tabuľku so záznamami"
#: js/messages.php:180
#, fuzzy
#| msgid "No data"
msgid "No data found"
msgstr "Žiadne dáta"
@ -1553,15 +1552,13 @@ msgid "Chart"
msgstr "Graf"
#: js/messages.php:191
#, fuzzy
msgid "Edit chart"
msgstr "Odstrániť index/indexy"
msgstr "Upraviť graf"
#: js/messages.php:192
#, fuzzy
#| msgid "Series:"
msgid "Series"
msgstr "Série:"
msgstr "Série"
#. l10n: A collection of available filters
#: js/messages.php:195
@ -1753,22 +1750,19 @@ msgid "Show indexes"
msgstr "Zobraziť indexy"
#: js/messages.php:257 libraries/mult_submits.inc.php:317
#, fuzzy
#| msgid "Disable foreign key checks"
msgid "Foreign key check:"
msgstr "Vypnúť kontrolu cudzích kľúčov"
msgstr "Kontrola cudzích kľúčov:"
#: js/messages.php:258 libraries/mult_submits.inc.php:321
#, fuzzy
#| msgid "Enabled"
msgid "(Enabled)"
msgstr "Zapnuté"
msgstr "(Zapnuté)"
#: js/messages.php:259 libraries/mult_submits.inc.php:321
#, fuzzy
#| msgid "Disabled"
msgid "(Disabled)"
msgstr "Vypnuté"
msgstr "(Vypnuté)"
#: js/messages.php:262
msgid "Searching"
@ -1999,20 +1993,18 @@ msgid "Go to link"
msgstr "Prejsť na odkaz"
#: js/messages.php:358
#, fuzzy
#| msgid "Column names"
msgid "Copy column name"
msgstr "Názvy stĺpcov"
msgstr "Kopírovať názov stĺpca"
#: js/messages.php:359
msgid "Right-click the column name to copy it to your clipboard."
msgstr ""
#: js/messages.php:360
#, fuzzy
#| msgid "Update row(s)"
msgid "Show data row(s)"
msgstr "Upraviť riadky"
msgstr "Zobraziť riadky"
#: js/messages.php:363
msgid "Generate password"
@ -2046,7 +2038,7 @@ msgstr ", posledná stabilná verzia:"
#: js/messages.php:374
msgid "up to date"
msgstr "aktuálne"
msgstr "aktuálna"
#. l10n: Display text for calendar close link
#: js/messages.php:393
@ -13271,10 +13263,9 @@ msgid "Rate of table open"
msgstr "Vytvoriť tabuľku"
#: libraries/advisory_rules.txt:323
#, fuzzy
#| msgid "The current number of pending writes."
msgid "The rate of opening tables is high."
msgstr "Počet aktuálne prebiehajúcich zápisov."
msgstr "Frekvencia otvárania tabuliek je vysoká."
#: libraries/advisory_rules.txt:324
msgid ""

22
sql.php
View File

@ -931,8 +931,20 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
$message, $GLOBALS['sql_query'], 'success'
);
}
// Should be initialized these parameters before parsing
$showtable = isset($showtable) ? $showtable : null;
$printview = isset($printview) ? $printview : null;
$url_query = isset($url_query) ? $url_query : null;
$displayResultsObject->setProperties(
$unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func,
$is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir,
$is_maint, $is_explain, $is_show, $showtable, $printview, $url_query
);
echo $displayResultsObject->getTable($result, $disp_mode, $analyzed_sql);
exit();
}
// Displays the headers
@ -1080,6 +1092,16 @@ $(makeProfilingChart);
$message->display();
}
// Should be initialized these parameters before parsing
$showtable = isset($showtable) ? $showtable : null;
$printview = isset($printview) ? $printview : null;
$url_query = isset($url_query) ? $url_query : null;
$displayResultsObject->setProperties(
$unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func,
$is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage, $text_dir,
$is_maint, $is_explain, $is_show, $showtable, $printview, $url_query
);
echo $displayResultsObject->getTable($result, $disp_mode, $analyzed_sql);
PMA_DBI_free_result($result);

File diff suppressed because it is too large Load Diff

View File

@ -49,7 +49,7 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
*/
public function testSetBacktrace(){
$this->object->setBacktrace(array('bt1','bt2'));
$this->assertEquals($this->object->getBacktrace(),array('bt1','bt2'));
$this->assertEquals(array('bt1','bt2'), $this->object->getBacktrace());
}
/**
@ -57,15 +57,15 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
*/
public function testSetLine(){
$this->object->setLine(15);
$this->assertEquals($this->object->getLine(),15);
$this->assertEquals(15, $this->object->getLine());
}
/**
* Test for setFile
*/
public function testSetFile(){
$this->object->setFile('/var/www/pma.txt');
$this->assertEquals($this->object->getFile(),'./../../..');
$this->object->setFile('./pma.txt');
$this->assertEquals('./../../../../..', $this->object->getFile());
}
/**
@ -93,13 +93,13 @@ class PMA_Error_test extends PHPUnit_Framework_TestCase
* Test for getHtmlTitle
*/
public function testGetHtmlTitle(){
$this->assertEquals($this->object->getHtmlTitle(),'Warning: Compile Error');
$this->assertEquals('Warning: Compile Error', $this->object->getHtmlTitle());
}
/**
* Test for getTitle
*/
public function testGetTitle(){
$this->assertEquals($this->object->getTitle(),'Warning: Compile Error');
$this->assertEquals('Warning: Compile Error', $this->object->getTitle());
}
}

View File

@ -329,6 +329,7 @@ class PMA_Message_test extends PHPUnit_Framework_TestCase
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
unset($GLOBALS['server']);
unset($GLOBALS['collation_connection']);
$this->assertEquals($expected, PMA_Message::decodeBB($actual));
}

View File

@ -111,12 +111,12 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
$this->object->addFile('common.js');
$this->object->addEvent('onClick', 'doSomething');
$this->assertEquals(
$this->object->getDisplay(),
'<script src="js/common.js?ts=1339744334" type="text/javascript"></script>
<script type="text/javascript">// <![CDATA[
$(window.parent).bind(\'onClick\', doSomething);
// ]]></script>'
$this->assertRegExp(
'@<script src="js/common.js\\?ts=[0-9]*" type="text/javascript"></script>
<script type="text/javascript">// <!\\[CDATA\\[
\\$\\(window.parent\\).bind\\(\'onClick\', doSomething\\);
// ]]></script>@',
$this->object->getDisplay()
);
}

View File

@ -26,8 +26,10 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ThemeDefault'] = 'pmahomme';
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['server'] = 99;
$GLOBALS['lang'] = 'en';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['PMA_Config'] = new PMA_Config();
$GLOBALS['collation_connection'] = 'utf8_general_ci';
}
public function testCookieName()
@ -89,8 +91,8 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
public function testGetPrintPreviews(){
$tm = new PMA_Theme_Manager();
$this->assertEquals(
$tm->getPrintPreviews(),
'<div class="theme_preview"><h2>Original (2.9) </h2><p><a target="_top" class="take_theme" name="original" href="index.php?set_theme=original&amp;server=99&amp;token=token"><img src="./themes/original/screen.png" border="1" alt="Original" title="Original" /><br />[ <strong>take it</strong> ]</a></p></div><div class="theme_preview"><h2>pmahomme (1.1) </h2><p><a target="_top" class="take_theme" name="pmahomme" href="index.php?set_theme=pmahomme&amp;server=99&amp;token=token"><img src="./themes/pmahomme/screen.png" border="1" alt="pmahomme" title="pmahomme" /><br />[ <strong>take it</strong> ]</a></p></div>'
'<div class="theme_preview"><h2>Original (2.9) </h2><p><a target="_top" class="take_theme" name="original" href="index.php?set_theme=original&amp;server=99&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token"><img src="./themes/original/screen.png" border="1" alt="Original" title="Original" /><br />[ <strong>take it</strong> ]</a></p></div><div class="theme_preview"><h2>pmahomme (1.1) </h2><p><a target="_top" class="take_theme" name="pmahomme" href="index.php?set_theme=pmahomme&amp;server=99&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token"><img src="./themes/pmahomme/screen.png" border="1" alt="pmahomme" title="pmahomme" /><br />[ <strong>take it</strong> ]</a></p></div>',
$tm->getPrintPreviews()
);
}

View File

@ -33,6 +33,9 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['SQP']['fmtColor'] = array('fake' => 'red');
$GLOBALS['text_dir'] = 'ltr';
require 'themes/pmahomme/layout.inc.php';
$_SESSION[' PMA_token '] = 'token';
$GLOBALS['lang'] = 'en';
$GLOBALS['server'] = '99';
}
/**
@ -222,7 +225,7 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
{
$this->assertEquals(
$this->object->getPrintPreview(),
'<div class="theme_preview"><h2> (0.0.0.0) </h2><p><a target="_top" class="take_theme" name="" href="index.php?set_theme=">No preview available.[ <strong>take it</strong> ]</a></p></div>'
'<div class="theme_preview"><h2> (0.0.0.0) </h2><p><a target="_top" class="take_theme" name="" href="index.php?set_theme=&amp;server=99&amp;lang=en&amp;token=token">No preview available.[ <strong>take it</strong> ]</a></p></div>'
);
}

View File

@ -267,8 +267,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
}
$this->assertEquals(
$this->object->getFunctionsClass($class),
$output
$output,
$this->object->getFunctionsClass($class)
);
}

View File

@ -15,9 +15,10 @@ class PMA_SQL_parser_test extends PHPUnit_Framework_TestCase
{
private function assertParser($sql, $expected, $error = '')
{
PMA_SQP_resetError();
$parsed_sql = PMA_SQP_parse($sql);
$this->assertEquals(PMA_SQP_getErrorString(), $error);
$this->assertEquals($parsed_sql, $expected);
$this->assertEquals($error, PMA_SQP_getErrorString());
$this->assertEquals($expected, $parsed_sql);
}
public function testParse_1()

View File

@ -6,33 +6,6 @@
* @package PhpMyAdmin-test
*/
$match = array();
preg_match(
'@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@',
phpversion(),
$match
);
if (isset($match) && ! empty($match[1])) {
if (! isset($match[2])) {
$match[2] = 0;
}
if (! isset($match[3])) {
$match[3] = 0;
}
/**
* @ignore
*/
define(
'PMA_PHP_INT_VERSION',
(int)sprintf('%d%02d%02d', $match[1], $match[2], $match[3])
);
} else {
/**
* @ignore
*/
define('PMA_PHP_INT_VERSION', 0);
}
require_once 'libraries/string.lib.php';
class PMA_STR_sub_test extends PHPUnit_Framework_TestCase

View File

@ -102,7 +102,12 @@ class PMA_bookmark_test extends PHPUnit_Framework_TestCase
}
}
$this->assertEquals(
PMA_Bookmark_save('phpmyadmin'),
PMA_Bookmark_save(array(
'dbase' => 'phpmyadmin',
'user' => 'phpmyadmin',
'query' => 'SELECT "phpmyadmin"',
'label' => 'phpmyadmin',
)),
true
);
}

View File

@ -0,0 +1,55 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* tests for mime.lib.php
*
* @package PhpMyAdmin-test
*/
/*
* Include to test.
*/
require_once 'libraries/mime.lib.php';
class PMA_mime_test extends PHPUnit_Framework_TestCase
{
/**
* Test for PMA_detectMIME
* @param string $test
* @param $output
*
* @dataProvider providerForTestPMA_detectMIME
*/
public function testPMA_detectMIME($test, $output){
$this->assertEquals(
PMA_detectMIME($test),
$output
);
}
/**
* Provider for testPMA_detectMIME
*/
public function providerForTestPMA_detectMIME(){
return array(
array(
'pma',
'application/octet-stream'
),
array(
'GIF',
'image/gif'
),
array(
"\x89PNG",
'image/png'
),
array(
chr(0xff).chr(0xd8),
'image/jpeg'
),
);
}
}