nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strings to gettext, second batch

Browse Source
This commit is contained in:
Marc Delisle
2010-05-04 20:07:19 -04:00
parent 2d304c1f8c
commit 2182098af6
138 changed files with 104895 additions and 81022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browse_foreigners.php
View File

@@ -79,7 +79,7 @@ if (is_array($foreignData['disp_row'])) {
5,
20,
10,
$GLOBALS['strPageNumber']
__('Page number:')
);
}
}

2
db_qbe.php
View File

@@ -26,7 +26,7 @@ $cfgRelation = PMA_getRelationsParam();
*/
if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
$goto = 'db_sql.php';
$zero_rows = htmlspecialchars($GLOBALS['strSuccess']);
$zero_rows = htmlspecialchars(__('Your SQL query has been executed successfully'));
require './sql.php';
exit;
} else {

2
db_structure.php
View File

@@ -482,7 +482,7 @@ if ($is_show_stats) {
</th>
<?php
if ($server_slave_status) {
echo ' <th>' . $GLOBALS['strReplication'] . '</th>' . "\n";
echo ' <th>' . __('Replication') . '</th>' . "\n";
}
?>
<th colspan="<?php echo ($db_is_information_schema ? 3 : 6) ?>" align="center">

2
import.php
View File

@@ -406,7 +406,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
$message = PMA_Message::success();
} else {
if ($import_notice) {
$message = PMA_Message::success('<em>'.$GLOBALS['strImportSuccessfullyFinished'].'</em>');
$message = PMA_Message::success('<em>'.__('Import has been successfully finished, %d queries executed.').'</em>');
$message->addParam($executed_queries);
$message->addString($import_notice);

4
index.php
View File

@@ -4,7 +4,7 @@
* forms frameset
*
* @version $Id$
* @uses $GLOBALS['strNoFrames']
* @uses __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.')
* @uses $GLOBALS['cfg']['QueryHistoryDB']
* @uses $GLOBALS['cfg']['Server']['user']
* @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe
@@ -187,7 +187,7 @@ if ($GLOBALS['text_dir'] === 'ltr') {
<?php } ?>
<noframes>
<body>
<p><?php echo $GLOBALS['strNoFrames']; ?></p>
<p><?php echo __('phpMyAdmin is more friendly with a <b>frames-capable</b> browser.'); ?></p>
</body>
</noframes>
</frameset>

8
libraries/Config.class.php
View File

@@ -994,7 +994,7 @@ class PMA_Config
* @uses $GLOBALS['PMA_Config']
* @uses PMA_Config::get()
* @uses PMA_Config::_getFontsizeOptions()
* @uses $GLOBALS['strFontSize']
* @uses __('Font size')
* @static
* @param string $current_size currently slected font size with unit
* @return string html selectbox
@@ -1012,7 +1012,7 @@ class PMA_Config
}
$options = PMA_Config::_getFontsizeOptions($current_size);
$return = '<label for="select_fontsize">' . $GLOBALS['strFontSize'] . ':</label>' . "\n";
$return = '<label for="select_fontsize">' . __('Font size') . ':</label>' . "\n";
$return .= '<select name="fontsize" id="select_fontsize" onchange="this.form.submit();">' . "\n";
foreach ($options as $option) {
$return .= '<option value="' . $option . '"';
@@ -1031,7 +1031,7 @@ class PMA_Config
*
* @uses PMA_generate_common_hidden_inputs()
* @uses PMA_Config::_getFontsizeSelection()
* @uses $GLOBALS['strGo']
* @uses __('Go')
* @static
* @param string $current_size currently slected font size with unit
* @return string html selectbox
@@ -1043,7 +1043,7 @@ class PMA_Config
. PMA_generate_common_hidden_inputs() . "\n"
. PMA_Config::_getFontsizeSelection() . "\n"
. '<noscript>' . "\n"
. '<input type="submit" value="' . $GLOBALS['strGo'] . '" />' . "\n"
. '<input type="submit" value="' . __('Go') . '" />' . "\n"
. '</noscript>' . "\n"
. '</form>';
}

58
libraries/File.class.php
View File

@@ -259,13 +259,13 @@ class PMA_File
* @uses PMA_File::setRecentBLOBReference()
* @uses curl_setopt_array()
* @uses PMA_File::$_error_message
* @uses $GLOBALS['strUploadErrorIniSize']
* @uses $GLOBALS['strUploadErrorFormSize']
* @uses $GLOBALS['strUploadErrorPartial']
* @uses $GLOBALS['strUploadErrorNoTempDir']
* @uses $GLOBALS['strUploadErrorCantWrite']
* @uses $GLOBALS['strUploadErrorExtension']
* @uses $GLOBALS['strUploadErrorUnknown']
* @uses __('The uploaded file exceeds the upload_max_filesize directive in php.ini.')
* @uses __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.')
* @uses __('The uploaded file was only partially uploaded.')
* @uses __('Missing a temporary folder.')
* @uses __('Failed to write file to disk.')
* @uses __('File upload stopped by extension.')
* @uses __('Unknown error in file upload.')
* @uses $_FILES
* @param string $key a numeric key used to identify the different rows
* @param string $primary_key
@@ -341,7 +341,7 @@ class PMA_File
// if none of the required variables contain data, return with an unknown error message
if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
{
$this->_error_message = $GLOBALS['strUploadErrorUnknown'];
$this->_error_message = __('Unknown error in file upload.');
return FALSE;
}
else
@@ -411,25 +411,25 @@ class PMA_File
case 4: //UPLOAD_ERR_NO_FILE:
break;
case 1: //UPLOAD_ERR_INI_SIZE:
$this->_error_message = $GLOBALS['strUploadErrorIniSize'];
$this->_error_message = __('The uploaded file exceeds the upload_max_filesize directive in php.ini.');
break;
case 2: //UPLOAD_ERR_FORM_SIZE:
$this->_error_message = $GLOBALS['strUploadErrorFormSize'];
$this->_error_message = __('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.');
break;
case 3: //UPLOAD_ERR_PARTIAL:
$this->_error_message = $GLOBALS['strUploadErrorPartial'];
$this->_error_message = __('The uploaded file was only partially uploaded.');
break;
case 6: //UPLOAD_ERR_NO_TMP_DIR:
$this->_error_message = $GLOBALS['strUploadErrorNoTempDir'];
$this->_error_message = __('Missing a temporary folder.');
break;
case 7: //UPLOAD_ERR_CANT_WRITE:
$this->_error_message = $GLOBALS['strUploadErrorCantWrite'];
$this->_error_message = __('Failed to write file to disk.');
break;
case 8: //UPLOAD_ERR_EXTENSION:
$this->_error_message = $GLOBALS['strUploadErrorExtension'];
$this->_error_message = __('File upload stopped by extension.');
break;
default:
$this->_error_message = $GLOBALS['strUploadErrorUnknown'];
$this->_error_message = __('Unknown error in file upload.');
} // end switch
return false;
@@ -566,7 +566,7 @@ class PMA_File
// necessary variables aren't loaded, return error message (unknown error)
if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
{
$this->_error_message = $GLOBALS['strUploadErrorUnknown'];
$this->_error_message = __('Unknown error in file upload.');
return FALSE;
}
else
@@ -705,7 +705,7 @@ class PMA_File
// necessary variables aren't loaded, return error message (unknown error)
if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
{
$this->_error_message = $GLOBALS['strUploadErrorUnknown'];
$this->_error_message = __('Unknown error in file upload.');
return FALSE;
}
else
@@ -832,7 +832,7 @@ class PMA_File
/**
*
* @access public
* @uses $GLOBALS['strFileCouldNotBeRead']
* @uses __('File could not be read')
* @uses PMA_File::setName()
* @uses PMA_securePath()
* @uses PMA_userDir()
@@ -846,7 +846,7 @@ class PMA_File
$this->setName(PMA_userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name));
if (! $this->isReadable()) {
$this->_error_message = $GLOBALS['strFileCouldNotBeRead'];
$this->_error_message = __('File could not be read');
$this->setName(null);
return false;
}
@@ -881,7 +881,7 @@ class PMA_File
* @todo move check of $cfg['TempDir'] into PMA_Config?
* @access public
* @uses $cfg['TempDir']
* @uses $GLOBALS['strFieldInsertFromFileTempDirNotExists']
* @uses __('Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]')
* @uses PMA_File::isReadable()
* @uses PMA_File::getName()
* @uses PMA_File::setName()
@@ -905,7 +905,7 @@ class PMA_File
if (empty($GLOBALS['cfg']['TempDir']) || ! is_writable($GLOBALS['cfg']['TempDir'])) {
// cannot create directory or access, point user to FAQ 1.11
$this->_error_message = $GLOBALS['strFieldInsertFromFileTempDirNotExists'];
$this->_error_message = __('Error moving the uploaded file, see [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]');
return false;
}
@@ -937,7 +937,7 @@ class PMA_File
*
* @todo move file read part into readChunk() or getChunk()
* @todo add support for compression plugins
* @uses $GLOBALS['strFileCouldNotBeRead']
* @uses __('File could not be read')
* @uses PMA_File::$_compression to set it
* @uses PMA_File::getName()
* @uses fopen()
@@ -958,7 +958,7 @@ class PMA_File
ob_end_clean();
if (! $file) {
$this->_error_message = $GLOBALS['strFileCouldNotBeRead'];
$this->_error_message = __('File could not be read');
return false;
}
@@ -1028,7 +1028,7 @@ class PMA_File
if ($GLOBALS['cfg']['BZipDump'] && @function_exists('bzopen')) {
$this->_handle = @bzopen($this->getName(), 'r');
} else {
$this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
$this->_error_message = sprintf(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'), $this->getCompression());
return false;
}
break;
@@ -1036,7 +1036,7 @@ class PMA_File
if ($GLOBALS['cfg']['GZipDump'] && @function_exists('gzopen')) {
$this->_handle = @gzopen($this->getName(), 'r');
} else {
$this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
$this->_error_message = sprintf(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'), $this->getCompression());
return false;
}
break;
@@ -1052,7 +1052,7 @@ class PMA_File
}
unset($result);
} else {
$this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
$this->_error_message = sprintf(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'), $this->getCompression());
return false;
}
break;
@@ -1060,7 +1060,7 @@ class PMA_File
$this->_handle = @fopen($this->getName(), 'r');
break;
default:
$this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
$this->_error_message = sprintf(__('You attempted to load file with unsupported compression (%s). Either support for it is not implemented or disabled by your configuration.'), $this->getCompression());
return false;
break;
}
@@ -1145,10 +1145,10 @@ class PMA_File
$import_handle = new SimpleUnzip();
$import_handle->ReadFile($this->getName());
if ($import_handle->Count() == 0) {
$this->_error_message = $GLOBALS['strNoFilesFoundInZip'];
$this->_error_message = __('No files found inside ZIP archive!');
return false;
} elseif ($import_handle->GetError(0) != 0) {
$this->_error_message = $GLOBALS['strErrorInZipFile']
$this->_error_message = __('Error in ZIP archive:')
. ' ' . $import_handle->GetErrorMsg(0);
return false;
} else {

40
libraries/Index.class.php
View File

@@ -356,8 +356,8 @@ class PMA_Index
{
if ($as_text) {
$r = array(
'0' => $GLOBALS['strNo'],
'1' => $GLOBALS['strYes'],
'0' => __('No'),
'1' => __('Yes'),
);
} else {
$r = array(
@@ -382,8 +382,8 @@ class PMA_Index
{
if ($as_text) {
$r = array(
'0' => $GLOBALS['strYes'],
'1' => $GLOBALS['strNo'],
'0' => __('Yes'),
'1' => __('No'),
);
} else {
$r = array(
@@ -430,24 +430,24 @@ class PMA_Index
$r = '';
$r .= '<h2>' . $GLOBALS['strIndexes'] . ': ';
$r .= '<h2>' . __('Indexes') . ': ';
$r .= PMA_showMySQLDocu('optimization', 'optimizing-database-structure');
$r .= '</h2>';
$r .= '<table>';
$r .= '<thead>';
$r .= '<tr>';
if (! $print_mode) {
$r .= '<th colspan="2">' . $GLOBALS['strAction'] . '</th>';
$r .= '<th colspan="2">' . __('Action') . '</th>';
}
$r .= '<th>' . $GLOBALS['strKeyname'] . '</th>';
$r .= '<th>' . $GLOBALS['strType'] . '</th>';
$r .= '<th>' . $GLOBALS['strUnique'] . '</th>';
$r .= '<th>' . $GLOBALS['strPacked'] . '</th>';
$r .= '<th>' . $GLOBALS['strField'] . '</th>';
$r .= '<th>' . $GLOBALS['strCardinality'] . '</th>';
$r .= '<th>' . $GLOBALS['strCollation'] . '</th>';
$r .= '<th>' . $GLOBALS['strNull'] . '</th>';
$r .= '<th>' . $GLOBALS['strComment'] . '</th>';
$r .= '<th>' . __('Keyname') . '</th>';
$r .= '<th>' . __('Type') . '</th>';
$r .= '<th>' . __('Unique') . '</th>';
$r .= '<th>' . __('Packed') . '</th>';
$r .= '<th>' . __('Field') . '</th>';
$r .= '<th>' . __('Cardinality') . '</th>';
$r .= '<th>' . __('Collation') . '</th>';
$r .= '<th>' . __('Null') . '</th>';
$r .= '<th>' . __('Comment') . '</th>';
$r .= '</tr>';
$r .= '</thead>';
$r .= '<tbody>';
@@ -463,24 +463,24 @@ class PMA_Index
$this_params['index'] = $index->getName();
$r .= '<td ' . $row_span . '>'
. ' <a href="tbl_indexes.php' . PMA_generate_common_url($this_params)
. '">' . PMA_getIcon('b_edit.png', $GLOBALS['strEdit']) . '</a>'
. '">' . PMA_getIcon('b_edit.png', __('Edit')) . '</a>'
. '</td>' . "\n";
$this_params = $GLOBALS['url_params'];
if ($index->getName() == 'PRIMARY') {
$this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY';
$this_params['zero_rows'] = $GLOBALS['strPrimaryKeyHasBeenDropped'];
$this_params['zero_rows'] = __('The primary key has been dropped');
$js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP PRIMARY KEY');
} else {
$this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP INDEX ' . PMA_backquote($index->getName());
$this_params['zero_rows'] = sprintf($GLOBALS['strIndexHasBeenDropped'], $index->getName());
$this_params['zero_rows'] = sprintf(__('Index %s has been dropped'), $index->getName());
$js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName());
}
$r .= '<td ' . $row_span . '>'
. ' <a href="sql.php' . PMA_generate_common_url($this_params)
. '" onclick="return confirmLink(this, \'' . $js_msg . '\')">'
. PMA_getIcon('b_drop.png', $GLOBALS['strDrop']) . '</a>'
. PMA_getIcon('b_drop.png', __('Drop')) . '</a>'
. '</td>' . "\n";
}
@@ -539,7 +539,7 @@ class PMA_Index
/**
* Function to check over array of indexes and look for common problems
*
* @uses $GLOBALS['strIndexesSeemEqual']
* @uses __('The indexes %1 and %2 seem to be equal and one of them could possibly be removed.')
* @uses is_string()
* @uses is_array()
* @uses count()

2
libraries/List_Database.class.php
View File

@@ -428,7 +428,7 @@ require_once './libraries/List.class.php';
$return = '<select name="db" id="lightm_db" xml:lang="en" dir="ltr"'
. ' onchange="if (this.value != \'\') window.parent.openDb(this.value);">' . "\n"
. '<option value="" dir="' . $GLOBALS['text_dir'] . '">'
. '(' . $GLOBALS['strDatabases'] . ') ...</option>' . "\n";
. '(' . __('Databases') . ') ...</option>' . "\n";
foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
if (count($dbs) > 1) {
$return .= '<optgroup label="' . htmlspecialchars($group)

22
libraries/StorageEngine.class.php
View File

@@ -155,7 +155,7 @@ class PMA_StorageEngine
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
* @uses PMA_StorageEngine::getVariablesStatus()
* @uses $GLOBALS['strNoDetailsForEngine']
* @uses __('There is no detailed status information available for this storage engine.')
* @uses PMA_showHint()
* @uses PMA_formatByteDown()
* @uses PMA_formatNumber()
@@ -195,7 +195,7 @@ class PMA_StorageEngine
if (! $ret) {
$ret = '<p>' . "\n"
. ' ' . $GLOBALS['strNoDetailsForEngine'] . "\n"
. ' ' . __('There is no detailed status information available for this storage engine.') . "\n"
. '</p>' . "\n";
} else {
$ret = '<table class="data">' . "\n" . $ret . '</table>' . "\n";
@@ -335,11 +335,11 @@ class PMA_StorageEngine
/**
* public String getSupportInformationMessage()
*
* @uses $GLOBALS['strDefaultEngine']
* @uses $GLOBALS['strEngineAvailable']
* @uses $GLOBALS['strEngineDisabled']
* @uses $GLOBALS['strEngineUnsupported']
* @uses $GLOBALS['strEngineUnsupported']
* @uses __('%s is the default storage engine on this MySQL server.')
* @uses __('%s is available on this MySQL server.')
* @uses __('%s has been disabled for this MySQL server.')
* @uses __('This MySQL server does not support the %s storage engine.')
* @uses __('This MySQL server does not support the %s storage engine.')
* @uses PMA_ENGINE_SUPPORT_DEFAULT
* @uses PMA_ENGINE_SUPPORT_YES
* @uses PMA_ENGINE_SUPPORT_DISABLED
@@ -353,17 +353,17 @@ class PMA_StorageEngine
{
switch ($this->support) {
case PMA_ENGINE_SUPPORT_DEFAULT:
$message = $GLOBALS['strDefaultEngine'];
$message = __('%s is the default storage engine on this MySQL server.');
break;
case PMA_ENGINE_SUPPORT_YES:
$message = $GLOBALS['strEngineAvailable'];
$message = __('%s is available on this MySQL server.');
break;
case PMA_ENGINE_SUPPORT_DISABLED:
$message = $GLOBALS['strEngineDisabled'];
$message = __('%s has been disabled for this MySQL server.');
break;
case PMA_ENGINE_SUPPORT_NO:
default:
$message = $GLOBALS['strEngineUnsupported'];
$message = __('This MySQL server does not support the %s storage engine.');
}
return sprintf($message, htmlspecialchars($this->title));
}

8
libraries/Table.class.php
View File

@@ -1016,7 +1016,7 @@ class PMA_Table
if (null !== $new_db && $new_db !== $this->getDbName()) {
// Ensure the target is valid
if (! $GLOBALS['pma']->databases->exists($new_db)) {
$this->errors[] = $GLOBALS['strInvalidDatabase'] . ': ' . $new_db;
$this->errors[] = __('Invalid database') . ': ' . $new_db;
return false;
}
} else {
@@ -1030,7 +1030,7 @@ class PMA_Table
}
if (! PMA_Table::isValidName($new_name)) {
$this->errors[] = $GLOBALS['strInvalidTableName'] . ': ' . $new_table->getFullName();
$this->errors[] = __('Invalid table name') . ': ' . $new_table->getFullName();
return false;
}
@@ -1045,7 +1045,7 @@ class PMA_Table
}
// I don't think a specific error message for views is necessary
if (! PMA_DBI_query($GLOBALS['sql_query'])) {
$this->errors[] = sprintf($GLOBALS['strErrorRenamingTable'], $this->getFullName(), $new_table->getFullName());
$this->errors[] = sprintf(__('Error renaming table %1 to %2'), $this->getFullName(), $new_table->getFullName());
return false;
}
@@ -1129,7 +1129,7 @@ class PMA_Table
unset($table_query);
}
$this->messages[] = sprintf($GLOBALS['strRenameTableOK'],
$this->messages[] = sprintf(__('Table %s has been renamed to %s'),
htmlspecialchars($old_name), htmlspecialchars($new_name));
return true;
}

12
libraries/Theme.class.php
View File

@@ -145,7 +145,7 @@ class PMA_Theme {
* @uses PMA_Theme::setImgPath()
* @uses PMA_Theme::getName()
* @uses $GLOBALS['cfg']['ThemePath']
* @uses $GLOBALS['strThemeNoValidImgPath']
* @uses __('No valid image path for theme %s found!')
* @uses is_dir()
* @uses sprintf()
*/
@@ -159,7 +159,7 @@ class PMA_Theme {
return true;
} else {
trigger_error(
sprintf($GLOBALS['strThemeNoValidImgPath'], $this->getName()),
sprintf(__('No valid image path for theme %s found!'), $this->getName()),
E_USER_ERROR);
return false;
}
@@ -357,8 +357,8 @@ class PMA_Theme {
* @uses PMA_Theme::getVersion()
* @uses PMA_Theme::getId()
* @uses PMA_Theme::getPath()
* @uses $GLOBALS['strThemeNoPreviewAvailable']
* @uses $GLOBALS['strTakeIt']
* @uses __('No preview available.')
* @uses __('take it')
* @uses PMA_generate_common_url()
* @uses addslashes()
* @uses file_exists()
@@ -381,10 +381,10 @@ class PMA_Theme {
.' alt="' . htmlspecialchars($this->getName()) . '"'
.' title="' . htmlspecialchars($this->getName()) . '" /><br />';
} else {
echo $GLOBALS['strThemeNoPreviewAvailable'];
echo __('No preview available.');
}
echo '[ <strong>' . $GLOBALS['strTakeIt'] . '</strong> ]</a>'
echo '[ <strong>' . __('take it') . '</strong> ]</a>'
.'</p>'
.'</div>';
}

10
libraries/Theme_Manager.class.php
View File

@@ -112,7 +112,7 @@ class PMA_Theme_Manager
if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) {
trigger_error(
sprintf($GLOBALS['strThemeDefaultNotFound'],
sprintf(__('Default theme %s not found!'),
htmlspecialchars($GLOBALS['cfg']['ThemeDefault'])),
E_USER_ERROR);
$GLOBALS['cfg']['ThemeDefault'] = false;
@@ -150,7 +150,7 @@ class PMA_Theme_Manager
{
if (! $this->checkTheme($theme)) {
trigger_error(
sprintf($GLOBALS['strThemeNotFound'], htmlspecialchars($theme)),
sprintf(__('Theme %s not found!'), htmlspecialchars($theme)),
E_USER_ERROR);
return false;
}
@@ -218,7 +218,7 @@ class PMA_Theme_Manager
{
if (! is_dir($folder)) {
trigger_error(
sprintf($GLOBALS['strThemePathNotFound'],
sprintf(__('Theme path not found for theme %s!'),
htmlspecialchars($folder)),
E_USER_ERROR);
return false;
@@ -294,7 +294,7 @@ class PMA_Theme_Manager
$theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="'
. "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');"
. '">';
$select_box .= $theme_preview_href . $GLOBALS['strTheme'] . '</a>:' . "\n";
$select_box .= $theme_preview_href . __('Theme / Style') . '</a>:' . "\n";
$select_box .= '<select name="set_theme" xml:lang="en" dir="ltr"'
.' onchange="this.form.submit();" >';
@@ -308,7 +308,7 @@ class PMA_Theme_Manager
$select_box .= '</select>';
if ($form) {
$select_box .= '<noscript><input type="submit" value="' . $GLOBALS['strGo'] . '" /></noscript>';
$select_box .= '<noscript><input type="submit" value="' . __('Go') . '" /></noscript>';
$select_box .= '</form>';
}

8
libraries/auth/config.auth.lib.php
View File

@@ -74,14 +74,14 @@ function PMA_auth_fails()
if (isset($php_errormsg)) {
$conn_error = $php_errormsg;
} else {
$conn_error = $GLOBALS['strConnectionError'];
$conn_error = __('Cannot connect: invalid settings.');
}
}
// Defines the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
/* HTML header */
$page_title = $GLOBALS['strAccessDenied'];
$page_title = __('Access denied');
require './libraries/header_meta_style.inc.php';
?>
</head>
@@ -89,7 +89,7 @@ function PMA_auth_fails()
<body>
<br /><br />
<center>
<h1><?php echo sprintf($GLOBALS['strWelcome'], ' phpMyAdmin '); ?></h1>
<h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin '); ?></h1>
</center>
<br />
<table border="0" cellpadding="0" cellspacing="3" align="center" width="80%">
@@ -100,7 +100,7 @@ function PMA_auth_fails()
$GLOBALS['is_header_sent'] = TRUE;
if (isset($GLOBALS['allowDeny_forbidden']) && $GLOBALS['allowDeny_forbidden']) {
trigger_error($GLOBALS['strAccessDenied'], E_USER_NOTICE);
trigger_error(__('Access denied'), E_USER_NOTICE);
} else {
// Check whether user has configured something
if ($GLOBALS['PMA_Config']->source_mtime == 0) {

60
libraries/auth/cookie.auth.lib.php
View File

@@ -117,17 +117,17 @@ function PMA_get_blowfish_secret() {
* @uses $GLOBALS['target']
* @uses $GLOBALS['db']
* @uses $GLOBALS['table']
* @uses $GLOBALS['strWelcome']
* @uses $GLOBALS['strSecretRequired']
* @uses $GLOBALS['strError']
* @uses $GLOBALS['strLogin']
* @uses $GLOBALS['strLogServer']
* @uses $GLOBALS['strLogUsername']
* @uses $GLOBALS['strLogPassword']
* @uses $GLOBALS['strServerChoice']
* @uses $GLOBALS['strGo']
* @uses $GLOBALS['strCookiesRequired']
* @uses $GLOBALS['strPmaDocumentation']
* @uses __('Welcome to %s')
* @uses __('The configuration file now needs a secret passphrase (blowfish_secret).')
* @uses __('Error')
* @uses __('Log in')
* @uses __('Server:')
* @uses __('Username:')
* @uses __('Password:')
* @uses __('Server Choice')
* @uses __('Go')
* @uses __('Cookies must be enabled past this point.')
* @uses __('phpMyAdmin documentation')
* @uses $GLOBALS['pmaThemeImage']
* @uses $cfg['Servers']
* @uses $cfg['LoginCookieRecall']
@@ -216,7 +216,7 @@ if (top != self) {
?></a>
<h1>
<?php
echo sprintf($GLOBALS['strWelcome'],
echo sprintf(__('Welcome to %s'),
'<bdo dir="ltr" xml:lang="en">' . $page_title . '</bdo>');
?>
</h1>
@@ -241,11 +241,11 @@ if (top != self) {
<fieldset>
<legend>
<?php
echo $GLOBALS['strLogin'];
echo __('Log in');
echo '<a href="./Documentation.html" target="documentation" ' .
'title="' . $GLOBALS['strPmaDocumentation'] . '">';
'title="' . __('phpMyAdmin documentation') . '">';
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strPmaDocumentation'] . '" />';
echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('phpMyAdmin documentation') . '" />';
} else {
echo '(*)';
}
@@ -255,23 +255,23 @@ if (top != self) {
<?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
<div class="item">
<label for="input_servername" title="<?php echo $GLOBALS['strLogServerHelp']; ?>"><?php echo $GLOBALS['strLogServer']; ?></label>
<input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" title="<?php echo $GLOBALS['strLogServerHelp']; ?>" />
<label for="input_servername" title="<?php echo __('You can enter hostname/IP address and port separated by space.'); ?>"><?php echo __('Server:'); ?></label>
<input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" title="<?php echo __('You can enter hostname/IP address and port separated by space.'); ?>" />
</div>
<?php } ?>
<div class="item">
<label for="input_username"><?php echo $GLOBALS['strLogUsername']; ?></label>
<label for="input_username"><?php echo __('Username:'); ?></label>
<input type="text" name="pma_username" id="input_username" value="<?php echo htmlspecialchars($default_user); ?>" size="24" class="textfield"/>
</div>
<div class="item">
<label for="input_password"><?php echo $GLOBALS['strLogPassword']; ?></label>
<label for="input_password"><?php echo __('Password:'); ?></label>
<input type="password" name="pma_password" id="input_password" value="" size="24" class="textfield" />
</div>
<?php
if (count($GLOBALS['cfg']['Servers']) > 1) {
?>
<div class="item">
<label for="select_server"><?php echo $GLOBALS['strServerChoice']; ?>:</label>
<label for="select_server"><?php echo __('Server Choice'); ?>:</label>
<select name="server" id="select_server"
<?php
if ($GLOBALS['cfg']['AllowArbitraryServer']) {
@@ -289,7 +289,7 @@ if (top != self) {
?>
</fieldset>
<fieldset class="tblFooters">
<input value="<?php echo $GLOBALS['strGo']; ?>" type="submit" id="input_go" />
<input value="<?php echo __('Go'); ?>" type="submit" id="input_go" />
<?php
$_form_params = array();
if (! empty($GLOBALS['target'])) {
@@ -317,7 +317,7 @@ if (top != self) {
// show the "Cookies required" message only if cookies are disabled
// (we previously tried to set some cookies)
if (empty($_COOKIE)) {
trigger_error($GLOBALS['strCookiesRequired'], E_USER_NOTICE);
trigger_error(__('Cookies must be enabled past this point.'), E_USER_NOTICE);
}
if ($GLOBALS['error_handler']->hasDisplayErrors()) {
echo '<div>';
@@ -646,9 +646,9 @@ function PMA_auth_set_user()
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['allowDeny_forbidden']
* @uses $GLOBALS['strAccessDenied']
* @uses $GLOBALS['strNoActivity']
* @uses $GLOBALS['strCannotLogin']
* @uses __('Access denied')
* @uses __('No activity within %s seconds; please log in again')
* @uses __('Cannot log in to the MySQL server')
* @uses $GLOBALS['no_activity']
* @uses $cfg['LoginCookieValidity']
* @uses $GLOBALS['PMA_Config']->removeCookie()
@@ -668,11 +668,11 @@ function PMA_auth_fails()
$GLOBALS['PMA_Config']->removeCookie('pmaPass-' . $GLOBALS['server']);
if (! empty($GLOBALS['login_without_password_is_forbidden'])) {
$conn_error = $GLOBALS['strLoginWithoutPassword'];
$conn_error = __('Login without a password is forbidden by configuration (see AllowNoPassword)');
} elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
$conn_error = $GLOBALS['strAccessDenied'];
$conn_error = __('Access denied');
} elseif (! empty($GLOBALS['no_activity'])) {
$conn_error = sprintf($GLOBALS['strNoActivity'], $GLOBALS['cfg']['LoginCookieValidity']);
$conn_error = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
// Remember where we got timeout to return on same place
if (PMA_getenv('SCRIPT_NAME')) {
$GLOBALS['target'] = basename(PMA_getenv('SCRIPT_NAME'));
@@ -682,9 +682,9 @@ function PMA_auth_fails()
}
}
} elseif (PMA_DBI_getError()) {
$conn_error = '#' . $GLOBALS['errno'] . ' ' . $GLOBALS['strCannotLogin'];
$conn_error = '#' . $GLOBALS['errno'] . ' ' . __('Cannot log in to the MySQL server');
} else {
$conn_error = $GLOBALS['strCannotLogin'];
$conn_error = __('Cannot log in to the MySQL server');
}
// needed for PHP-CGI (not need for FastCGI or mod-php)

4
libraries/auth/http.auth.lib.php
View File

@@ -49,7 +49,7 @@ function PMA_auth()
// Defines the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
/* HTML header */
$page_title = $GLOBALS['strAccessDenied'];
$page_title = __('Access denied');
require './libraries/header_meta_style.inc.php';
?>
</head>
@@ -62,7 +62,7 @@ function PMA_auth()
<br /><br />
<center>
<h1><?php echo sprintf($GLOBALS['strWelcome'], ' phpMyAdmin'); ?></h1>
<h1><?php echo sprintf(__('Welcome to %s'), ' phpMyAdmin'); ?></h1>
</center>
<br />

8
libraries/auth/signon.auth.lib.php
View File

@@ -178,17 +178,17 @@ function PMA_auth_set_user()
function PMA_auth_fails()
{
if (! empty($GLOBALS['login_without_password_is_forbidden'])) {
$_SESSION['PMA_single_signon_error_message'] = $GLOBALS['strLoginWithoutPassword'];
$_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)');
} elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
$_SESSION['PMA_single_signon_error_message'] = $GLOBALS['strAccessDenied'];
$_SESSION['PMA_single_signon_error_message'] = __('Access denied');
} elseif (! empty($GLOBALS['no_activity'])) {
$_SESSION['PMA_single_signon_error_message'] = sprintf($GLOBALS['strNoActivity'], $GLOBALS['cfg']['LoginCookieValidity']);
$_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
} elseif (PMA_DBI_getError()) {
$_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
} elseif (isset($php_errormsg)) {
$_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
} else {
$_SESSION['PMA_single_signon_error_message'] = $GLOBALS['strCannotLogin'];
$_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
}
PMA_auth();
} // end of the 'PMA_auth_fails()' function

10
libraries/auth/swekey/swekey.auth.lib.php
View File

@@ -115,7 +115,7 @@ function Swekey_auth_error()
return null;
if (count($_SESSION['SWEKEY']['VALID_SWEKEYS']) == 0)
return sprintf($GLOBALS['strSwekeyNoKeyId'], $GLOBALS['cfg']['Server']['auth_swekey_config']);
return sprintf(__('File %s does not contain any key id'), $GLOBALS['cfg']['Server']['auth_swekey_config']);
require_once "./libraries/auth/swekey/swekey.php";
@@ -154,7 +154,7 @@ function Swekey_auth_error()
$res = Swekey_CheckOtp($swekey_id, $_SESSION['SWEKEY']['RND_TOKEN'], $swekey_otp);
unset($_SESSION['SWEKEY']['RND_TOKEN']);
if (! $res) {
$result = $GLOBALS['strSwekeyAuthFailed'] . ' (' . Swekey_GetLastError() . ')';
$result = __('Hardware authentication failed') . ' (' . Swekey_GetLastError() . ')';
}
else {
$_SESSION['SWEKEY']['AUTHENTICATED_SWEKEY'] = $swekey_id;
@@ -163,7 +163,7 @@ function Swekey_auth_error()
}
}
else {
$result = $GLOBALS['strSwekeyNoKey'];
$result = __('No valid authentication key plugged');
if ($_SESSION['SWEKEY']['CONF_DEBUG'])
{
$result .= "<br>".$swekey_id;
@@ -177,7 +177,7 @@ function Swekey_auth_error()
$_SESSION['SWEKEY']['RND_TOKEN'] = Swekey_GetFastRndToken();
if (strlen($_SESSION['SWEKEY']['RND_TOKEN']) != 64) {
$result = $GLOBALS['strSwekeyAuthFailed'] . ' (' . Swekey_GetLastError() . ')';
$result = __('Hardware authentication failed') . ' (' . Swekey_GetLastError() . ')';
unset($_SESSION['SWEKEY']['CONF_LOADED']); // reload the conf file
}
@@ -199,7 +199,7 @@ function Swekey_auth_error()
}
</script>
<?php
return $GLOBALS['strSwekeyAuthenticating'];
return __('Authenticating...');
}
return $result;

8
libraries/blobstreaming.lib.php
View File

@@ -686,20 +686,20 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name)
// image content
case 'image/jpeg':
case 'image/png':
$output .= ' (<a href="' . $bs_ref_link . '" target="new">' . $GLOBALS['strViewImage'] . '</a>)';
$output .= ' (<a href="' . $bs_ref_link . '" target="new">' . __('View image') . '</a>)';
break;
// audio content
case 'audio/mpeg':
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 120)">' . $GLOBALS['strPlayAudio']. '</a>)';
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 120)">' . __('Play audio'). '</a>)';
break;
// video content
case 'application/x-flash-video':
case 'video/mpeg':
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 480)">' . $GLOBALS['strViewVideo'] . '</a>)';
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 480)">' . __('View video') . '</a>)';
break;
// unsupported content. specify download
default:
$output .= ' (<a href="' . $bs_ref_link . '" target="new">' . $GLOBALS['strDownloadFile']. '</a>)';
$output .= ' (<a href="' . $bs_ref_link . '" target="new">' . __('Download file'). '</a>)';
}
// return HTML

2
libraries/common.inc.php
View File

@@ -642,7 +642,7 @@ if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
// or the host field, then generate a name for the server
// in the form of "Server 2", localized of course!
if ($each_server['connect_type'] == 'socket' && empty($each_server['host']) && empty($each_server['verbose'])) {
$each_server['verbose'] = $GLOBALS['strServer'] . $server_index;
$each_server['verbose'] = __('Server') . $server_index;
}
$new_servers[$server_index] = $each_server;

100
libraries/common.lib.php
View File

@@ -130,7 +130,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
/**
* Displays the maximum size for an upload
*
* @uses $GLOBALS['strMaximumSize']
* @uses __('Max: %s%s')
* @uses PMA_formatByteDown()
* @uses sprintf()
* @param integer the size
@@ -144,7 +144,7 @@ function PMA_displayMaximumUploadSize($max_upload_size)
// I have to reduce the second parameter (sensitiveness) from 6 to 4
// to avoid weird results like 512 kKib
list($max_size, $max_unit) = PMA_formatByteDown($max_upload_size, 4);
return '(' . sprintf($GLOBALS['strMaximumSize'], $max_size, $max_unit) . ')';
return '(' . sprintf(__('Max: %s%s'), $max_size, $max_unit) . ')';
}
/**
@@ -346,7 +346,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
* @uses $cfg['MySQLManualType']
* @uses $cfg['MySQLManualBase']
* @uses $cfg['ReplaceHelpImg']
* @uses $GLOBALS['strDocu']
* @uses __('Documentation')
* @uses $GLOBALS['pmaThemeImage']
* @uses PMA_MYSQL_INT_VERSION
* @uses strtolower()
@@ -425,11 +425,11 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
if ($just_open) {
return '<a href="' . $url . '" target="mysql_doc">';
} elseif ($big_icon) {
return '<a href="' . $url . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_sqlhelp.png" width="16" height="16" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" /></a>';
return '<a href="' . $url . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_sqlhelp.png" width="16" height="16" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
} elseif ($GLOBALS['cfg']['ReplaceHelpImg']) {
return '<a href="' . $url . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" /></a>';
return '<a href="' . $url . '" target="mysql_doc"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
} else {
return '[<a href="' . $url . '" target="mysql_doc">' . $GLOBALS['strDocu'] . '</a>]';
return '[<a href="' . $url . '" target="mysql_doc">' . __('Documentation') . '</a>]';
}
} // end of the 'PMA_showMySQLDocu()' function
@@ -445,9 +445,9 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
*/
function PMA_showDocu($anchor) {
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
return '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strDocu'] . '" title="' . $GLOBALS['strDocu'] . '" /></a>';
return '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
} else {
return '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . $GLOBALS['strDocu'] . '</a>]';
return '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]';
}
} // end of the 'PMA_showDocu()' function
@@ -501,11 +501,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
* @uses footer.inc.php
* @uses header.inc.php
* @uses $GLOBALS['sql_query']
* @uses $GLOBALS['strError']
* @uses $GLOBALS['strSQLQuery']
* @uses __('Error')
* @uses __('SQL query')
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['strEdit']
* @uses $GLOBALS['strMySQLSaid']
* @uses __('Edit')
* @uses __('MySQL said: ')
* @uses $GLOBALS['cfg']['PropertiesIconic']
* @uses $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
* @uses PMA_backquote()
@@ -578,7 +578,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
}
// ---
$error_msg_output .= "\n" . '<!-- PMA-SQL-ERROR -->' . "\n";
$error_msg_output .= ' <div class="error"><h1>' . $GLOBALS['strError'] . '</h1>' . "\n";
$error_msg_output .= ' <div class="error"><h1>' . __('Error') . '</h1>' . "\n";
// if the config password is wrong, or the MySQL server does not
// respond, do not show the query that would reveal the
// username/password
@@ -592,7 +592,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
}
// ---
// modified to show the help on sql errors
$error_msg_output .= ' <p><strong>' . $GLOBALS['strSQLQuery'] . ':</strong>' . "\n";
$error_msg_output .= ' <p><strong>' . __('SQL query') . ':</strong>' . "\n";
if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select
$error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT');
}
@@ -613,7 +613,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
}
$error_msg_output .= $doedit_goto
. PMA_getIcon('b_edit.png', $GLOBALS['strEdit'])
. PMA_getIcon('b_edit.png', __('Edit'))
. '</a>';
} // end if
$error_msg_output .= ' </p>' . "\n"
@@ -631,7 +631,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
// modified to show the help on error-returns
// (now error-messages-server)
$error_msg_output .= '<p>' . "\n"
. ' <strong>' . $GLOBALS['strMySQLSaid'] . '</strong>'
. ' <strong>' . __('MySQL said: ') . '</strong>'
. PMA_showMySQLDocu('Error-messages-server', 'Error-messages-server')
. "\n"
. '</p>' . "\n";
@@ -664,7 +664,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$_SESSION['Import_message']['go_back_url'] = $back_url;
$error_msg_output .= '<fieldset class="tblFooters">';
$error_msg_output .= '[ <a href="' . $back_url . '">' . $GLOBALS['strBack'] . '</a> ]';
$error_msg_output .= '[ <a href="' . $back_url . '">' . __('Back') . '</a> ]';
$error_msg_output .= '</fieldset>' . "\n\n";
}
@@ -716,7 +716,7 @@ function PMA_sendHeaderLocation($uri)
echo '<body>' . "\n";
echo '<script type="text/javascript">' . "\n";
echo '//<![CDATA[' . "\n";
echo 'document.write(\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
echo 'document.write(\'<p><a href="' . $uri . '">' . __('Go') . '</a></p>\');' . "\n";
echo '//]]>' . "\n";
echo '</script></body></html>' . "\n";
@@ -1174,10 +1174,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) {
$explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
$_message = $GLOBALS['strExplain'];
$_message = __('Explain SQL');
} elseif (preg_match('@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query)) {
$explain_params['sql_query'] = substr($sql_query, 8);
$_message = $GLOBALS['strNoExplain'];
$_message = __('Skip Explain SQL');
}
if (isset($explain_params['sql_query'])) {
$explain_link = 'import.php' . PMA_generate_common_url($explain_params);
@@ -1196,7 +1196,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
}
$edit_link .= PMA_generate_common_url($url_params) . '#querybox';
$edit_link = ' [' . PMA_linkOrButton($edit_link, $GLOBALS['strEdit'], array('onclick' => $onclick)) . ']';
$edit_link = ' [' . PMA_linkOrButton($edit_link, __('Edit'), array('onclick' => $onclick)) . ']';
} else {
$edit_link = '';
}
@@ -1209,10 +1209,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
$php_params = $url_params;
if (! empty($GLOBALS['show_as_php'])) {
$_message = $GLOBALS['strNoPhp'];
$_message = __('Without PHP Code');
} else {
$php_params['show_as_php'] = 1;
$_message = $GLOBALS['strPhp'];
$_message = __('Create PHP Code');
}
$php_link = 'import.php' . PMA_generate_common_url($php_params);
@@ -1220,7 +1220,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (isset($GLOBALS['show_as_php'])) {
$runquery_link = 'import.php' . PMA_generate_common_url($url_params);
$php_link .= ' [' . PMA_linkOrButton($runquery_link, $GLOBALS['strRunQuery']) . ']';
$php_link .= ' [' . PMA_linkOrButton($runquery_link, __('Submit Query')) . ']';
}
} else {
$php_link = '';
@@ -1230,7 +1230,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (! empty($cfg['SQLQuery']['Refresh'])
&& preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query)) {
$refresh_link = 'import.php' . PMA_generate_common_url($url_params);
$refresh_link = ' [' . PMA_linkOrButton($refresh_link, $GLOBALS['strRefresh']) . ']';
$refresh_link = ' [' . PMA_linkOrButton($refresh_link, __('Refresh')) . ']';
} else {
$refresh_link = '';
} //show as php
@@ -1239,10 +1239,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
&& ! empty($cfg['SQLQuery']['Validate'])) {
$validate_params = $url_params;
if (!empty($GLOBALS['validatequery'])) {
$validate_message = $GLOBALS['strNoValidateSQL'] ;
$validate_message = __('Skip Validate SQL') ;
} else {
$validate_params['validatequery'] = 1;
$validate_message = $GLOBALS['strValidateSQL'] ;
$validate_message = __('Validate SQL') ;
}
$validate_link = 'import.php' . PMA_generate_common_url($validate_params);
@@ -1329,8 +1329,8 @@ function PMA_profilingCheckbox($sql_query)
echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']);
echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n";
echo '<input type="hidden" name="profiling_form" value="1" />' . "\n";
PMA_display_html_checkbox('profiling', $GLOBALS['strProfiling'], isset($_SESSION['profiling']), true);
echo '<noscript><input type="submit" value="' . $GLOBALS['strGo'] . '" /></noscript>' . "\n";
PMA_display_html_checkbox('profiling', __('Profiling'), isset($_SESSION['profiling']), true);
echo '<noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n";
echo '</form>' . "\n";
}
}
@@ -1344,11 +1344,11 @@ function PMA_profilingCheckbox($sql_query)
*/
function PMA_profilingResults($profiling_results)
{
echo '<fieldset><legend>' . $GLOBALS['strProfiling'] . '</legend>' . "\n";
echo '<fieldset><legend>' . __('Profiling') . '</legend>' . "\n";
echo '<table>' . "\n";
echo ' <tr>' . "\n";
echo ' <th>' . $GLOBALS['strStatus'] . '</th>' . "\n";
echo ' <th>' . $GLOBALS['strTime'] . '</th>' . "\n";
echo ' <th>' . __('Status') . '</th>' . "\n";
echo ' <th>' . __('Time') . '</th>' . "\n";
echo ' </tr>' . "\n";
foreach($profiling_results as $one_result) {
@@ -1557,8 +1557,8 @@ function PMA_localisedDate($timestamp = -1, $format = '')
* If the variables $link and $args ar left empty, an inactive tab is created
*
* @uses $GLOBALS['PMA_PHP_SELF']
* @uses $GLOBALS['strEmpty']
* @uses $GLOBALS['strDrop']
* @uses __('Empty')
* @uses __('Drop')
* @uses $GLOBALS['active_page']
* @uses $GLOBALS['url_query']
* @uses $cfg['MainPageIconic']
@@ -1595,8 +1595,8 @@ function PMA_generate_html_tab($tab, $url_params = array())
// determine additionnal style-class
if (empty($tab['class'])) {
if ($tab['text'] == $GLOBALS['strEmpty']
|| $tab['text'] == $GLOBALS['strDrop']) {
if ($tab['text'] == __('Empty')
|| $tab['text'] == __('Drop')) {
$tab['class'] = 'caution';
} elseif (! empty($tab['active'])
|| PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) {
@@ -2127,7 +2127,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
* Generate a pagination selector for browsing resultsets
*
* @todo $url is not javascript escaped!?
* @uses $GLOBALS['strPageNumber']
* @uses __('Page number:')
* @uses range()
* @param string URL for the JavaScript
* @param string Number of rows in the pagination set
@@ -2221,7 +2221,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
$gotopage .= ' <option ' . $selected . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n";
}
$gotopage .= ' </select><noscript><input type="submit" value="' . $GLOBALS['strGo'] . '" /></noscript>';
$gotopage .= ' </select><noscript><input type="submit" value="' . __('Go') . '" /></noscript>';
return $gotopage;
} // end function
@@ -2231,7 +2231,7 @@ function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1,
* Generate navigation for a list
*
* @todo use $pos from $_url_params
* @uses $GLOBALS['strPageNumber']
* @uses __('Page number:')
* @uses range()
* @param integer number of elements in the list
* @param integer current position in the list
@@ -2246,7 +2246,7 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
if ($max_count < $count) {
echo 'frame_navigation' == $frame ? '<div id="navidbpageselector">' . "\n" : '';
echo $GLOBALS['strPageNumber'];
echo __('Page number:');
echo 'frame_navigation' == $frame ? '<br />' : ' ';
// Move to the beginning or to the previous page
@@ -2255,11 +2255,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$caption1 = '&lt;&lt;';
$caption2 = ' &lt; ';
$title1 = ' title="' . $GLOBALS['strPos1'] . '"';
$title2 = ' title="' . $GLOBALS['strPrevious'] . '"';
$title1 = ' title="' . __('Begin') . '"';
$title2 = ' title="' . __('Previous') . '"';
} else {
$caption1 = $GLOBALS['strPos1'] . ' &lt;&lt;';
$caption2 = $GLOBALS['strPrevious'] . ' &lt;';
$caption1 = __('Begin') . ' &lt;&lt;';
$caption2 = __('Previous') . ' &lt;';
$title1 = '';
$title2 = '';
} // end if... else...
@@ -2286,11 +2286,11 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
if ($GLOBALS['cfg']['NavigationBarIconic']) {
$caption3 = ' &gt; ';
$caption4 = '&gt;&gt;';
$title3 = ' title="' . $GLOBALS['strNext'] . '"';
$title4 = ' title="' . $GLOBALS['strEnd'] . '"';
$title3 = ' title="' . __('Next') . '"';
$title4 = ' title="' . __('End') . '"';
} else {
$caption3 = '&gt; ' . $GLOBALS['strNext'];
$caption4 = '&gt;&gt; ' . $GLOBALS['strEnd'];
$caption3 = '&gt; ' . __('Next');
$caption4 = '&gt;&gt; ' . __('End');
$title3 = '';
$title4 = '';
} // end if... else...
@@ -2372,7 +2372,7 @@ function PMA_getDbLink($database = null)
* that affects a functionality
*
* @uses PMA_MYSQL_INT_VERSION
* @uses $GLOBALS['strKnownExternalBug']
* @uses __('The %s functionality is affected by a known bug, see %s')
* @uses PMA_showHint()
* @uses sprintf()
* @param string $functionality localized message explaining the func.
@@ -2383,7 +2383,7 @@ function PMA_getDbLink($database = null)
function PMA_externalBug($functionality, $component, $minimum_version, $bugref)
{
if ($component == 'mysql' && PMA_MYSQL_INT_VERSION < $minimum_version) {
echo PMA_showHint(sprintf($GLOBALS['strKnownExternalBug'], $functionality, 'http://bugs.mysql.com/' . $bugref));
echo PMA_showHint(sprintf(__('The %s functionality is affected by a known bug, see %s'), $functionality, 'http://bugs.mysql.com/' . $bugref));
}
}

4
libraries/core.lib.php
View File

@@ -202,7 +202,7 @@ function PMA_securePath($path)
* @todo use detected argument separator (PMA_Config)
* @uses $GLOBALS['session_name']
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['strError']
* @uses __('Error')
* @uses $GLOBALS['available_languages']
* @uses $GLOBALS['lang']
* @uses $GLOBALS['PMA_Config']->removeCookie()
@@ -260,7 +260,7 @@ function PMA_fatalError($error_message, $message_args = null)
$query_params = array(
'lang' => $GLOBALS['available_languages'][$GLOBALS['lang']][1],
'dir' => $GLOBALS['text_dir'],
'type' => $GLOBALS['strError'],
'type' => __('Error'),
'error' => $error_message,
);
header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?'

8
libraries/database_interface.lib.php
View File

@@ -46,10 +46,10 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) {
* and complete fail (no alternative extension too)
*/
$error =
sprintf(PMA_sanitize($GLOBALS['strCantLoad']),
sprintf(PMA_sanitize(__('Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. Please check your PHP configuration.')),
$GLOBALS['cfg']['Server']['extension'])
.' - <a href="./Documentation.html#faqmysql" target="documentation">'
.$GLOBALS['strDocu'] . '</a>';
.__('Documentation') . '</a>';
trigger_error($error, E_USER_ERROR);
if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') {
@@ -61,10 +61,10 @@ if (! PMA_DBI_checkMysqlExtension($GLOBALS['cfg']['Server']['extension'])) {
if (! PMA_DBI_checkMysqlExtension($alternativ_extension)) {
// if alternative fails too ...
PMA_fatalError(
sprintf($GLOBALS['strCantLoad'],
sprintf(__('Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. Please check your PHP configuration.'),
$GLOBALS['cfg']['Server']['extension'])
. ' - [a@./Documentation.html#faqmysql@documentation]'
. $GLOBALS['strDocu'] . '[/a]');
. __('Documentation') . '[/a]');
}
$GLOBALS['cfg']['Server']['extension'] = $alternativ_extension;

8
libraries/db_info.inc.php
View File

@@ -59,7 +59,7 @@ $pos = $_SESSION['tmp_user_values']['table_limit_offset'];
* fills given tooltip arrays
*
* @uses $cfg['ShowTooltipAliasTB']
* @uses $GLOBALS['strStatCreateTime']
* @uses __('Creation')
* @uses PMA_localisedDate()
* @uses strtotime()
* @param array $tooltip_truename tooltip data
@@ -85,17 +85,17 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table)
}
if (isset($table['Create_time']) && !empty($table['Create_time'])) {
$tooltip_aliasname[$table['Name']] .= ', ' . $GLOBALS['strStatCreateTime']
$tooltip_aliasname[$table['Name']] .= ', ' . __('Creation')
. ': ' . PMA_localisedDate(strtotime($table['Create_time']));
}
if (! empty($table['Update_time'])) {
$tooltip_aliasname[$table['Name']] .= ', ' . $GLOBALS['strStatUpdateTime']
$tooltip_aliasname[$table['Name']] .= ', ' . __('Last update')
. ': ' . PMA_localisedDate(strtotime($table['Update_time']));
}
if (! empty($table['Check_time'])) {
$tooltip_aliasname[$table['Name']] .= ', ' . $GLOBALS['strStatCheckTime']
$tooltip_aliasname[$table['Name']] .= ', ' . __('Last check')
. ': ' . PMA_localisedDate(strtotime($table['Check_time']));
}
}

24
libraries/db_links.inc.php
View File

@@ -42,7 +42,7 @@ $is_superuser = PMA_isSuperuser();
if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) {
$tab_drop['link'] = 'sql.php';
$tab_drop['args']['sql_query'] = 'DROP DATABASE ' . PMA_backquote($db);
$tab_drop['args']['zero_rows'] = sprintf($GLOBALS['strDatabaseHasBeenDropped'], htmlspecialchars(PMA_backquote($db)));
$tab_drop['args']['zero_rows'] = sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db)));
$tab_drop['args']['goto'] = 'main.php';
$tab_drop['args']['back'] = 'db' . $sub_part . '.php';
$tab_drop['args']['reload'] = 1;
@@ -60,55 +60,55 @@ if ($num_tables == 0) {
}
$tab_structure['link'] = 'db_structure.php';
$tab_structure['text'] = $GLOBALS['strStructure'];
$tab_structure['text'] = __('Structure');
$tab_structure['icon'] = 'b_props.png';
$tab_sql['link'] = 'db_sql.php';
$tab_sql['args']['db_query_force'] = 1;
$tab_sql['text'] = $GLOBALS['strSQL'];
$tab_sql['text'] = __('SQL');
$tab_sql['icon'] = 'b_sql.png';
$tab_export['text'] = $GLOBALS['strExport'];
$tab_export['text'] = __('Export');
$tab_export['icon'] = 'b_export.png';
$tab_export['link'] = 'db_export.php';
$tab_search['text'] = $GLOBALS['strSearch'];
$tab_search['text'] = __('Search');
$tab_search['icon'] = 'b_search.png';
$tab_search['link'] = 'db_search.php';
if(PMA_Tracker::isActive())
{
$tab_tracking['text'] = $GLOBALS['strTracking'];
$tab_tracking['text'] = __('Tracking');
$tab_tracking['icon'] = 'eye.png';
$tab_tracking['link'] = 'db_tracking.php';
}
$tab_qbe['text'] = $GLOBALS['strQBE'];
$tab_qbe['text'] = __('Query');
$tab_qbe['icon'] = 's_db.png';
$tab_qbe['link'] = 'db_qbe.php';
if ($cfgRelation['designerwork']) {
$tab_designer['text'] = $GLOBALS['strDesigner'];
$tab_designer['text'] = __('Designer');
$tab_designer['icon'] = 'b_relations.png';
$tab_designer['link'] = 'pmd_general.php';
}
if (! $db_is_information_schema) {
$tab_import['link'] = 'db_import.php';
$tab_import['text'] = $GLOBALS['strImport'];
$tab_import['text'] = __('Import');
$tab_import['icon'] = 'b_import.png';
$tab_drop['text'] = $GLOBALS['strDrop'];
$tab_drop['text'] = __('Drop');
$tab_drop['icon'] = 'b_deltbl.png';
$tab_drop['class'] = 'caution';
$tab_operation['link'] = 'db_operations.php';
$tab_operation['text'] = $GLOBALS['strOperations'];
$tab_operation['text'] = __('Operations');
$tab_operation['icon'] = 'b_tblops.png';
if ($is_superuser) {
$tab_privileges['link'] = 'server_privileges.php';
$tab_privileges['args']['checkprivs'] = $db;
// stay on database view
$tab_privileges['args']['viewing_mode'] = 'db';
$tab_privileges['text'] = $GLOBALS['strPrivileges'];
$tab_privileges['text'] = __('Privileges');
$tab_privileges['icon'] = 's_rights.png';
}
}

40
libraries/db_structure.lib.php
View File

@@ -17,14 +17,14 @@ if (! defined('PHPMYADMIN')) {
* @uses PMA_showHint()
* @uses $GLOBALS['cfg']['PropertiesNumColumns']
* @uses $GLOBALS['is_show_stats']
* @uses $GLOBALS['strTable']
* @uses $GLOBALS['strAction']
* @uses $GLOBALS['strRecords']
* @uses $GLOBALS['strApproximateCount']
* @uses $GLOBALS['strType']
* @uses $GLOBALS['strCollation']
* @uses $GLOBALS['strSize']
* @uses $GLOBALS['strOverhead']
* @uses __('Table')
* @uses __('Action')
* @uses __('Records')
* @uses __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')
* @uses __('Type')
* @uses __('Collation')
* @uses __('Size')
* @uses __('Overhead')
* @uses $GLOBALS['structure_tbl_col_cnt']
* @uses PMA_SortableTableHeader()
* @param boolean $db_is_information_schema
@@ -43,30 +43,30 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false
echo '<table class="data" style="float: left;">' . "\n"
.'<thead>' . "\n"
.'<tr><th></th>' . "\n"
.' <th>' . PMA_SortableTableHeader($GLOBALS['strTable'], 'table') . '</th>' . "\n";
.' <th>' . PMA_SortableTableHeader(__('Table'), 'table') . '</th>' . "\n";
if ($replication) {
echo ' <th>' . "\n"
.' ' . $GLOBALS['strReplication'] . "\n"
.' ' . __('Replication') . "\n"
.' </th>';
}
echo ' <th colspan="' . $action_colspan . '">' . "\n"
.' ' . $GLOBALS['strAction'] . "\n"
.' ' . __('Action') . "\n"
.' </th>'
// larger values are more interesting so default sort order is DESC
.' <th>' . PMA_SortableTableHeader($GLOBALS['strRecords'], 'records', 'DESC')
.PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount'])) . "\n"
.' <th>' . PMA_SortableTableHeader(__('Records'), 'records', 'DESC')
.PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))) . "\n"
.' </th>' . "\n";
if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) {
echo ' <th>' . PMA_SortableTableHeader($GLOBALS['strType'], 'type') . '</th>' . "\n";
echo ' <th>' . PMA_SortableTableHeader(__('Type'), 'type') . '</th>' . "\n";
$cnt++;
echo ' <th>' . PMA_SortableTableHeader($GLOBALS['strCollation'], 'collation') . '</th>' . "\n";
echo ' <th>' . PMA_SortableTableHeader(__('Collation'), 'collation') . '</th>' . "\n";
$cnt++;
}
if ($GLOBALS['is_show_stats']) {
// larger values are more interesting so default sort order is DESC
echo ' <th>' . PMA_SortableTableHeader($GLOBALS['strSize'], 'size', 'DESC') . '</th>' . "\n"
echo ' <th>' . PMA_SortableTableHeader(__('Size'), 'size', 'DESC') . '</th>' . "\n"
// larger values are more interesting so default sort order is DESC
. ' <th>' . PMA_SortableTableHeader($GLOBALS['strOverhead'], 'overhead', 'DESC') . '</th>' . "\n";
. ' <th>' . PMA_SortableTableHeader(__('Overhead'), 'overhead', 'DESC') . '</th>' . "\n";
$cnt += 2;
}
echo '</tr>' . "\n";
@@ -101,14 +101,14 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
$order_img = '';
$order_link_params = array();
$order_link_params['title'] = $GLOBALS['strSort'];
$order_link_params['title'] = __('Sort');
// If this column was requested to be sorted.
if ($requested_sort == $sort) {
if ($requested_sort_order == 'ASC') {
$future_sort_order = 'DESC';
// current sort order is ASC
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="sort_arrow" />';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (DESC)
$order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
// on mouse out, show current sort order (ASC)
@@ -116,7 +116,7 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
} else {
$future_sort_order = 'ASC';
// current sort order is DESC
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="sort_arrow" />';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (ASC)
$order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
// on mouse out, show current sort order (DESC)

14
libraries/dbi/mysql.dbi.lib.php
View File

@@ -109,7 +109,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
}
if (empty($link)) {
if ($is_controluser) {
trigger_error($GLOBALS['strControluserFailed'], E_USER_WARNING);
trigger_error(__('Connection for controluser as defined in your configuration failed.'), E_USER_WARNING);
return false;
}
// we could be calling PMA_DBI_connect() to connect to another
@@ -308,9 +308,9 @@ function PMA_DBI_get_client_info()
* @uses PMA_DBI_convert_message()
* @uses $GLOBALS['errno']
* @uses $GLOBALS['userlink']
* @uses $GLOBALS['strServerNotResponding']
* @uses $GLOBALS['strSocketProblem']
* @uses $GLOBALS['strDetails']
* @uses __('The server is not responding')
* @uses __('(or the local MySQL server's socket is not correctly configured)')
* @uses __('Details...')
* @uses mysql_errno()
* @uses mysql_error()
* @uses defined()
@@ -350,16 +350,16 @@ function PMA_DBI_getError($link = null)
// Some errors messages cannot be obtained by mysql_error()
if ($error_number == 2002) {
$error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem'];
$error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server's socket is not correctly configured)');
} elseif ($error_number == 2003) {
$error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'];
$error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding');
} elseif ($error_number == 1005) {
/* InnoDB contraints, see
* http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
*/
$error = '#' . ((string) $error_number) . ' - ' . $error_message .
' (<a href="server_engines.php' . PMA_generate_common_url(array('engine' => 'InnoDB', 'page' => 'Status')).
'">' . $GLOBALS['strDetails'] . '</a>)';
'">' . __('Details...') . '</a>)';
} else {
$error = '#' . ((string) $error_number) . ' - ' . $error_message;
}

8
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -121,7 +121,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
if ($return_value == false) {
if ($is_controluser) {
trigger_error($GLOBALS['strControluserFailed'], E_USER_WARNING);
trigger_error(__('Connection for controluser as defined in your configuration failed.'), E_USER_WARNING);
return false;
}
// we could be calling PMA_DBI_connect() to connect to another
@@ -366,8 +366,8 @@ function PMA_DBI_get_client_info()
* @uses PMA_DBI_convert_message()
* @uses $GLOBALS['errno']
* @uses $GLOBALS['userlink']
* @uses $GLOBALS['strServerNotResponding']
* @uses $GLOBALS['strSocketProblem']
* @uses __('The server is not responding')
* @uses __('(or the local MySQL server's socket is not correctly configured)')
* @uses mysqli_errno()
* @uses mysqli_error()
* @uses mysqli_connect_errno()
@@ -407,7 +407,7 @@ function PMA_DBI_getError($link = null)
}
if ($error_number == 2002) {
$error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem'];
$error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)');
} else {
$error = '#' . ((string) $error_number) . ' - ' . $error_message;
}

8
libraries/display_change_password.lib.php
View File

@@ -27,23 +27,23 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
. '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n";
}?>
<fieldset id="fieldset_change_password">
<legend><?php echo $GLOBALS['strChangePassword']; ?></legend>
<legend><?php echo __('Change password'); ?></legend>
<table class="data">
<tr class="odd noclick">
<td colspan="2">
<input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
<label for="nopass_1"><?php echo $GLOBALS['strNoPassword'] . "\n"; ?></label>
<label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label>
</td>
</tr>
<tr class="even noclick">
<td>
<input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
<label for="nopass_0"><?php echo $GLOBALS['strPassword']; ?>:&nbsp;</label>
<label for="nopass_0"><?php echo __('Password'); ?>:&nbsp;</label>
</td>
<td>
<input type="password" name="pma_pw" id="text_pma_pw" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
&nbsp;&nbsp;
<?php echo $GLOBALS['strReType']; ?>:&nbsp;
<?php echo __('Re-type'); ?>:&nbsp;
<input type="password" name="pma_pw2" id="text_pma_pw2" size="10" class="textfield" <?php echo $chg_evt_handler; ?>="nopass[1].checked = true" />
</td>
</tr>

2
libraries/display_create_table.lib.php
View File

@@ -38,7 +38,7 @@ $is_create_table_priv = true;
?>
<form method="post" action="tbl_create.php"
onsubmit="return (emptyFormElements(this, 'table') &amp;&amp; checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidFieldCount']); ?>', 1))">
onsubmit="return (emptyFormElements(this, 'table') &amp;&amp; checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one field.')); ?>', 1))">
<fieldset>
<legend>
<?php

2
libraries/display_export.lib.php
View File

@@ -273,7 +273,7 @@ if ($is_zip || $is_gzip || $is_bzip) { ?>
<?php } ?>
<fieldset class="tblFooters">
<?php PMA_externalBug($GLOBALS['strSQLCompatibility'], 'mysql', '50027', '14515'); ?>
<?php PMA_externalBug(__('SQL compatibility mode'), 'mysql', '50027', '14515'); ?>
<input type="submit" value="<?php echo __('Go'); ?>" id="buttonGo" />
</fieldset>
</form>

4
libraries/display_select_lang.lib.php
View File

@@ -42,8 +42,8 @@ function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) {
// For non-English, display "Language" with emphasis because it's
// not a proper word in the current language; we show it to help
// people recognize the dialog
$language_title = $GLOBALS['strLanguage']
. ($GLOBALS['strLanguage'] != 'Language' ? ' - <em>Language</em>' : '');
$language_title = __('Language')
. (__('Language') != 'Language' ? ' - <em>Language</em>' : '');
if ($show_doc) {
$language_title .= ' <a href="./translators.html" target="documentation">' .
($cfg['ReplaceHelpImg']

116
libraries/display_tbl.lib.php
View File

@@ -287,8 +287,8 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
<?php
// Move to the beginning or to the previous page
if ($_SESSION['tmp_user_values']['pos'] && $_SESSION['tmp_user_values']['max_rows'] != 'all') {
PMA_displayTableNavigationOneButton('&lt;&lt;', $GLOBALS['strPos1'], 0, $html_sql_query);
PMA_displayTableNavigationOneButton('&lt;', $GLOBALS['strPrevious'], $pos_prev, $html_sql_query);
PMA_displayTableNavigationOneButton('&lt;&lt;', __('Begin'), 0, $html_sql_query);
PMA_displayTableNavigationOneButton('&lt;', __('Previous'), $pos_prev, $html_sql_query);
} // end move back
?>
@@ -301,27 +301,27 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
// the 5th parameter to checkFormElementInRange()
// (this means we can't validate the upper limit ?>
<form action="sql.php" method="post"
onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidRowNumber']); ?>', 1) &amp;&amp; checkFormElementInRange(this, 'pos', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidRowNumber']); ?>', 0<?php echo $unlim_num_rows > 0 ? ',' . $unlim_num_rows - 1 : ''; ?>))">
onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo str_replace('\'', '\\\'', __('%d is not valid row number.')); ?>', 1) &amp;&amp; checkFormElementInRange(this, 'pos', '<?php echo str_replace('\'', '\\\'', __('%d is not valid row number.')); ?>', 0<?php echo $unlim_num_rows > 0 ? ',' . $unlim_num_rows - 1 : ''; ?>))">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" />
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="submit" name="navig" value="<?php echo $GLOBALS['strShow']; ?> :" />
<input type="submit" name="navig" value="<?php echo __('Show'); ?> :" />
<input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" />
<?php echo $GLOBALS['strRowsFrom'] . "\n"; ?>
<?php echo __('row(s) starting from record #') . "\n"; ?>
<input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" />
<br />
<?php
// Display mode (horizontal/vertical and repeat headers)
$choices = array(
'horizontal' => $GLOBALS['strRowsModeHorizontal'],
'horizontalflipped' => $GLOBALS['strRowsModeFlippedHorizontal'],
'vertical' => $GLOBALS['strRowsModeVertical']);
'horizontal' => __('horizontal'),
'horizontalflipped' => __('horizontal (rotated headers)'),
'vertical' => __('vertical'));
$param1 = PMA_generate_html_dropdown('disp_direction', $choices, $_SESSION['tmp_user_values']['disp_direction'], $id_for_direction_dropdown);
unset($choices);
$param2 = ' <input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />' . "\n"
. ' ';
echo ' ' . sprintf($GLOBALS['strRowsModeOptions'], "\n" . $param1, "\n" . $param2) . "\n";
echo ' ' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "\n";
?>
</form>
</td>
@@ -335,7 +335,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
// display the Next button
PMA_displayTableNavigationOneButton('&gt;',
$GLOBALS['strNext'],
__('Next'),
$pos_next,
$html_sql_query);
@@ -343,14 +343,14 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
if ($is_innodb && $unlim_num_rows > $GLOBALS['cfg']['MaxExactCount']) {
$input_for_real_end = '<input type="hidden" name="find_real_end" value="1" />';
// no backquote around this message
$onclick = ' onclick="return confirmAction(\'' . PMA_jsFormat($GLOBALS['strLongOperation'], false) . '\')"';
$onclick = ' onclick="return confirmAction(\'' . PMA_jsFormat(__('This operation could take a long time. Proceed anyway?'), false) . '\')"';
} else {
$input_for_real_end = $onclick = '';
}
// display the End button
PMA_displayTableNavigationOneButton('&gt;&gt;',
$GLOBALS['strEnd'],
__('End'),
@((ceil($unlim_num_rows / $_SESSION['tmp_user_values']['max_rows'])- 1) * $_SESSION['tmp_user_values']['max_rows']),
$html_sql_query,
'onsubmit="return ' . (($_SESSION['tmp_user_values']['pos'] + $_SESSION['tmp_user_values']['max_rows'] < $unlim_num_rows && $num_rows >= $_SESSION['tmp_user_values']['max_rows']) ? 'true' : 'false') . '"',
@@ -391,7 +391,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
5,
20,
10,
$GLOBALS['strPageNumber']
__('Page number:')
);
?>
</form>
@@ -414,7 +414,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
<input type="hidden" name="pos" value="0" />
<input type="hidden" name="session_max_rows" value="all" />
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="submit" name="navig" value="<?php echo $GLOBALS['strShowAll']; ?>" />
<input type="submit" name="navig" value="<?php echo __('Show all'); ?>" />
</form>
</td>
<?php
@@ -509,7 +509,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
echo '<form action="sql.php" method="post">' . "\n";
echo PMA_generate_common_hidden_inputs($db, $table);
echo $GLOBALS['strSortByKey'] . ': <select name="sql_query" onchange="this.form.submit();">' . "\n";
echo __('Sort by key') . ': <select name="sql_query" onchange="this.form.submit();">' . "\n";
$used_index = false;
$local_order = (isset($sort_expression) ? $sort_expression : '');
foreach ($indexes as $index) {
@@ -520,16 +520,16 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
. htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $asc_sort)
. '"' . ($local_order == $asc_sort ? ' selected="selected"' : '')
. '>' . htmlspecialchars($index->getName()) . ' ('
. $GLOBALS['strAscending'] . ')</option>';
. __('Ascending') . ')</option>';
echo '<option value="'
. htmlspecialchars($unsorted_sql_query . ' ORDER BY ' . $desc_sort)
. '"' . ($local_order == $desc_sort ? ' selected="selected"' : '')
. '>' . htmlspecialchars($index->getName()) . ' ('
. $GLOBALS['strDescending'] . ')</option>';
. __('Descending') . ')</option>';
}
echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"') . '>' . $GLOBALS['strNone'] . '</option>';
echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"') . '>' . __('None') . '</option>';
echo '</select>' . "\n";
echo '<noscript><input type="submit" value="' . $GLOBALS['strGo'] . '" /></noscript>';
echo '<noscript><input type="submit" value="' . __('Go') . '" /></noscript>';
echo '</form>' . "\n";
}
}
@@ -552,13 +552,13 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
);
echo PMA_generate_common_hidden_inputs($url_params);
echo '<br />';
PMA_generate_slider_effect('displayoptions',$GLOBALS['strOptions']);
PMA_generate_slider_effect('displayoptions',__('Options'));
echo '<fieldset>';
echo '<div class="formelement">';
$choices = array(
'P' => $GLOBALS['strPartialText'],
'F' => $GLOBALS['strFullText']
'P' => __('Partial Texts'),
'F' => __('Full Texts')
);
PMA_display_html_radio('display_text', $choices, $_SESSION['tmp_user_values']['display_text']);
echo '</div>';
@@ -567,11 +567,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($_SESSION['tmp_user_values']['display_text']=='F') {
// currently in fulltext mode so show the opposite link
$tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_partialtext.png';
$tmp_txt = $GLOBALS['strPartialText'];
$tmp_txt = __('Partial Texts');
$url_params['display_text'] = 'P';
} else {
$tmp_image_file = $GLOBALS['pmaThemeImage'] . 's_fulltext.png';
$tmp_txt = $GLOBALS['strFullText'];
$tmp_txt = __('Full Texts');
$url_params['display_text'] = 'F';
}
@@ -584,19 +584,19 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
if ($GLOBALS['cfgRelation']['relwork'] && $GLOBALS['cfgRelation']['displaywork']) {
echo '<div class="formelement">';
$choices = array(
'K' => $GLOBALS['strRelationalKey'],
'D' => $GLOBALS['strRelationalDisplayField']
'K' => __('Relational key'),
'D' => __('Relational display field')
);
PMA_display_html_radio('relational_display', $choices, $_SESSION['tmp_user_values']['relational_display']);
echo '</div>';
}
echo '<div class="formelement">';
PMA_display_html_checkbox('display_binary', $GLOBALS['strShowBinaryContents'], ! empty($_SESSION['tmp_user_values']['display_binary']), false);
PMA_display_html_checkbox('display_binary', __('Show binary contents'), ! empty($_SESSION['tmp_user_values']['display_binary']), false);
echo '<br />';
PMA_display_html_checkbox('display_blob', $GLOBALS['strShowBLOBContents'], ! empty($_SESSION['tmp_user_values']['display_blob']), false);
PMA_display_html_checkbox('display_blob', __('Show BLOB contents'), ! empty($_SESSION['tmp_user_values']['display_blob']), false);
echo '<br />';
PMA_display_html_checkbox('display_binary_as_hex', $GLOBALS['strShowBinaryContentsAsHex'], ! empty($_SESSION['tmp_user_values']['display_binary_as_hex']), false);
PMA_display_html_checkbox('display_binary_as_hex', __('Show binary contents as HEX'), ! empty($_SESSION['tmp_user_values']['display_binary_as_hex']), false);
echo '</div>';
// I would have preferred to name this "display_transformation".
@@ -604,14 +604,14 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// per SQL query, and at the same time have a default that displays
// the transformations.
echo '<div class="formelement">';
PMA_display_html_checkbox('hide_transformation', $GLOBALS['strHide'] . ' ' . $GLOBALS['strMIME_transformation'], ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
PMA_display_html_checkbox('hide_transformation', $GLOBALS['strHide'] . ' ' . __('Browser transformation'), ! empty($_SESSION['tmp_user_values']['hide_transformation']), false);
echo '</div>';
echo '<div class="clearfloat"></div>';
echo '</fieldset>';
echo '<fieldset class="tblFooters">';
echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
echo '<input type="submit" value="' . __('Go') . '" />';
echo '</fieldset>';
echo '</div>';
echo '</form>';
@@ -822,10 +822,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_img = '';
} elseif ('DESC' == $sort_direction) {
$sort_order .= ' ASC';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="soimg' . $i . '" />';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="soimg' . $i . '" />';
} else {
$sort_order .= ' DESC';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="soimg' . $i . '" />';
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />';
}
if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) {
@@ -863,7 +863,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
&& $GLOBALS['cfg']['HeaderFlipType'] == 'css') {
$order_link_params['style'] = 'direction: ltr; writing-mode: tb-rl;';
}
$order_link_params['title'] = $GLOBALS['strSort'];
$order_link_params['title'] = __('Sort');
$order_link_content = ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped' && $GLOBALS['cfg']['HeaderFlipType'] == 'fake' ? PMA_flipstring(htmlspecialchars($fields_meta[$i]->name), "<br />\n") : htmlspecialchars($fields_meta[$i]->name));
$order_link = PMA_linkOrButton($order_url, $order_link_content . $order_img, $order_link_params, false, true);
@@ -1114,7 +1114,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
);
$edit_url = 'tbl_change.php' . PMA_generate_common_url($_url_params);
$edit_str = PMA_getIcon('b_edit.png', $GLOBALS['strEdit'], true);
$edit_str = PMA_getIcon('b_edit.png', __('Edit'), true);
} // end if (1.2.1)
if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) {
@@ -1123,13 +1123,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
'id_bookmark' => $row[0],
'action_bookmark' => '0',
'action_bookmark_all' => '1',
'SQL' => $GLOBALS['strExecuteBookmarked'],
'SQL' => __('Execute bookmarked query'),
);
$bookmark_go = '<a href="import.php'
. PMA_generate_common_url($_url_params)
.' " title="' . $GLOBALS['strExecuteBookmarked'] . '">';
.' " title="' . __('Execute bookmarked query') . '">';
$bookmark_go .= PMA_getIcon('b_bookmark.png', $GLOBALS['strExecuteBookmarked'], true);
$bookmark_go .= PMA_getIcon('b_bookmark.png', __('Execute bookmarked query'), true);
$bookmark_go .= '</a>';
} else {
@@ -1142,7 +1142,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
'db' => $db,
'table' => $table,
'sql_query' => $url_sql_query,
'zero_rows' => $GLOBALS['strDeleted'],
'zero_rows' => __('The row has been deleted'),
'goto' => (empty($goto) ? 'tbl_sql.php' : $goto),
);
$lnk_goto = 'sql.php' . PMA_generate_common_url($_url_params, 'text');
@@ -1154,7 +1154,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
'db' => $db,
'table' => $table,
'sql_query' => $del_query,
'zero_rows' => $GLOBALS['strDeleted'],
'zero_rows' => __('The row has been deleted'),
'goto' => $lnk_goto,
);
$del_url = 'sql.php' . PMA_generate_common_url($_url_params);
@@ -1162,7 +1162,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$js_conf = 'DELETE FROM ' . PMA_jsFormat($db) . '.' . PMA_jsFormat($table)
. ' WHERE ' . PMA_jsFormat($where_clause, false)
. ($clause_is_unique ? '' : ' LIMIT 1');
$del_str = PMA_getIcon('b_drop.png', $GLOBALS['strDelete'], true);
$del_str = PMA_getIcon('b_drop.png', __('Delete'), true);
} elseif ($is_display['del_lnk'] == 'kp') { // kill process case
$_url_params = array(
@@ -1181,7 +1181,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$del_url = 'sql.php' . PMA_generate_common_url($_url_params);
$del_query = 'KILL ' . $row[0];
$js_conf = 'KILL ' . $row[0];
$del_str = PMA_getIcon('b_drop.png', $GLOBALS['strKill'], true);
$del_str = PMA_getIcon('b_drop.png', __('Kill'), true);
} // end if (1.2.2)
// 1.3 Displays the links at left if required
@@ -1845,7 +1845,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
|| $analyzed_sql[0]['where_clause'] == '1 ')) {
// "j u s t b r o w s i n g"
$pre_count = '~';
$after_count = PMA_showHint(PMA_sanitize($GLOBALS['strApproximateCount']), true);
$after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true);
} else {
$pre_count = '';
$after_count = '';
@@ -1926,7 +1926,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// 2.1 Displays a messages with position informations
if ($is_display['nav_bar'] == '1' && isset($pos_next)) {
if (isset($unlim_num_rows) && $unlim_num_rows != $total) {
$selectstring = ', ' . $unlim_num_rows . ' ' . $GLOBALS['strSelectNumRows'];
$selectstring = ', ' . $unlim_num_rows . ' ' . __('in query');
} else {
$selectstring = '';
}
@@ -1973,7 +1973,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
PMA_showMessage($message, $sql_query, 'success');
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
PMA_showMessage($GLOBALS['strSuccess'], $sql_query, 'success');
PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success');
}
// 2.3 Displays the navigation bars
@@ -2048,7 +2048,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($is_display['del_lnk'] == 'dr' && $is_display['del_lnk'] != 'kp') {
$delete_text = $is_display['del_lnk'] == 'dr' ? $GLOBALS['strDelete'] : $GLOBALS['strKill'];
$delete_text = $is_display['del_lnk'] == 'dr' ? __('Delete') : __('Kill');
$_url_params = array(
'db' => $db,
@@ -2068,25 +2068,25 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
$checkall_params['onclick'] = 'if (markAllRows(\'rowsDeleteForm\')) return false;';
$uncheckall_params['onclick'] = 'if (unMarkAllRows(\'rowsDeleteForm\')) return false;';
}
$checkall_link = PMA_linkOrButton($checkall_url, $GLOBALS['strCheckAll'], $checkall_params, false);
$uncheckall_link = PMA_linkOrButton($uncheckall_url, $GLOBALS['strUncheckAll'], $uncheckall_params, false);
$checkall_link = PMA_linkOrButton($checkall_url, __('Check All'), $checkall_params, false);
$uncheckall_link = PMA_linkOrButton($uncheckall_url, __('Uncheck All'), $uncheckall_params, false);
if ($_SESSION['tmp_user_values']['disp_direction'] != 'vertical') {
echo '<img class="selectallarrow" width="38" height="22"'
.' src="' . $GLOBALS['pmaThemeImage'] . 'arrow_' . $GLOBALS['text_dir'] . '.png' . '"'
.' alt="' . $GLOBALS['strWithChecked'] . '" />';
.' alt="' . __('With selected:') . '" />';
}
echo $checkall_link . "\n"
.' / ' . "\n"
.$uncheckall_link . "\n"
.'<i>' . $GLOBALS['strWithChecked'] . '</i>' . "\n";
.'<i>' . __('With selected:') . '</i>' . "\n";
PMA_buttonOrImage('submit_mult', 'mult_submit',
'submit_mult_change', $GLOBALS['strChange'], 'b_edit.png');
'submit_mult_change', __('Change'), 'b_edit.png');
PMA_buttonOrImage('submit_mult', 'mult_submit',
'submit_mult_delete', $delete_text, 'b_drop.png');
if ($analyzed_sql[0]['querytype'] == 'SELECT') {
PMA_buttonOrImage('submit_mult', 'mult_submit',
'submit_mult_export', $GLOBALS['strExport'],
'submit_mult_export', __('Export'),
'b_tblexport.png');
}
echo "\n";
@@ -2151,7 +2151,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
global $db, $table, $sql_query, $unlim_num_rows;
$header_shown = FALSE;
$header = '<fieldset><legend>' . $GLOBALS['strQueryResultsOperations'] . '</legend>';
$header = '<fieldset><legend>' . __('Query results operations') . '</legend>';
if ($the_disp_mode[6] == '1' || $the_disp_mode[9] == '1') {
// Displays "printable view" link if required
@@ -2172,14 +2172,14 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
echo PMA_linkOrButton(
'sql.php' . $url_query,
PMA_getIcon('b_print.png', $GLOBALS['strPrintView'], false, true),
PMA_getIcon('b_print.png', __('Print view'), false, true),
'', true, true, 'print_view') . "\n";
if ($_SESSION['tmp_user_values']['display_text']) {
$_url_params['display_text'] = 'F';
echo PMA_linkOrButton(
'sql.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_print.png', $GLOBALS['strPrintViewFull'], false, true),
PMA_getIcon('b_print.png', __('Print view (with full texts)'), false, true),
'', true, true, 'print_view') . "\n";
unset($_url_params['display_text']);
}
@@ -2217,7 +2217,7 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
echo PMA_linkOrButton(
'tbl_export.php' . PMA_generate_common_url($_url_params),
PMA_getIcon('b_tblexport.png', $GLOBALS['strExport'], false, true),
PMA_getIcon('b_tblexport.png', __('Export'), false, true),
'', true, true, '') . "\n";
}
@@ -2304,7 +2304,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
* @uses PMA_DBI_try_query()
* @uses PMA_DBI_num_rows()
* @uses PMA_DBI_fetch_row()
* @uses $GLOBALS['strLinkNotFound']
* @uses __('Link not found')
* @uses PMA_DBI_free_result()
* @uses $GLOBALS['printview']
* @uses htmlspecialchars()
@@ -2353,7 +2353,7 @@ function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed
if ($dispresult && PMA_DBI_num_rows($dispresult) > 0) {
list($dispval) = PMA_DBI_fetch_row($dispresult, 0);
} else {
$dispval = $GLOBALS['strLinkNotFound'];
$dispval = __('Link not found');
}
@PMA_DBI_free_result($dispresult);
} else {

2
libraries/engines/bdb.lib.php
View File

@@ -18,7 +18,7 @@ class PMA_StorageEngine_bdb extends PMA_StorageEngine
{
return array(
'version_bdb' => array(
'title' => $GLOBALS['strVersionInformation'],
'title' => __('Version information'),
),
'bdb_cache_size' => array(
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,

100
libraries/engines/innodb.lib.php
View File

@@ -12,13 +12,13 @@
class PMA_StorageEngine_innodb extends PMA_StorageEngine
{
/**
* @uses $GLOBALS['strInnoDBDataHomeDir']
* @uses $GLOBALS['strInnoDBDataHomeDirDesc']
* @uses $GLOBALS['strInnoDBDataFilePath']
* @uses $GLOBALS['strInnoDBAutoextendIncrement']
* @uses $GLOBALS['strInnoDBAutoextendIncrementDesc']
* @uses $GLOBALS['strInnoDBBufferPoolSize']
* @uses $GLOBALS['strInnoDBBufferPoolSizeDesc']
* @uses __('Data home directory')
* @uses __('The common part of the directory path for all InnoDB data files.')
* @uses __('Data files')
* @uses __('Autoextend increment')
* @uses __(' The increment size for extending the size of an autoextending tablespace when it becomes full.')
* @uses __('Buffer pool size')
* @uses __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.')
* @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC
* @uses PMA_ENGINE_DETAILS_TYPE_SIZE
* @return array
@@ -27,20 +27,20 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
{
return array(
'innodb_data_home_dir' => array(
'title' => $GLOBALS['strInnoDBDataHomeDir'],
'desc' => $GLOBALS['strInnoDBDataHomeDirDesc'],
'title' => __('Data home directory'),
'desc' => __('The common part of the directory path for all InnoDB data files.'),
),
'innodb_data_file_path' => array(
'title' => $GLOBALS['strInnoDBDataFilePath'],
'title' => __('Data files'),
),
'innodb_autoextend_increment' => array(
'title' => $GLOBALS['strInnoDBAutoextendIncrement'],
'desc' => $GLOBALS['strInnoDBAutoextendIncrementDesc'],
'title' => __('Autoextend increment'),
'desc' => __(' The increment size for extending the size of an autoextending tablespace when it becomes full.'),
'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
),
'innodb_buffer_pool_size' => array(
'title' => $GLOBALS['strInnoDBBufferPoolSize'],
'desc' => $GLOBALS['strInnoDBBufferPoolSizeDesc'],
'title' => __('Buffer pool size'),
'desc' => __('The size of the memory buffer InnoDB uses to cache data and indexes of its tables.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
),
'innodb_additional_mem_pool_size' => array(
@@ -131,8 +131,8 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
/**
* @uses $this->support
* @uses PMA_ENGINE_SUPPORT_YES
* @uses $GLOBALS['strBufferPool']
* @uses $GLOBALS['strInnodbStat']
* @uses __('Buffer Pool')
* @uses __('InnoDB Status')
* @return array detail pages
*/
function getInfoPages()
@@ -141,8 +141,8 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
return array();
}
$pages = array();
$pages['Bufferpool'] = $GLOBALS['strBufferPool'];
$pages['Status'] = $GLOBALS['strInnodbStat'];
$pages['Bufferpool'] = __('Buffer Pool');
$pages['Status'] = __('InnoDB Status');
return $pages;
}
@@ -152,22 +152,22 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
* @uses PMA_DBI_fetch_result()
* @uses PMA_formatNumber()
* @uses PMA_formatByteDown()
* @uses $GLOBALS['strBufferPoolUsage']
* @uses $GLOBALS['strTotalUC']
* @uses $GLOBALS['strInnoDBPages']
* @uses $GLOBALS['strFreePages']
* @uses $GLOBALS['strDirtyPages']
* @uses $GLOBALS['strDataPages']
* @uses $GLOBALS['strPagesToBeFlushed']
* @uses $GLOBALS['strBusyPages']
* @uses $GLOBALS['strLatchedPages']
* @uses $GLOBALS['strBufferPoolActivity']
* @uses $GLOBALS['strReadRequests']
* @uses $GLOBALS['strWriteRequests']
* @uses $GLOBALS['strBufferReadMisses']
* @uses $GLOBALS['strBufferWriteWaits']
* @uses $GLOBALS['strBufferReadMissesInPercent']
* @uses $GLOBALS['strBufferWriteWaitsInPercent']
* @uses __('Buffer Pool Usage')
* @uses __('Total')
* @uses __('pages')
* @uses __('Free pages')
* @uses __('Dirty pages')
* @uses __('Pages containing data')
* @uses __('Pages to be flushed')
* @uses __('Busy pages')
* @uses __('Latched pages')
* @uses __('Buffer Pool Activity')
* @uses __('Read requests')
* @uses __('Write requests')
* @uses __('Read misses')
* @uses __('Write waits')
* @uses __('Read misses in %')
* @uses __('Write waits in %')
* @uses join()
* @uses htmlspecialchars()
* @uses PMA_formatNumber()
@@ -186,15 +186,15 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
$output = '<table class="data" id="table_innodb_bufferpool_usage">' . "\n"
. ' <caption class="tblHeaders">' . "\n"
. ' ' . $GLOBALS['strBufferPoolUsage'] . "\n"
. ' ' . __('Buffer Pool Usage') . "\n"
. ' </caption>' . "\n"
. ' <tfoot>' . "\n"
. ' <tr>' . "\n"
. ' <th colspan="2">' . "\n"
. ' ' . $GLOBALS['strTotalUC'] . "\n"
. ' ' . __('Total') . "\n"
. ' : ' . PMA_formatNumber(
$status['Innodb_buffer_pool_pages_total'], 0)
. '&nbsp;' . $GLOBALS['strInnoDBPages']
. '&nbsp;' . __('pages')
. ' / '
. join('&nbsp;',
PMA_formatByteDown($status['Innodb_buffer_pool_pages_total'] * $status['Innodb_page_size'])) . "\n"
@@ -203,31 +203,31 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
. ' </tfoot>' . "\n"
. ' <tbody>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strFreePages'] . '</th>' . "\n"
. ' <th>' . __('Free pages') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_free'], 0)
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="even">' . "\n"
. ' <th>' . $GLOBALS['strDirtyPages'] . '</th>' . "\n"
. ' <th>' . __('Dirty pages') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_dirty'], 0)
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strDataPages'] . '</th>' . "\n"
. ' <th>' . __('Pages containing data') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_data'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="even">' . "\n"
. ' <th>' . $GLOBALS['strPagesToBeFlushed'] . '</th>' . "\n"
. ' <th>' . __('Pages to be flushed') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_flushed'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strBusyPages'] . '</th>' . "\n"
. ' <th>' . __('Busy pages') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_misc'], 0) . "\n"
. '</td>' . "\n"
@@ -236,7 +236,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
// not present at least since MySQL 5.1.40
if (isset($status['Innodb_buffer_pool_pages_latched'])) {
$output .= ' <tr class="even">'
. ' <th>' . $GLOBALS['strLatchedPages'] . '</th>'
. ' <th>' . __('Latched pages') . '</th>'
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_pages_latched'], 0)
. '</td>'
@@ -247,35 +247,35 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
. '</table>' . "\n\n"
. '<table class="data" id="table_innodb_bufferpool_activity">' . "\n"
. ' <caption class="tblHeaders">' . "\n"
. ' ' . $GLOBALS['strBufferPoolActivity'] . "\n"
. ' ' . __('Buffer Pool Activity') . "\n"
. ' </caption>' . "\n"
. ' <tbody>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strReadRequests'] . '</th>' . "\n"
. ' <th>' . __('Read requests') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_read_requests'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="even">' . "\n"
. ' <th>' . $GLOBALS['strWriteRequests'] . '</th>' . "\n"
. ' <th>' . __('Write requests') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_write_requests'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strBufferReadMisses'] . '</th>' . "\n"
. ' <th>' . __('Read misses') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_reads'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="even">' . "\n"
. ' <th>' . $GLOBALS['strBufferWriteWaits'] . '</th>' . "\n"
. ' <th>' . __('Write waits') . '</th>' . "\n"
. ' <td class="value">'
. PMA_formatNumber($status['Innodb_buffer_pool_wait_free'], 0) . "\n"
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="odd">' . "\n"
. ' <th>' . $GLOBALS['strBufferReadMissesInPercent'] . '</th>' . "\n"
. ' <th>' . __('Read misses in %') . '</th>' . "\n"
. ' <td class="value">'
. ($status['Innodb_buffer_pool_read_requests'] == 0
? '---'
@@ -283,7 +283,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine
. '</td>' . "\n"
. ' </tr>' . "\n"
. ' <tr class="even">' . "\n"
. ' <th>' . $GLOBALS['strBufferWriteWaitsInPercent'] . '</th>' . "\n"
. ' <th>' . __('Write waits in %') . '</th>' . "\n"
. ' <td class="value">'
. ($status['Innodb_buffer_pool_write_requests'] == 0
? '---'

24
libraries/engines/myisam.lib.php
View File

@@ -20,32 +20,32 @@ class PMA_StorageEngine_myisam extends PMA_StorageEngine
{
return array(
'myisam_data_pointer_size' => array(
'title' => $GLOBALS['strMyISAMDataPointerSize'],
'desc' => $GLOBALS['strMyISAMDataPointerSizeDesc'],
'title' => __('Data pointer size'),
'desc' => __('The default pointer size in bytes, to be used by CREATE TABLE for MyISAM tables when no MAX_ROWS option is specified.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
),
'myisam_recover_options' => array(
'title' => $GLOBALS['strMyISAMRecoverOptions'],
'desc' => $GLOBALS['strMyISAMRecoverOptionsDesc'],
'title' => __('Automatic recovery mode'),
'desc' => __('The mode for automatic recovery of crashed MyISAM tables, as set via the --myisam-recover server startup option.'),
),
'myisam_max_sort_file_size' => array(
'title' => $GLOBALS['strMyISAMMaxSortFileSize'],
'desc' => $GLOBALS['strMyISAMMaxSortFileSizeDesc'],
'title' => __('Maximum size for temporary sort files'),
'desc' => __('The maximum size of the temporary file MySQL is allowed to use while re-creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA INFILE).'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
),
'myisam_max_extra_sort_file_size' => array(
'title' => $GLOBALS['strMyISAMMaxExtraSortFileSize'],
'desc' => $GLOBALS['strMyISAMMaxExtraSortFileSizeDesc'],
'title' => __('Maximum size for temporary files on index creation'),
'desc' => __('If the temporary file used for fast MyISAM index creation would be larger than using the key cache by the amount specified here, prefer the key cache method.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
),
'myisam_repair_threads' => array(
'title' => $GLOBALS['strMyISAMRepairThreads'],
'desc' => $GLOBALS['strMyISAMRepairThreadsDesc'],
'title' => __('Repair threads'),
'desc' => __('If this value is greater than 1, MyISAM table indexes are created in parallel (each index in its own thread) during the repair by sorting process.'),
'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC,
),
'myisam_sort_buffer_size' => array(
'title' => $GLOBALS['strMyISAMSortBufferSize'],
'desc' => $GLOBALS['strMyISAMSortBufferSizeDesc'],
'title' => __('Sort buffer size'),
'desc' => __('The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE,
),
'myisam_stats_method' => array(

48
libraries/engines/pbxt.lib.php
View File

@@ -20,63 +20,63 @@ class PMA_StorageEngine_pbxt extends PMA_StorageEngine
{
return array(
'pbxt_index_cache_size' => array(
'title' => $GLOBALS['strPBXTIndexCacheSize'],
'desc' => $GLOBALS['strPBXTIndexCacheSizeDesc'],
'title' => __('Index cache size'),
'desc' => __('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.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_record_cache_size' => array(
'title' => $GLOBALS['strPBXTRecordCacheSize'],
'desc' => $GLOBALS['strPBXTRecordCacheSizeDesc'],
'title' => __('Record cache size'),
'desc' => __('This is the amount of memory allocated to the record cache used to cache table data. The default value is 32MB. This memory is used to cache changes to the handle data (.xtd) and row pointer (.xtr) files.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_log_cache_size' => array(
'title' => $GLOBALS['strPBXTLogCacheSize'],
'desc' => $GLOBALS['strPBXTLogCacheSizeDesc'],
'title' => __('Log cache size'),
'desc' => __('The amount of memory allocated to the transaction log cache used to cache on transaction log data. The default is 16MB.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_log_file_threshold' => array(
'title' => $GLOBALS['strPBXTLogFileThreshold'],
'desc' => $GLOBALS['strPBXTLogFileThresholdDesc'],
'title' => __('Log file threshold'),
'desc' => __('The size of a transaction log before rollover, and a new log is created. The default value is 16MB.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_transaction_buffer_size' => array(
'title' => $GLOBALS['strPBXTTransactionBufferSize'],
'desc' => $GLOBALS['strPBXTTransactionBufferSizeDesc'],
'title' => __('Transaction buffer size'),
'desc' => __('The size of the global transaction log buffer (the engine allocates 2 buffers of this size). The default is 1MB.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_checkpoint_frequency' => array(
'title' => $GLOBALS['strPBXTCheckpointFrequency'],
'desc' => $GLOBALS['strPBXTCheckpointFrequencyDesc'],
'title' => __('Checkpoint frequency'),
'desc' => __('The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_data_log_threshold' => array(
'title' => $GLOBALS['strPBXTDataLogThreshold'],
'desc' => $GLOBALS['strPBXTDataLogThresholdDesc'],
'title' => __('Data log threshold'),
'desc' => __('The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_garbage_threshold' => array(
'title' => $GLOBALS['strPBXTGarbageThreshold'],
'desc' => $GLOBALS['strPBXTGarbageThresholdDesc'],
'title' => __('Garbage threshold'),
'desc' => __('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.'),
'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC
),
'pbxt_log_buffer_size' => array(
'title' => $GLOBALS['strPBXTLogBufferSize'],
'desc' => $GLOBALS['strPBXTLogBufferSizeDesc'],
'title' => __('Log buffer size'),
'desc' => __('The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_data_file_grow_size' => array(
'title' => $GLOBALS['strPBXTDataFileGrowSize'],
'desc' => $GLOBALS['strPBXTDataFileGrowSizeDesc'],
'title' => __('Data file grow size'),
'desc' => __('The grow size of the handle data (.xtd) files.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_row_file_grow_size' => array(
'title' => $GLOBALS['strPBXTRowFileGrowSize'],
'desc' => $GLOBALS['strPBXTRowFileGrowSizeDesc'],
'title' => __('Row file grow size'),
'desc' => __('The grow size of the row pointer (.xtr) files.'),
'type' => PMA_ENGINE_DETAILS_TYPE_SIZE
),
'pbxt_log_file_count' => array(
'title' => $GLOBALS['strPBXTLogFileCount'],
'desc' => $GLOBALS['strPBXTLogFileCountDesc'],
'title' => __('Log file count'),
'desc' => __('This is the number of transaction log files (pbxt/system/xlog*.xt) the system will maintain. If the number of logs exceeds this value then old logs will be deleted, otherwise they are renamed and given the next highest number.'),
'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC
),
);

20
libraries/export/htmlword.php
View File

@@ -83,7 +83,7 @@ xmlns="http://www.w3.org/TR/REC-html40">
* @access public
*/
function PMA_exportDBHeader($db) {
return PMA_exportOutputHandler('<h1>' . $GLOBALS['strDatabase'] . ' ' . $db . '</h1>');
return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . $db . '</h1>');
}
/**
@@ -129,7 +129,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
{
global $what;
if (! PMA_exportOutputHandler('<h2>' . $GLOBALS['strDumpingData'] . ' ' . $table . '</h2>')) {
if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . $table . '</h2>')) {
return FALSE;
}
if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
@@ -182,7 +182,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
{
global $cfgRelation;
if (! PMA_exportOutputHandler('<h2>' . $GLOBALS['strTableStructure'] . ' ' .$table . '</h2>')) {
if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' .$table . '</h2>')) {
return FALSE;
}
@@ -241,15 +241,15 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
}
$schema_insert = '<tr class="print-category">';
$schema_insert .= '<th class="print">' . htmlspecialchars($GLOBALS['strField']) . '</th>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strType']) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strNull']) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strDefault']) . '</b></td>';
$schema_insert .= '<th class="print">' . htmlspecialchars(__('Field')) . '</th>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
if ($do_relation && $have_rel) {
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strLinksTo']) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
}
if ($do_comments) {
$schema_insert .= '<td class="print"><b>' . htmlspecialchars($GLOBALS['strComments']) . '</b></td>';
$schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
@@ -319,7 +319,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
}
$schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
$schema_insert .= '<td class="print">' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '') . '</td>';
$field_name = $row['Field'];

22
libraries/export/latex.php
View File

@@ -122,14 +122,14 @@ function PMA_exportHeader() {
. '% version ' . PMA_VERSION . $crlf
. '% http://www.phpmyadmin.net' . $crlf
. '%' . $crlf
. '% ' . $GLOBALS['strHost'] . ': ' . $cfg['Server']['host'];
. '% ' . __('Host') . ': ' . $cfg['Server']['host'];
if (!empty($cfg['Server']['port'])) {
$head .= ':' . $cfg['Server']['port'];
}
$head .= $crlf
. '% ' . $GLOBALS['strGenTime'] . ': ' . PMA_localisedDate() . $crlf
. '% ' . $GLOBALS['strServerVersion'] . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '% ' . $GLOBALS['strPHPVersion'] . ': ' . phpversion() . $crlf;
. '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
. '% ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
return PMA_exportOutputHandler($head);
}
@@ -145,7 +145,7 @@ function PMA_exportHeader() {
function PMA_exportDBHeader($db) {
global $crlf;
$head = '% ' . $crlf
. '% ' . $GLOBALS['strDatabase'] . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
. '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
. '% ' . $crlf;
return PMA_exportOutputHandler($head);
}
@@ -198,7 +198,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
}
unset($i);
$buffer = $crlf . '%' . $crlf . '% ' . $GLOBALS['strData'] . ': ' . $table . $crlf . '%' . $crlf
$buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf
. ' \\begin{longtable}{|';
for ($index=0;$index<$columns_cnt;$index++) {
@@ -334,7 +334,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
/**
* Displays the table structure
*/
$buffer = $crlf . '%' . $crlf . '% ' . $GLOBALS['strStructure'] . ': ' . $table . $crlf . '%' . $crlf
$buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table . $crlf . '%' . $crlf
. ' \\begin{longtable}{';
if (!PMA_exportOutputHandler($buffer)) {
return FALSE;
@@ -357,12 +357,12 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$buffer = $alignment . '} ' . $crlf ;
$header = ' \\hline ';
$header .= '\\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strField'] . '}} & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strType'] . '}} & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strNull'] . '}} & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strDefault'] . '}}';
$header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Field') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
if ($do_relation && $have_rel) {
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strLinksTo'] . '}}';
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
}
if ($do_comments) {
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . $GLOBALS['strComments'] . '}}';
$header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
@@ -427,7 +427,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$field_name = $row['Field'];
$local_buffer = $field_name . "\000" . $type . "\000"
. (($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes'])
. (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
. "\000" . (isset($row['Default']) ? $row['Default'] : '');
if ($do_relation && $have_rel) {

22
libraries/export/odt.php
View File

@@ -110,7 +110,7 @@ function PMA_exportHeader() {
* @access public
*/
function PMA_exportDBHeader($db) {
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars($GLOBALS['strDatabase'] . ' ' . $db) . '</text:h>';
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
return TRUE;
}
@@ -165,7 +165,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
$field_flags[$j] = PMA_DBI_field_flags($result, $j);
}
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars($GLOBALS['strDumpingData'] . ' ' . $table) . '</text:h>';
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
$GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
$GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
@@ -235,7 +235,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
global $cfgRelation;
/* Heading */
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars($GLOBALS['strTableStructure'] . ' ' . $table) . '</text:h>';
$GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
/**
* Get the unique keys in the table
@@ -291,31 +291,31 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
/* Header */
$GLOBALS['odt_buffer'] .= '<table:table-row>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strField']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Field')) . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strType']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strNull']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strDefault']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
. '</table:table-cell>';
if ($do_relation && $have_rel) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strLinksTo']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
. '</table:table-cell>';
}
if ($do_comments) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strComments']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
. '</table:table-cell>';
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($GLOBALS['strMIME_MIMEtype']) . '</text:p>'
. '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
. '</table:table-cell>';
$mime_map = PMA_getMIME($db, $table, true);
}
@@ -365,7 +365,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$row['Default'] = $row['Default'];
}
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . '</text:p>'
. '<text:p>' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
. '</table:table-cell>';
$GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
. '<text:p>' . htmlspecialchars($row['Default']) . '</text:p>'

2
libraries/export/pdf.php
View File

@@ -144,7 +144,7 @@ class PMA_PDF extends TCPDF
if (!isset($this->footerset[$this->page])) {
$this->SetY(-15);
//Page number
$this->Cell(0, 10, $GLOBALS['strPageNumber'] .' '.$this->PageNo() .'/{nb}', 'T', 0, 'C');
$this->Cell(0, 10, __('Page number:') .' '.$this->PageNo() .'/{nb}', 'T', 0, 'C');
// set footerset
$this->footerset[$this->page] = 1;

54
libraries/export/sql.php
View File

@@ -49,7 +49,7 @@ if (isset($plugin_list)) {
$plugin_list['sql']['options'][] =
array('type' => 'bgroup', 'text' => 'strDatabaseExportOptions');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf($GLOBALS['strAddClause'], 'DROP DATABASE'));
array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf(__('Add %s'), 'DROP DATABASE'));
$plugin_list['sql']['options'][] =
array('type' => 'egroup');
}
@@ -71,15 +71,15 @@ if (isset($plugin_list)) {
}
}
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf($GLOBALS['strAddClause'], $drop_clause));
array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf(__('Add %s'), $drop_clause));
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf($GLOBALS['strAddClause'], 'IF NOT EXISTS'));
array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf(__('Add %s'), 'IF NOT EXISTS'));
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'auto_increment', 'text' => 'strAddAutoIncrement');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'backquotes', 'text' => 'strUseBackquotes');
$plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf($GLOBALS['strAddClause'], 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : '')));
array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : '')));
/* MIME stuff etc. */
$plugin_list['sql']['options'][] =
@@ -229,11 +229,11 @@ function PMA_exportHeader()
. PMA_exportComment('version ' . PMA_VERSION)
. PMA_exportComment('http://www.phpmyadmin.net')
. PMA_exportComment();
$head .= empty($cfg['Server']['port']) ? PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host']) : PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']);
$head .= PMA_exportComment($GLOBALS['strGenTime']
$head .= empty($cfg['Server']['port']) ? PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host']) : PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']);
$head .= PMA_exportComment(__('Generation Time')
. ': ' . PMA_localisedDate())
. PMA_exportComment($GLOBALS['strServerVersion'] . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3))
. PMA_exportComment($GLOBALS['strPHPVersion'] . ': ' . phpversion())
. PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3))
. PMA_exportComment(__('PHP Version') . ': ' . phpversion())
. PMA_possibleCRLF();
if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) {
@@ -339,7 +339,7 @@ function PMA_exportDBCreate($db)
function PMA_exportDBHeader($db)
{
$head = PMA_exportComment()
. PMA_exportComment($GLOBALS['strDatabase'] . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
. PMA_exportComment(__('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
. PMA_exportComment();
return PMA_exportOutputHandler($head);
}
@@ -384,7 +384,7 @@ function PMA_exportDBFooter($db)
if ($procedure_names) {
$text .=
PMA_exportComment()
. PMA_exportComment($GLOBALS['strProcedures'])
. PMA_exportComment(__('Procedures'))
. PMA_exportComment();
foreach($procedure_names as $procedure_name) {
@@ -398,7 +398,7 @@ function PMA_exportDBFooter($db)
if ($function_names) {
$text .=
PMA_exportComment()
. PMA_exportComment($GLOBALS['strFunctions'])
. PMA_exportComment(__('Functions'))
. PMA_exportComment();
foreach($function_names as $function_name) {
@@ -412,7 +412,7 @@ function PMA_exportDBFooter($db)
if ($event_names) {
$text .=
PMA_exportComment()
. PMA_exportComment($GLOBALS['strEvents'])
. PMA_exportComment(__('Events'))
. PMA_exportComment();
foreach($event_names as $event_name) {
@@ -511,17 +511,17 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
}
if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) {
$schema_create .= PMA_exportComment($GLOBALS['strStatCreateTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
$schema_create .= PMA_exportComment(__('Creation') . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
$new_crlf = PMA_exportComment() . $crlf;
}
if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) {
$schema_create .= PMA_exportComment($GLOBALS['strStatUpdateTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
$schema_create .= PMA_exportComment(__('Last update') . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
$new_crlf = PMA_exportComment() . $crlf;
}
if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) {
$schema_create .= PMA_exportComment($GLOBALS['strStatCheckTime'] . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
$schema_create .= PMA_exportComment(__('Last check') . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
$new_crlf = PMA_exportComment() . $crlf;
}
}
@@ -556,7 +556,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
// an error can happen, for example the table is crashed
$tmp_error = PMA_DBI_getError();
if ($tmp_error) {
return PMA_exportComment($GLOBALS['strInUse'] . '(' . $tmp_error . ')');
return PMA_exportComment(__('in use') . '(' . $tmp_error . ')');
}
if ($result != FALSE && ($row = PMA_DBI_fetch_row($result))) {
@@ -615,7 +615,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
} else {
$sql_constraints = $crlf
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strConstraintsForDumped'])
. PMA_exportComment(__('Constraints for dumped tables'))
. PMA_exportComment();
}
}
@@ -624,7 +624,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
if (!isset($GLOBALS['no_constraints_comments'])) {
$sql_constraints .= $crlf
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strConstraintsForTable'] . ' ' . PMA_backquote($table))
. PMA_exportComment(__('Constraints for table') . ' ' . PMA_backquote($table))
. PMA_exportComment();
}
@@ -724,7 +724,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim
if (isset($mime_map) && count($mime_map) > 0) {
$schema_create .= PMA_possibleCRLF()
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strMIMETypesForTable']. ' ' . PMA_backquote($table, $sql_backquotes) . ':');
. PMA_exportComment(__('MIME TYPES FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
@reset($mime_map);
foreach ($mime_map AS $mime_field => $mime) {
$schema_create .= PMA_exportComment(' ' . PMA_backquote($mime_field, $sql_backquotes))
@@ -736,7 +736,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim
if ($have_rel) {
$schema_create .= PMA_possibleCRLF()
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strRelationsForTable']. ' ' . PMA_backquote($table, $sql_backquotes) . ':');
. PMA_exportComment(__('RELATIONS FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
foreach ($res_rel AS $rel_field => $rel) {
$schema_create .= PMA_exportComment(' ' . PMA_backquote($rel_field, $sql_backquotes))
. PMA_exportComment(' ' . PMA_backquote($rel['foreign_table'], $sql_backquotes)
@@ -782,7 +782,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
switch($export_mode) {
case 'create_table':
$dump .= PMA_exportComment($GLOBALS['strTableStructure'] . ' ' . $formatted_table_name)
$dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name)
. PMA_exportComment();
$dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
$dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
@@ -793,7 +793,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
if ($triggers) {
$dump .= PMA_possibleCRLF()
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strTriggers'] . ' ' . $formatted_table_name)
. PMA_exportComment(__('Triggers') . ' ' . $formatted_table_name)
. PMA_exportComment();
$delimiter = '//';
foreach ($triggers as $trigger) {
@@ -805,7 +805,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
}
break;
case 'create_view':
$dump .= PMA_exportComment($GLOBALS['strStructureForView'] . ' ' . $formatted_table_name)
$dump .= PMA_exportComment(__('Structure for view') . ' ' . $formatted_table_name)
. PMA_exportComment();
// delete the stand-in table previously created (if any)
if ($export_type != 'table') {
@@ -814,7 +814,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE,
$dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
break;
case 'stand_in':
$dump .= PMA_exportComment($GLOBALS['strStandInStructureForView'] . ' ' . $formatted_table_name)
$dump .= PMA_exportComment(__('Stand-in structure for view') . ' ' . $formatted_table_name)
. PMA_exportComment();
// export a stand-in definition to resolve view dependencies
$dump .= PMA_getTableDefStandIn($db, $table, $crlf);
@@ -865,7 +865,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
$head = PMA_possibleCRLF()
. PMA_exportComment()
. PMA_exportComment('VIEW ' . ' ' . $formatted_table_name)
. PMA_exportComment($GLOBALS['strData'] . ': ' . $GLOBALS['strNone'])
. PMA_exportComment(__('Data') . ': ' . __('None'))
. PMA_exportComment()
. PMA_possibleCRLF();
@@ -878,7 +878,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
// it's not a VIEW
$head = PMA_possibleCRLF()
. PMA_exportComment()
. PMA_exportComment($GLOBALS['strDumpingData'] . ' ' . $formatted_table_name)
. PMA_exportComment(__('Dumping data for table') . ' ' . $formatted_table_name)
. PMA_exportComment();
if (! PMA_exportOutputHandler($head)) {
@@ -896,7 +896,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
// a possible error: the table has crashed
$tmp_error = PMA_DBI_getError();
if ($tmp_error) {
return PMA_exportOutputHandler(PMA_exportComment($GLOBALS['strInUse'] . ' (' . $tmp_error . ')'));
return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')'));
}
if ($result != FALSE) {

20
libraries/export/texytext.php
View File

@@ -81,7 +81,7 @@ function PMA_exportHeader() {
* @access public
*/
function PMA_exportDBHeader($db) {
return PMA_exportOutputHandler('===' . $GLOBALS['strDatabase'] . ' ' . $db . "\n\n");
return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n");
}
/**
@@ -127,7 +127,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
{
global $what;
if (! PMA_exportOutputHandler('== ' . $GLOBALS['strDumpingData'] . ' ' . $table . "\n\n")) {
if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) {
return FALSE;
}
@@ -174,7 +174,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
{
global $cfgRelation;
if (! PMA_exportOutputHandler('== ' . $GLOBALS['strTableStructure'] . ' ' .$table . "\n\n")) {
if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) {
return FALSE;
}
@@ -230,15 +230,15 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
}
$text_output = "|------\n";
$text_output .= '|' . htmlspecialchars($GLOBALS['strField']);
$text_output .= '|' . htmlspecialchars($GLOBALS['strType']);
$text_output .= '|' . htmlspecialchars($GLOBALS['strNull']);
$text_output .= '|' . htmlspecialchars($GLOBALS['strDefault']);
$text_output .= '|' . htmlspecialchars(__('Field'));
$text_output .= '|' . htmlspecialchars(__('Type'));
$text_output .= '|' . htmlspecialchars(__('Null'));
$text_output .= '|' . htmlspecialchars(__('Default'));
if ($do_relation && $have_rel) {
$text_output .= '|' . htmlspecialchars($GLOBALS['strLinksTo']);
$text_output .= '|' . htmlspecialchars(__('Links to'));
}
if ($do_comments) {
$text_output .= '|' . htmlspecialchars($GLOBALS['strComments']);
$text_output .= '|' . htmlspecialchars(__('Comments'));
$comments = PMA_getComments($db, $table);
}
if ($do_mime && $cfgRelation['mimework']) {
@@ -308,7 +308,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
}
$text_output .= '|' . $fmt_pre . htmlspecialchars($row['Field']) . $fmt_post;
$text_output .= '|' . htmlspecialchars($type);
$text_output .= '|' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes']);
$text_output .= '|' . htmlspecialchars(($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'));
$text_output .= '|' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '');
$field_name = $row['Field'];

12
libraries/export/xml.php
View File

@@ -99,14 +99,14 @@ function PMA_exportHeader() {
. '- version ' . PMA_VERSION . $crlf
. '- http://www.phpmyadmin.net' . $crlf
. '-' . $crlf
. '- ' . $GLOBALS['strHost'] . ': ' . $cfg['Server']['host'];
. '- ' . __('Host') . ': ' . $cfg['Server']['host'];
if (!empty($cfg['Server']['port'])) {
$head .= ':' . $cfg['Server']['port'];
}
$head .= $crlf
. '- ' . $GLOBALS['strGenTime'] . ': ' . PMA_localisedDate() . $crlf
. '- ' . $GLOBALS['strServerVersion'] . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . $GLOBALS['strPHPVersion'] . ': ' . phpversion() . $crlf
. '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
. '- ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
. '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
. '-->' . $crlf . $crlf;
$head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf;
@@ -252,7 +252,7 @@ function PMA_exportDBHeader($db) {
if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) {
$head = ' <!--' . $crlf
. ' - ' . $GLOBALS['strDatabase'] . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
. ' - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
. ' -->' . $crlf
. ' <database name="' . $db . '">' . $crlf;
@@ -325,7 +325,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
}
unset($i);
$buffer = ' <!-- ' . $GLOBALS['strTable'] . ' ' . $table . ' -->' . $crlf;
$buffer = ' <!-- ' . __('Table') . ' ' . $table . ' -->' . $crlf;
if (!PMA_exportOutputHandler($buffer)) {
return FALSE;
}

8
libraries/footer.inc.php
View File

@@ -31,7 +31,7 @@
* @uses $cfg['NavigationBarIconic']
* @uses $cfg['DBG']['enable']
* @uses $cfg['DBG']['profile']['enable']
* @uses $GLOBALS['strOpenNewWindow']
* @uses __('Open new phpMyAdmin window')
* @uses $cfg['MaxCharactersInDisplayedSQL']
* @uses PMA_isValid()
* @uses PMA_setHistory()
@@ -181,7 +181,7 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
<?php
echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
. ' title="' . $GLOBALS['strOpenNewWindow'] . '" target="_blank">';
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
/*
echo '<a href="index.php?target=' . basename(PMA_getenv('SCRIPT_NAME'));
$url = PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']);
@@ -192,10 +192,10 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
*/
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'window-new.png"'
. ' alt="' . $GLOBALS['strOpenNewWindow'] . '" />';
. ' alt="' . __('Open new phpMyAdmin window') . '" />';
}
if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
echo $GLOBALS['strOpenNewWindow'];
echo __('Open new phpMyAdmin window');
}
echo '</a>' . "\n";
echo '</div>' . "\n";

6
libraries/header.inc.php
View File

@@ -93,7 +93,7 @@ if (empty($GLOBALS['is_header_sent'])) {
$GLOBALS['cfg']['DefaultTabServer'],
PMA_generate_common_url(),
htmlspecialchars($server_info),
$GLOBALS['strServer'],
__('Server'),
's_host.png');
if (strlen($GLOBALS['db'])) {
@@ -103,7 +103,7 @@ if (empty($GLOBALS['is_header_sent'])) {
$GLOBALS['cfg']['DefaultTabDatabase'],
PMA_generate_common_url($GLOBALS['db']),
htmlspecialchars($GLOBALS['db']),
$GLOBALS['strDatabase'],
__('Database'),
's_db.png');
if (isset($GLOBALS['action']) && $GLOBALS['action'] == 'tbl_create.php') {
@@ -123,7 +123,7 @@ if (empty($GLOBALS['is_header_sent'])) {
$GLOBALS['cfg']['DefaultTabTable'],
PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
str_replace(' ', '&nbsp;', htmlspecialchars($GLOBALS['table'])),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? $GLOBALS['strView'] : $GLOBALS['strTable']),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
/**

118
libraries/mysql_charsets.lib.php
View File

@@ -104,7 +104,7 @@ function PMA_generateCharsetDropdownBox($type = PMA_CSDROPDOWN_COLLATION,
. ($submitOnChange ? ' onchange="this.form.submit();"' : '') . '>' . "\n";
if ($label) {
$return_str .= '<option value="">'
. ($type == PMA_CSDROPDOWN_COLLATION ? $GLOBALS['strCollation'] : $GLOBALS['strCharset'])
. ($type == PMA_CSDROPDOWN_COLLATION ? __('Collation') : __('Charset'))
. '</option>' . "\n";
}
$return_str .= '<option value=""></option>' . "\n";
@@ -199,7 +199,7 @@ function PMA_getCollationDescr($collation) {
}
if ($collation == 'binary') {
return $GLOBALS['strBinary'];
return __('Binary');
}
$parts = explode('_', $collation);
if (count($parts) == 1) {
@@ -211,101 +211,101 @@ function PMA_getCollationDescr($collation) {
$descr = '';
switch ($parts[1]) {
case 'bulgarian':
$descr = $GLOBALS['strBulgarian'];
$descr = __('Bulgarian');
break;
case 'chinese':
if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') {
$descr = $GLOBALS['strSimplifiedChinese'];
$descr = __('Simplified Chinese');
} elseif ($parts[0] == 'big5') {
$descr = $GLOBALS['strTraditionalChinese'];
$descr = __('Traditional Chinese');
}
break;
case 'ci':
$descr = $GLOBALS['strCaseInsensitive'];
$descr = __('case-insensitive');
break;
case 'cs':
$descr = $GLOBALS['strCaseSensitive'];
$descr = __('case-sensitive');
break;
case 'croatian':
$descr = $GLOBALS['strCroatian'];
$descr = __('Croatian');
break;
case 'czech':
$descr = $GLOBALS['strCzech'];
$descr = __('Czech');
break;
case 'danish':
$descr = $GLOBALS['strDanish'];
$descr = __('Danish');
break;
case 'english':
$descr = $GLOBALS['strEnglish'];
$descr = __('English');
break;
case 'esperanto':
$descr = $GLOBALS['strEsperanto'];
$descr = __('Esperanto');
break;
case 'estonian':
$descr = $GLOBALS['strEstonian'];
$descr = __('Estonian');
break;
case 'german1':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strDictionary'] . ')';
$descr = __('German') . ' (' . __('dictionary') . ')';
break;
case 'german2':
$descr = $GLOBALS['strGerman'] . ' (' . $GLOBALS['strPhoneBook'] . ')';
$descr = __('German') . ' (' . __('phone book') . ')';
break;
case 'hungarian':
$descr = $GLOBALS['strHungarian'];
$descr = __('Hungarian');
break;
case 'icelandic':
$descr = $GLOBALS['strIcelandic'];
$descr = __('Icelandic');
break;
case 'japanese':
$descr = $GLOBALS['strJapanese'];
$descr = __('Japanese');
break;
case 'latvian':
$descr = $GLOBALS['strLatvian'];
$descr = __('Latvian');
break;
case 'lithuanian':
$descr = $GLOBALS['strLithuanian'];
$descr = __('Lithuanian');
break;
case 'korean':
$descr = $GLOBALS['strKorean'];
$descr = __('Korean');
break;
case 'persian':
$descr = $GLOBALS['strPersian'];
$descr = __('Persian');
break;
case 'polish':
$descr = $GLOBALS['strPolish'];
$descr = __('Polish');
break;
case 'roman':
$descr = $GLOBALS['strWestEuropean'];
$descr = __('West European');
break;
case 'romanian':
$descr = $GLOBALS['strRomanian'];
$descr = __('Romanian');
break;
case 'slovak':
$descr = $GLOBALS['strSlovak'];
$descr = __('Slovak');
break;
case 'slovenian':
$descr = $GLOBALS['strSlovenian'];
$descr = __('Slovenian');
break;
case 'spanish':
$descr = $GLOBALS['strSpanish'];
$descr = __('Spanish');
break;
case 'spanish2':
$descr = $GLOBALS['strTraditionalSpanish'];
$descr = __('Traditional Spanish');
break;
case 'swedish':
$descr = $GLOBALS['strSwedish'];
$descr = __('Swedish');
break;
case 'thai':
$descr = $GLOBALS['strThai'];
$descr = __('Thai');
break;
case 'turkish':
$descr = $GLOBALS['strTurkish'];
$descr = __('Turkish');
break;
case 'ukrainian':
$descr = $GLOBALS['strUkrainian'];
$descr = __('Ukrainian');
break;
case 'unicode':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('Unicode') . ' (' . __('multilingual') . ')';
break;
case 'bin':
$is_bin = TRUE;
@@ -314,7 +314,7 @@ function PMA_getCollationDescr($collation) {
// Unicode charsets
case 'ucs2':
case 'utf8':
$descr = $GLOBALS['strUnicode'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('Unicode') . ' (' . __('multilingual') . ')';
break;
// West European charsets
case 'ascii':
@@ -323,93 +323,93 @@ function PMA_getCollationDescr($collation) {
case 'hp8':
case 'latin1':
case 'macroman':
$descr = $GLOBALS['strWestEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('West European') . ' (' . __('multilingual') . ')';
break;
// Central European charsets
case 'cp1250':
case 'cp852':
case 'latin2':
case 'macce':
$descr = $GLOBALS['strCentralEuropean'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('Central European') . ' (' . __('multilingual') . ')';
break;
// Russian charsets
case 'cp866':
case 'koi8r':
$descr = $GLOBALS['strRussian'];
$descr = __('Russian');
break;
// Simplified Chinese charsets
case 'gb2312':
case 'gbk':
$descr = $GLOBALS['strSimplifiedChinese'];
$descr = __('Simplified Chinese');
break;
// Japanese charsets
case 'sjis':
case 'ujis':
case 'cp932':
case 'eucjpms':
$descr = $GLOBALS['strJapanese'];
$descr = __('Japanese');
break;
// Baltic charsets
case 'cp1257':
case 'latin7':
$descr = $GLOBALS['strBaltic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('Baltic') . ' (' . __('multilingual') . ')';
break;
// Other
case 'armscii8':
case 'armscii':
$descr = $GLOBALS['strArmenian'];
$descr = __('Armenian');
break;
case 'big5':
$descr = $GLOBALS['strTraditionalChinese'];
$descr = __('Traditional Chinese');
break;
case 'cp1251':
$descr = $GLOBALS['strCyrillic'] . ' (' . $GLOBALS['strMultilingual'] . ')';
$descr = __('Cyrillic') . ' (' . __('multilingual') . ')';
break;
case 'cp1256':
$descr = $GLOBALS['strArabic'];
$descr = __('Arabic');
break;
case 'euckr':
$descr = $GLOBALS['strKorean'];
$descr = __('Korean');
break;
case 'hebrew':
$descr = $GLOBALS['strHebrew'];
$descr = __('Hebrew');
break;
case 'geostd8':
$descr = $GLOBALS['strGeorgian'];
$descr = __('Georgian');
break;
case 'greek':
$descr = $GLOBALS['strGreek'];
$descr = __('Greek');
break;
case 'keybcs2':
$descr = $GLOBALS['strCzechSlovak'];
$descr = __('Czech-Slovak');
break;
case 'koi8u':
$descr = $GLOBALS['strUkrainian'];
$descr = __('Ukrainian');
break;
case 'latin5':
$descr = $GLOBALS['strTurkish'];
$descr = __('Turkish');
break;
case 'swe7':
$descr = $GLOBALS['strSwedish'];
$descr = __('Swedish');
break;
case 'tis620':
$descr = $GLOBALS['strThai'];
$descr = __('Thai');
break;
default:
$descr = $GLOBALS['strUnknown'];
$descr = __('unknown');
break;
}
if (!empty($is_bin)) {
$descr .= ', ' . $GLOBALS['strBinary'];
$descr .= ', ' . __('Binary');
}
break;
default: $descr = $GLOBALS['strUnknown'];
default: $descr = __('unknown');
}
if (!empty($parts[2])) {
if ($parts[2] == 'ci') {
$descr .= ', ' . $GLOBALS['strCaseInsensitive'];
$descr .= ', ' . __('case-insensitive');
} elseif ($parts[2] == 'cs') {
$descr .= ', ' . $GLOBALS['strCaseSensitive'];
$descr .= ', ' . __('case-sensitive');
}
}

2
libraries/plugin_interface.lib.php
View File

@@ -309,7 +309,7 @@ function PMA_pluginGetOptions($section, &$list)
}
}
if ($count == 0) {
$ret .= $GLOBALS['strNoOptions'];
$ret .= __('This format has no options');
}
$ret .= '</fieldset>';
}

54
libraries/relation.lib.php
View File

@@ -72,18 +72,18 @@ function PMA_getRelationsParam($verbose = false)
*
* @uses $GLOBALS['server']
* @uses $GLOBALS['controllink']
* @uses $GLOBALS['strNotOK']
* @uses $GLOBALS['strDocu']
* @uses $GLOBALS['strGeneralRelationFeat']
* @uses $GLOBALS['strDisabled']
* @uses $GLOBALS['strEnabled']
* @uses $GLOBALS['strDisplayFeat']
* @uses $GLOBALS['strCreatePdfFeat']
* @uses $GLOBALS['strColComFeat']
* @uses $GLOBALS['strBookmarkQuery']
* @uses $GLOBALS['strUpdComTab']
* @uses $GLOBALS['strQuerySQLHistory']
* @uses $GLOBALS['strDesigner']
* @uses __('not OK')
* @uses __('Documentation')
* @uses __('General relation features')
* @uses __('Disabled')
* @uses __('Enabled')
* @uses __('Display Features')
* @uses __('Creation of PDFs')
* @uses __('Displaying Column Comments')
* @uses __('Bookmarked SQL query')
* @uses __('Please see the documentation on how to update your column_comments table')
* @uses __('SQL history')
* @uses __('Designer')
* @uses $cfg['Server']['pmadb']
* @uses sprintf()
* @uses PMA_printDiagMessageForFeature()
@@ -92,20 +92,20 @@ function PMA_getRelationsParam($verbose = false)
*/
function PMA_printRelationsParamDiagnostic($cfgRelation)
{
$messages['error'] = '<font color="red"><strong>' . $GLOBALS['strNotOK']
$messages['error'] = '<font color="red"><strong>' . __('not OK')
. '</strong></font> [ <a href="Documentation.html#%s" target="documentation">'
. $GLOBALS['strDocu'] . '</a> ]';
. __('Documentation') . '</a> ]';
$messages['ok'] = '<font color="green"><strong>' . $GLOBALS['strOK'] . '</strong></font>';
$messages['enabled'] = '<font color="green">' . $GLOBALS['strEnabled'] . '</font>';
$messages['disabled'] = '<font color="red">' . $GLOBALS['strDisabled'] . '</font>';
$messages['ok'] = '<font color="green"><strong>' . __('OK') . '</strong></font>';
$messages['enabled'] = '<font color="green">' . __('Enabled') . '</font>';
$messages['disabled'] = '<font color="red">' . __('Disabled') . '</font>';
if (false === $GLOBALS['cfg']['Server']['pmadb']) {
echo 'PMA Database ... '
. sprintf($messages['error'], 'pmadb')
. '<br />' . "\n"
. $GLOBALS['strGeneralRelationFeat']
. ' <font color="green">' . $GLOBALS['strDisabled']
. __('General relation features')
. ' <font color="green">' . __('Disabled')
. '</font>' . "\n";
return;
}
@@ -135,7 +135,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForFeature('strMIME_transformation', 'mimework', $messages);
if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) {
echo '<tr><td colspan=2 align="left">' . $GLOBALS['strUpdComTab'] . '</td></tr>' . "\n";
echo '<tr><td colspan=2 align="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n";
}
PMA_printDiagMessageForParameter('bookmarktable', isset($cfgRelation['bookmark']), $messages, 'bookmark');
@@ -156,12 +156,12 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
echo '</table>' . "\n";
echo '<p>' . $GLOBALS['strPmadbCreateHelp'] . '</p>';
echo '<p>' . __('Quick steps to setup advanced features:') . '</p>';
echo '<ul>';
echo '<li>' . $GLOBALS['strPmadbCreateTables'] . ' ' . PMA_showDocu('linked-tables') . '</li>';
echo '<li>' . $GLOBALS['strPmadbCreateUser'] . ' ' . PMA_showDocu('pmausr') . '</li>';
echo '<li>' . $GLOBALS['strPmadbCreateConfig'] . ' ' . PMA_showDocu('quick_install') . '</li>';
echo '<li>' . $GLOBALS['strPmadbReLoginToEnable'] . '</li>';
echo '<li>' . __('Create the needed tables with the <code>script/create_tables.sql</code>.') . ' ' . PMA_showDocu('linked-tables') . '</li>';
echo '<li>' . __('Create a pma user and give access to these tables.') . ' ' . PMA_showDocu('pmausr') . '</li>';
echo '<li>' . __('Enable advanced features in configuration file (<code>config.inc.php</code>), for example by starting from <code>config.sample.inc.php</code>.') . ' ' . PMA_showDocu('quick_install') . '</li>';
echo '<li>' . __('Re-login to phpMyAdmin to load the updated configuration file.') . '</li>';
echo '</ul>';
}
@@ -1155,7 +1155,7 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
/**
* Create a PDF page
*
* @uses $GLOBALS['strNoDescription']
* @uses __('no description')
* @uses PMA_backquote()
* @uses $GLOBALS['cfgRelation']['db']
* @uses PMA_sqlAddslashes()
@@ -1170,7 +1170,7 @@ function PMA_REL_renameField($db, $table, $field, $new_name)
*/
function PMA_REL_create_page($newpage, $cfgRelation, $db, $query_default_option) {
if (! isset($newpage) || $newpage == '') {
$newpage = $GLOBALS['strNoDescription'];
$newpage = __('no description');
}
$ins_query = 'INSERT INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
. ' (db_name, page_descr)'

78
libraries/replication_gui.lib.php
View File

@@ -30,7 +30,7 @@ function PMA_replication_db_multibox()
} // end while
$multi_values .= '</select>';
$multi_values .= '<br /><a href="#" id="db_reset_href">' . $GLOBALS['strUncheckAll'] . '</a>';
$multi_values .= '<br /><a href="#" id="db_reset_href">' . __('Uncheck All') . '</a>';
return $multi_values;
}
@@ -48,29 +48,29 @@ function PMA_replication_gui_changemaster($submitname) {
echo '<form method="post" action="server_replication.php">';
echo PMA_generate_common_hidden_inputs('', '');
echo ' <fieldset id="fieldset_add_user_login">';
echo ' <legend>' . $GLOBALS['strReplicationSlaveConfiguration'] . ' - ' . $GLOBALS['strReplicationSlaveChangeMaster'] . '</legend>';
echo $GLOBALS['strSlaveConfigure'] . '<br />';
echo ' <legend>' . __('Slave configuration') . ' - ' . __('Change or reconfigure master server') . '</legend>';
echo __('Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add the following line into [mysqld] section:') . '<br />';
echo '<pre>server-id=' . time() . '</pre>';
echo ' <div class="item">';
echo ' <label for="text_username">' . $GLOBALS['strUserName'] . ':</label>';
echo ' <input type="text" name="username" id="text_username" maxlength="'. $username_length . '" title="' . $GLOBALS['strUserName'] . '" />';
echo ' <label for="text_username">' . __('User name') . ':</label>';
echo ' <input type="text" name="username" id="text_username" maxlength="'. $username_length . '" title="' . __('User name') . '" />';
echo ' </div>';
echo ' <div class="item">';
echo ' <label for="text_pma_pw">' . $GLOBALS['strPassword'] .' :</label>';
echo ' <input type="password" id="text_pma_pw" name="pma_pw" title="' . $GLOBALS['strPassword'] . '" />';
echo ' <label for="text_pma_pw">' . __('Password') .' :</label>';
echo ' <input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" />';
echo ' </div>';
echo ' <div class="item">';
echo ' <label for="text_hostname">' . $GLOBALS['strHost'] . ' :</label>';
echo ' <label for="text_hostname">' . __('Host') . ' :</label>';
echo ' <input type="text" id="text_hostname" name="hostname" maxlength="' . $hostname_length . '" value="" />';
echo ' </div>';
echo ' <div class="item">';
echo ' <label for="text_port">' . $GLOBALS['strPort'] . ':</label>';
echo ' <label for="text_port">' . __('Port') . ':</label>';
echo ' <input type="text" id="text_port" name="port" maxlength="6" value="3306" />';
echo ' </div>';
echo ' </fieldset>';
echo ' <fieldset id="fieldset_user_privtable_footer" class="tblFooters">';
echo ' <input type="hidden" name="sr_take_action" value="true" />';
echo ' <input type="submit" name="' . $submitname . '" id="confslave_submit" value="' . $GLOBALS['strGo'] . '" />';
echo ' <input type="submit" name="' . $submitname . '" id="confslave_submit" value="' . __('Go') . '" />';
echo ' </fieldset>';
echo '</form>';
}
@@ -107,8 +107,8 @@ function PMA_replication_print_status_table($type, $hidden = false, $title = tru
echo ' <table id="server' . $type . 'replicationsummary" class="data"> ';
echo ' <thead>';
echo ' <tr>';
echo ' <th>' . $GLOBALS['strVar'] . '</th>';
echo ' <th>' . $GLOBALS['strValue'] . '</th>';
echo ' <th>' . __('Variable') . '</th>';
echo ' <th>' . __('Value') . '</th>';
echo ' </tr>';
echo ' </thead>';
echo ' <tbody>';
@@ -166,8 +166,8 @@ function PMA_replication_print_slaves_table($hidden = false) {
echo ' <table class="data">';
echo ' <thead>';
echo ' <tr>';
echo ' <th>' . $GLOBALS['strBinLogServerId'] . '</th>';
echo ' <th>' . $GLOBALS['strHost'] . '</th>';
echo ' <th>' . __('Server ID') . '</th>';
echo ' <th>' . __('Host') . '</th>';
echo ' </tr>';
echo ' </thead>';
echo ' <tbody>';
@@ -233,7 +233,7 @@ function PMA_replication_gui_master_addslaveuser() {
echo '<form autocomplete="off" method="post" action="server_privileges.php" onsubmit="return checkAddUser(this);">';
echo PMA_generate_common_hidden_inputs('', '');
echo '<fieldset id="fieldset_add_user_login">'
. '<legend>'.$GLOBALS['strReplicationAddSlaveUser'].'</legend>'
. '<legend>'.__('Add slave replication user').'</legend>'
. '<input type="hidden" name="grant_count" value="25" />'
. '<input type="hidden" name="createdb" id="createdb_0" value="0" />'
. '<input id="checkbox_Repl_slave_priv" type="hidden" title="Needed for the replication slaves." value="Y" name="Repl_slave_priv"/>'
@@ -242,17 +242,17 @@ function PMA_replication_gui_master_addslaveuser() {
. '<input type="hidden" name="sr_take_action" value="true" />'
. '<div class="item">'
. '<label for="select_pred_username">'
. ' ' . $GLOBALS['strUserName'] . ':'
. ' ' . __('User name') . ':'
. '</label>'
. '<span class="options">'
. ' <select name="pred_username" id="select_pred_username" title="' . $GLOBALS['strUserName'] . '"'
. ' <select name="pred_username" id="select_pred_username" title="' . __('User name') . '"'
. ' onchange="if (this.value == \'any\') { username.value = \'\'; } else if (this.value == \'userdefined\') { username.focus(); username.select(); }">'
. ' <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyUser'] . '</option>'
. ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseTextField'] . ':</option>'
. ' <option value="any"' . ((isset($GLOBALS['pred_username']) && $GLOBALS['pred_username'] == 'any') ? ' selected="selected"' : '') . '>' . __('Any user') . '</option>'
. ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</option>'
. ' </select>'
. '</span>'
. '<input type="text" name="username" maxlength="'
. $username_length . '" title="' . $GLOBALS['strUserName'] . '"'
. $username_length . '" title="' . __('User name') . '"'
. (empty($GLOBALS['username'])
? ''
: ' value="' . (isset($GLOBALS['new_username'])
@@ -262,10 +262,10 @@ function PMA_replication_gui_master_addslaveuser() {
. '</div>'
. '<div class="item">'
. '<label for="select_pred_hostname">'
. ' ' . $GLOBALS['strHost'] . ':'
. ' ' . __('Host') . ':'
. '</label>'
. '<span class="options">'
. ' <select name="pred_hostname" id="select_pred_hostname" title="' . $GLOBALS['strHost'] . '"';
. ' <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"';
$_current_user = PMA_DBI_fetch_value('SELECT USER();');
if (! empty($_current_user)) {
$thishost = str_replace("'", '', substr($_current_user, (strrpos($_current_user, '@') + 1)));
@@ -295,74 +295,74 @@ function PMA_replication_gui_master_addslaveuser() {
}
echo ' <option value="any"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'any')
? ' selected="selected"' : '') . '>' . $GLOBALS['strAnyHost']
? ' selected="selected"' : '') . '>' . __('Any host')
. '</option>'
. ' <option value="localhost"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'localhost')
? ' selected="selected"' : '') . '>' . $GLOBALS['strLocalhost']
? ' selected="selected"' : '') . '>' . __('Local')
. '</option>';
if (!empty($thishost)) {
echo ' <option value="thishost"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'thishost')
? ' selected="selected"' : '') . '>' . $GLOBALS['strThisHost']
? ' selected="selected"' : '') . '>' . __('This Host')
. '</option>';
}
unset($thishost);
echo ' <option value="hosttable"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'hosttable')
? ' selected="selected"' : '') . '>' . $GLOBALS['strUseHostTable']
? ' selected="selected"' : '') . '>' . __('Use Host Table')
. '</option>'
. ' <option value="userdefined"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
? ' selected="selected"' : '')
. '>' . $GLOBALS['strUseTextField'] . ':</option>'
. '>' . __('Use text field') . ':</option>'
. ' </select>'
. '</span>'
. '<input type="text" name="hostname" maxlength="'
. $hostname_length . '" value="'
. (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '')
. '" title="' . $GLOBALS['strHost']
. '" title="' . __('Host')
. '" onchange="pred_hostname.value = \'userdefined\';" />'
. PMA_showHint($GLOBALS['strHostTableExplanation'])
. PMA_showHint(__('When Host table is used, this field is ignored and values stored in Host table are used instead.'))
. '</div>'
. '<div class="item">'
. '<label for="select_pred_password">'
. ' ' . $GLOBALS['strPassword'] . ':'
. ' ' . __('Password') . ':'
. '</label>'
. '<span class="options">'
. ' <select name="pred_password" id="select_pred_password" title="'
. $GLOBALS['strPassword'] . '"'
. __('Password') . '"'
. ' onchange="if (this.value == \'none\') { pma_pw.value = \'\'; pma_pw2.value = \'\'; } else if (this.value == \'userdefined\') { pma_pw.focus(); pma_pw.select(); }">'
. ' <option value="none"';
if (isset($GLOBALS['username']) && $mode != 'change') {
echo ' selected="selected"';
}
echo '>' . $GLOBALS['strNoPassword'] . '</option>'
. ' <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . $GLOBALS['strUseTextField'] . ':</option>'
echo '>' . __('No Password') . '</option>'
. ' <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</option>'
. ' </select>'
. '</span>'
. '<input type="password" id="text_pma_pw" name="pma_pw" title="' . $GLOBALS['strPassword'] . '" onchange="pred_password.value = \'userdefined\';" />'
. '<input type="password" id="text_pma_pw" name="pma_pw" title="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />'
. '</div>'
. '<div class="item">'
. '<label for="text_pma_pw2">'
. ' ' . $GLOBALS['strReType'] . ':'
. ' ' . __('Re-type') . ':'
. '</label>'
. '<span class="options">&nbsp;</span>'
. '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . $GLOBALS['strReType'] . '" onchange="pred_password.value = \'userdefined\';" />'
. '<input type="password" name="pma_pw2" id="text_pma_pw2" title="' . __('Re-type') . '" onchange="pred_password.value = \'userdefined\';" />'
. '</div>'
. '<div class="item">'
. '<label for="button_generate_password">'
. ' ' . $GLOBALS['strGeneratePassword'] . ':'
. ' ' . __('Generate Password') . ':'
. '</label>'
. '<span class="options">'
. ' <input type="button" id="button_generate_password" value="' . $GLOBALS['strGenerate'] . '" onclick="suggestPassword(this.form)" />'
. ' <input type="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'
. '</span>'
. '<input type="text" name="generated_pw" id="generated_pw" />'
. '</div>'
. '</fieldset>';
echo '<fieldset id="fieldset_user_privtable_footer" class="tblFooters">'
. ' <input type="submit" name="adduser_submit" id="adduser_submit" value="' . $GLOBALS['strGo'] . '" />'
. ' <input type="submit" name="adduser_submit" id="adduser_submit" value="' . __('Go') . '" />'
. '</fieldset>';
echo '</form>';
echo '</div>';

12
libraries/select_server.lib.php
View File

@@ -11,9 +11,9 @@
* display server selection in list or selectbox form, or option tags only
*
* @uses $GLOBALS['cfg']['DisplayServersList']
* @uses $GLOBALS['strServer']
* @uses __('Server')
* @uses $GLOBALS['cfg']['Servers']
* @uses $GLOBALS['strGo']
* @uses __('Go')
* @uses implode()
* @uses htmlspecialchars()
* @uses PMA_generate_common_hidden_inputs()
@@ -38,13 +38,13 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
if (! $ommit_fieldset) {
echo '<fieldset>';
}
echo '<label for="select_server">' . $GLOBALS['strServer'] . ':</label> ';
echo '<label for="select_server">' . __('Server') . ':</label> ';
echo '<select name="server" id="select_server"'
. ' onchange="if (this.value != \'\') this.form.submit();">';
echo '<option value="">(' . $GLOBALS['strServers'] . ') ...</option>' . "\n";
echo '<option value="">(' . __('Servers') . ') ...</option>' . "\n";
} elseif ($list) {
echo $GLOBALS['strServer'] . ':<br />';
echo __('Server') . ':<br />';
echo '<ul id="list_server">';
}
@@ -101,7 +101,7 @@ function PMA_select_server($not_only_options, $ommit_fieldset)
echo '</select>';
// Show submit button if we have just one server (this happens with no default)
echo '<noscript>';
echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />';
echo '<input type="submit" value="' . __('Go') . '" />';
echo '</noscript>';
if (! $ommit_fieldset) {
echo '</fieldset>';

28
libraries/server_synchronize.lib.php
View File

@@ -1324,10 +1324,10 @@ function PMA_displayQuery($query) {
/**
* PMA_syncDisplayHeaderSource() shows the header for source database
* @uses $GLOBALS['strDatabase_src']
* @uses $GLOBALS['strDifference']
* @uses $GLOBALS['strCurrentServer']
* @uses $GLOBALS['strRemoteServer']
* @uses __('Source database')
* @uses __('Difference')
* @uses __('Current server')
* @uses __('Remote server')
* @uses $_SESSION['src_type']
* @uses $_SESSION['src_server']['host']
*
@@ -1338,22 +1338,22 @@ function PMA_syncDisplayHeaderSource($src_db) {
echo '<table id="serverstatusconnections" class="data" width="55%">';
echo '<tr>';
echo '<th>' . $GLOBALS['strDatabase_src'] . ': ' . $src_db . '<br />(';
echo '<th>' . __('Source database') . ': ' . $src_db . '<br />(';
if ('cur' == $_SESSION['src_type']) {
echo $GLOBALS['strCurrentServer'];
echo __('Current server');
} else {
echo $GLOBALS['strRemoteServer'] . ' ' . $_SESSION['src_server']['host'];
echo __('Remote server') . ' ' . $_SESSION['src_server']['host'];
}
echo ')</th>';
echo '<th>' . $GLOBALS['strDifference'] . '</th>';
echo '<th>' . __('Difference') . '</th>';
echo '</tr>';
}
/**
* PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables
* @uses $GLOBALS['strDatabase_trg']
* @uses $GLOBALS['strCurrentServer']
* @uses $GLOBALS['strRemoteServer']
* @uses __('Target database')
* @uses __('Current server')
* @uses __('Remote server')
* @uses $_SESSION['trg_type']
* @uses $_SESSION['trg_server']['host']
*
@@ -1364,11 +1364,11 @@ function PMA_syncDisplayHeaderSource($src_db) {
function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) {
echo '<table id="serverstatusconnections" class="data" width="43%">';
echo '<tr>';
echo '<th>' . $GLOBALS['strDatabase_trg'] . ': '. $trg_db . '<br />(';
echo '<th>' . __('Target database') . ': '. $trg_db . '<br />(';
if ('cur' == $_SESSION['trg_type']) {
echo $GLOBALS['strCurrentServer'];
echo __('Current server');
} else {
echo $GLOBALS['strRemoteServer'] . ' ' . $_SESSION['trg_server']['host'];
echo __('Remote server') . ' ' . $_SESSION['trg_server']['host'];
}
echo ')</th>';
echo '</tr>';

90
libraries/sql_query_form.lib.php
View File

@@ -44,7 +44,7 @@ require_once './libraries/bookmark.lib.php'; // used for file listing
* @uses $GLOBALS['cfg']['DefaultQueryDatabase']
* @uses $GLOBALS['cfg']['DefaultQueryTable']
* @uses $GLOBALS['cfg']['Bookmark']
* @uses $GLOBALS['strSuccess']
* @uses __('Your SQL query has been executed successfully')
* @uses PMA_generate_common_url()
* @uses PMA_backquote()
* @uses PMA_DBI_fetch_result()
@@ -137,7 +137,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
.'<input type="hidden" name="goto" value="'
.htmlspecialchars($goto) . '" />' . "\n"
.'<input type="hidden" name="zero_rows" value="'
. htmlspecialchars($GLOBALS['strSuccess']) . '" />' . "\n"
. htmlspecialchars(__('Your SQL query has been executed successfully')) . '" />' . "\n"
.'<input type="hidden" name="prev_sql_query" value="'
. htmlspecialchars($query) . '" />' . "\n";
@@ -185,8 +185,8 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
* @uses $GLOBALS['cfg']['TextareaAutoSelect']
* @uses $GLOBALS['cfg']['TextareaCols']
* @uses $GLOBALS['cfg']['TextareaRows']
* @uses $GLOBALS['strShowThisQuery']
* @uses $GLOBALS['strGo']
* @uses __(' Show this query here again ')
* @uses __('Go')
* @uses PMA_USR_OS
* @uses PMA_USR_BROWSER_AGENT
* @uses PMA_USR_BROWSER_VER
@@ -220,7 +220,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
$fields_list = array();
if (! strlen($GLOBALS['db'])) {
// prepare for server related
$legend = sprintf($GLOBALS['strRunSQLQueryOnServer'],
$legend = sprintf(__('Run SQL query/queries on server %s'),
'&quot;' . htmlspecialchars(
! empty($GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose']) ? $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['verbose'] : $GLOBALS['cfg']['Servers'][$GLOBALS['server']]['host']) . '&quot;');
} elseif (! strlen($GLOBALS['table'])) {
@@ -237,7 +237,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
. htmlspecialchars($db) . '</a>';
// else use
// $strDBLink = htmlspecialchars($db);
$legend = sprintf($GLOBALS['strRunSQLQuery'], $strDBLink);
$legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
if (empty($query)) {
$query = str_replace('%d',
PMA_backquote($db), $GLOBALS['cfg']['DefaultQueryDatabase']);
@@ -262,7 +262,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
. htmlspecialchars($db) . '</a>';
// else use
// $strDBLink = htmlspecialchars($db);
$legend = sprintf($GLOBALS['strRunSQLQuery'], $strDBLink);
$legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
if (empty($query) && count($fields_list)) {
$field_names = array();
foreach ($fields_list as $field) {
@@ -314,7 +314,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
if (count($fields_list)) {
echo '<div id="tablefieldscontainer">' . "\n"
.'<label>' . $GLOBALS['strFields'] . '</label>' . "\n"
.'<label>' . __('Fields') . '</label>' . "\n"
.'<select id="tablefields" name="dummy" '
.'size="' . ($GLOBALS['cfg']['TextareaRows'] - 2) . '" '
.'multiple="multiple" ondblclick="insertValueQuery()">' . "\n";
@@ -331,10 +331,10 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
if ($GLOBALS['cfg']['PropertiesIconic']) {
echo '<input type="button" name="insert" value="&lt;&lt;"'
.' onclick="insertValueQuery()"'
.' title="' . $GLOBALS['strInsert'] . '" />' . "\n";
.' title="' . __('Insert') . '" />' . "\n";
} else {
echo '<input type="button" name="insert"'
.' value="' . $GLOBALS['strInsert'] . '"'
.' value="' . __('Insert') . '"'
.' onclick="insertValueQuery()" />' . "\n";
}
echo '</div>' . "\n"
@@ -349,20 +349,20 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
<div id="bookmarkoptions">
<div class="formelement">
<label for="bkm_label">
<?php echo $GLOBALS['strBookmarkThis']; ?>:</label>
<?php echo __('Bookmark this SQL query'); ?>:</label>
<input type="text" name="bkm_label" id="bkm_label" value="" />
</div>
<div class="formelement">
<input type="checkbox" name="bkm_all_users" id="id_bkm_all_users"
value="true" />
<label for="id_bkm_all_users">
<?php echo $GLOBALS['strBookmarkAllUsers']; ?></label>
<?php echo __('Let every user access this bookmark'); ?></label>
</div>
<div class="formelement">
<input type="checkbox" name="bkm_replace" id="id_bkm_replace"
value="true" />
<label for="id_bkm_replace">
<?php echo $GLOBALS['strBookmarkReplace']; ?></label>
<?php echo __('Replace existing bookmark of same name'); ?></label>
</div>
</div>
<?php
@@ -378,14 +378,14 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
?>
<script type="text/javascript">
//<![CDATA[
document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo $GLOBALS['strQueryWindowLock']; ?></label> ');
document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> ');
//]]>
</script>
<?php
}
echo '</div>' . "\n";
echo '<div class="formelement">' . "\n";
echo '<label for="id_sql_delimiter">[ ' . $GLOBALS['strDelimiter']
echo '<label for="id_sql_delimiter">[ ' . __('Delimiter')
.'</label>' . "\n";
echo '<input type="text" name="sql_delimiter" size="3" '
.'value="' . $delimiter . '" '
@@ -393,11 +393,11 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
echo '<input type="checkbox" name="show_query" value="1" '
.'id="checkbox_show_query" checked="checked" />' . "\n"
.'<label for="checkbox_show_query">' . $GLOBALS['strShowThisQuery']
.'<label for="checkbox_show_query">' . __(' Show this query here again ')
.'</label>' . "\n";
echo '</div>' . "\n";
echo '<input type="submit" name="SQL" value="' . $GLOBALS['strGo'] . '" />'
echo '<input type="submit" name="SQL" value="' . __('Go') . '" />'
."\n";
echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>' . "\n";
@@ -411,13 +411,13 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
* @uses $GLOBALS['db']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['ReplaceHelpImg']
* @uses $GLOBALS['strBookmarkQuery']
* @uses $GLOBALS['strBookmarkView']
* @uses $GLOBALS['strDelete']
* @uses $GLOBALS['strDocu']
* @uses $GLOBALS['strGo']
* @uses $GLOBALS['strSubmit']
* @uses $GLOBALS['strVar']
* @uses __('Bookmarked SQL query')
* @uses __('View only')
* @uses __('Delete')
* @uses __('Documentation')
* @uses __('Go')
* @uses __('Submit')
* @uses __('Variable')
* @uses count()
* @uses htmlspecialchars()
*/
@@ -430,7 +430,7 @@ function PMA_sqlQueryFormBookmark()
echo '<fieldset id="bookmarkoptions">';
echo '<legend>';
echo $GLOBALS['strBookmarkQuery'] . '</legend>' . "\n";
echo __('Bookmarked SQL query') . '</legend>' . "\n";
echo '<div class="formelement">';
echo '<select name="id_bookmark">' . "\n";
echo '<option value="">&nbsp;</option>' . "\n";
@@ -442,16 +442,16 @@ function PMA_sqlQueryFormBookmark()
echo '</select>&nbsp;' . "\n";
echo '</div>' . "\n";
echo '<div class="formelement">' . "\n";
echo $GLOBALS['strVar'];
echo __('Variable');
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo ' <a href="./Documentation.html#faqbookmark"'
.' target="documentation">'
.'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png"'
.' border="0" width="11" height="11" align="middle"'
.' alt="' . $GLOBALS['strDocu'] . '" /></a> ';
.' alt="' . __('Documentation') . '" /></a> ';
} else {
echo ' (<a href="./Documentation.html#faqbookmark"'
.' target="documentation">' . $GLOBALS['strDocu'] . '</a>): ';
.' target="documentation">' . __('Documentation') . '</a>): ';
}
echo '<input type="text" name="bookmark_variable" class="textfield"'
.' size="10" />' . "\n";
@@ -459,22 +459,22 @@ function PMA_sqlQueryFormBookmark()
echo '<div class="formelement">' . "\n";
echo '<input type="radio" name="action_bookmark" value="0"'
.' id="radio_bookmark_exe" checked="checked" />'
.'<label for="radio_bookmark_exe">' . $GLOBALS['strSubmit']
.'<label for="radio_bookmark_exe">' . __('Submit')
.'</label>' . "\n";
echo '<input type="radio" name="action_bookmark" value="1"'
.' id="radio_bookmark_view" />'
.'<label for="radio_bookmark_view">' . $GLOBALS['strBookmarkView']
.'<label for="radio_bookmark_view">' . __('View only')
.'</label>' . "\n";
echo '<input type="radio" name="action_bookmark" value="2"'
.' id="radio_bookmark_del" />'
.'<label for="radio_bookmark_del">' . $GLOBALS['strDelete']
.'<label for="radio_bookmark_del">' . __('Delete')
.'</label>' . "\n";
echo '</div>' . "\n";
echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>' . "\n";
echo '<fieldset id="bookmarkoptionsfooter" class="tblFooters">' . "\n";
echo '<input type="submit" name="SQL" value="' . $GLOBALS['strGo'] . '" />';
echo '<input type="submit" name="SQL" value="' . __('Go') . '" />';
echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>' . "\n";
}
@@ -488,15 +488,15 @@ function PMA_sqlQueryFormBookmark()
* @uses $GLOBALS['cfg']['UploadDir']
* @uses $GLOBALS['cfg']['AvailableCharsets']
* @uses $GLOBALS['cfg']['AllowAnywhereRecoding']
* @uses $GLOBALS['strBzip']
* @uses $GLOBALS['strCharsetOfFile']
* @uses $GLOBALS['strCompression']
* @uses $GLOBALS['strError']
* @uses $GLOBALS['strGo']
* @uses $GLOBALS['strGzip']
* @uses $GLOBALS['strLocationTextfile']
* @uses $GLOBALS['strWebServerUploadDirectory']
* @uses $GLOBALS['strWebServerUploadDirectoryError']
* @uses __('bzipped')
* @uses __('Character set of the file:')
* @uses __('Compression')
* @uses __('Error')
* @uses __('Go')
* @uses __('gzipped')
* @uses __('Location of the text file')
* @uses __('web server upload directory')
* @uses __('The directory you set for upload work cannot be reached')
* @uses $GLOBALS['charset']
* @uses $GLOBALS['max_upload_size']
* @uses PMA_supportedDecompressions()
@@ -521,7 +521,7 @@ function PMA_sqlQueryFormUpload(){
// start output
echo '<fieldset id="">';
echo '<legend>';
echo $GLOBALS['strLocationTextfile'] . '</legend>';
echo __('Location of the text file') . '</legend>';
echo '<div class="formelement">';
echo '<input type="file" name="sql_file" class="textfield" /> ';
echo PMA_displayMaximumUploadSize($GLOBALS['max_upload_size']);
@@ -533,7 +533,7 @@ function PMA_sqlQueryFormUpload(){
$errors[] = PMA_Message::error('strWebServerUploadDirectoryError');
} elseif (!empty($files)) {
echo '<div class="formelement">';
echo '<strong>' . $GLOBALS['strWebServerUploadDirectory'] .':</strong>' . "\n";
echo '<strong>' . __('web server upload directory') .':</strong>' . "\n";
echo '<select size="1" name="sql_localfile">' . "\n";
echo '<option value="" selected="selected"></option>' . "\n";
echo $files;
@@ -546,10 +546,10 @@ function PMA_sqlQueryFormUpload(){
echo '<fieldset id="" class="tblFooters">';
echo $GLOBALS['strCharsetOfFile'] . "\n";
echo __('Character set of the file:') . "\n";
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET,
'charset_of_file', null, 'utf8', FALSE);
echo '<input type="submit" name="SQL" value="' . $GLOBALS['strGo']
echo '<input type="submit" name="SQL" value="' . __('Go')
.'" />' . "\n";
echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>';

22
libraries/sqlparser.lib.php
View File

@@ -134,7 +134,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
function PMA_SQP_throwError($message, $sql)
{
global $SQP_errorString;
$SQP_errorString = '<p>'.$GLOBALS['strSQLParserUserError'] . '</p>' . "\n"
$SQP_errorString = '<p>'.__('There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem') . '</p>' . "\n"
. '<pre>' . "\n"
. 'ERROR: ' . $message . "\n"
. 'SQL: ' . htmlspecialchars($sql) . "\n"
@@ -169,16 +169,18 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
$encodedstr = preg_replace("/(\015\012)|(\015)|(\012)/", '<br />' . "\n", chunk_split(base64_encode($encodedstr)));
$SQP_errorString .= $GLOBALS['strSQLParserBugMessage'] . '<br />' . "\n"
. '----' . $GLOBALS['strBeginCut'] . '----' . '<br />' . "\n"
. $encodedstr . "\n"
. '----' . $GLOBALS['strEndCut'] . '----' . '<br />' . "\n";
$SQP_errorString .= '----' . $GLOBALS['strBeginRaw'] . '----<br />' . "\n"
$SQP_errorString .= __('There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:')
. '<br />' . "\n"
. '----' . __('BEGIN CUT') . '----' . '<br />' . "\n"
. $encodedstr . "\n"
. '----' . __('END CUT') . '----' . '<br />' . "\n";
$SQP_errorString .= '----' . __('BEGIN RAW') . '----<br />' . "\n"
. '<pre>' . "\n"
. $debugstr
. '</pre>' . "\n"
. '----' . $GLOBALS['strEndRaw'] . '----<br />' . "\n";
. '----' . __('END RAW') . '----<br />' . "\n";
} // end of the "PMA_SQP_bug()" function
@@ -339,7 +341,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$pos = $GLOBALS['PMA_strpos'](' ' . $sql, $quotetype, $oldpos + 1) - 1;
// ($pos === FALSE)
if ($pos < 0) {
$debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
$debugstr = __('Unclosed quote') . ' @ ' . $startquotepos. "\n"
. 'STR: ' . htmlspecialchars($quotetype);
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;
@@ -490,7 +492,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$is_float_digit = TRUE;
continue;
} else {
$debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
$debugstr = __('Invalid Identifer') . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . htmlspecialchars(PMA_substr($sql, $count1, $count2 - $count1));
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;
@@ -607,7 +609,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*/
} elseif ($last != '~') {
$debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
$debugstr = __('Unknown Punctuation String') . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . htmlspecialchars($punct_data);
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;

2
libraries/sqlvalidator.lib.php
View File

@@ -65,7 +65,7 @@ function PMA_validateSQL($sql)
if ($cfg['SQLValidator']['use']) {
if (isset($GLOBALS['sqlvalidator_error'])
&& $GLOBALS['sqlvalidator_error']) {
$str = sprintf($GLOBALS['strValidatorError'], '<a href="./Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
$str = sprintf(__('The SQL validator could not be initialized. Please check if you have installed the necessary PHP extensions as described in the %sdocumentation%s.'), '<a href="./Documentation.html#faqsqlvalidator" target="documentation">', '</a>');
} else {
// create new class instance
$srv = new PMA_SQLValidator();

2
libraries/tbl_info.inc.php
View File

@@ -63,7 +63,7 @@ $GLOBALS['showtable'] = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['tabl
if ($showtable) {
if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) {
$tbl_is_view = true;
$tbl_type = $GLOBALS['strView'];
$tbl_type = __('View');
$show_comment = null;
} else {
$tbl_is_view = false;

6
libraries/tbl_properties.inc.php
View File

@@ -776,12 +776,12 @@ if ($action == 'tbl_create.php') {
<input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>"
onclick="return checkTableEditForm(this.form, <?php echo $num_fields; ?>)" />
<?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?>
<?php echo $GLOBALS['strOr']; ?>
<?php echo __('Or'); ?>
<?php echo sprintf(__('Add %s field(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?>
<input type="submit" name="submit_num_fields"
value="<?php echo $GLOBALS['strGo']; ?>"
value="<?php echo __('Go'); ?>"
<?php /* onclick="if (addField()) return false;" */ ?>
onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidFieldAddCount']); ?>', 1)"
onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one field.')); ?>', 1)"
/>
<?php } ?>
</fieldset>

8
libraries/zip_extension.lib.php
View File

@@ -23,7 +23,7 @@ function PMA_getZipContents($file)
if (is_resource($zip_handle)) {
$first_zip_entry = zip_read($zip_handle);
if (false === $first_zip_entry) {
$error_message = $GLOBALS['strNoFilesFoundInZip'];
$error_message = __('No files found inside ZIP archive!');
} else {
/* Is the the zip really an ODS file? */
$read = zip_entry_read($first_zip_entry);
@@ -46,9 +46,9 @@ function PMA_getZipContents($file)
* error that we must display
*/
if ($entry === FALSE) {
$error_message = $GLOBALS['strErrorInZipFile'] . ' Could not find "content.xml"';
$error_message = __('Error in ZIP archive:') . ' Could not find "content.xml"';
} else {
$error_message = $GLOBALS['strErrorInZipFile'] . ' ' . PMA_getZipError($zip_handle);
$error_message = __('Error in ZIP archive:') . ' ' . PMA_getZipError($zip_handle);
}
break;
@@ -63,7 +63,7 @@ function PMA_getZipContents($file)
}
}
} else {
$error_message = $GLOBALS['strErrorInZipFile'] . ' ' . PMA_getZipError($zip_handle);
$error_message = __('Error in ZIP archive:') . ' ' . PMA_getZipError($zip_handle);
}
zip_close($zip_handle);
return (array('error' => $error_message, 'data' => $file_data));

38
navigation.php
View File

@@ -14,11 +14,11 @@
* @uses $GLOBALS['text_dir']
* @uses $GLOBALS['charset']
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['strNoDatabases']
* @uses $GLOBALS['strDatabase']
* @uses $GLOBALS['strGo']
* @uses $GLOBALS['strSelectADb']
* @uses $GLOBALS['strNoTablesFound']
* @uses __('No databases')
* @uses __('Database')
* @uses __('Go')
* @uses __('Please select a database')
* @uses __('No tables found in database.')
* @uses $GLOBALS['cfg']['LeftFrameLight']
* @uses $GLOBALS['cfg']['ShowTooltip']
* @uses $GLOBALS['cfg']['ShowTooltipAliasDB']
@@ -63,11 +63,11 @@ function PMA_exitNavigationFrame()
echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">';
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
. ' title="' . $GLOBALS['strReloadNavi'] . '"'
. ' alt="' . $GLOBALS['strReloadNavi'] . '" />';
. ' title="' . __('Reload navigation frame') . '"'
. ' alt="' . __('Reload navigation frame') . '" />';
}
if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
echo $GLOBALS['strReloadNavi'];
echo __('Reload navigation frame');
}
echo '</a>';
echo '</div>' . "\n";
@@ -207,7 +207,7 @@ if (! $GLOBALS['server']) {
PMA_exitNavigationFrame();
} elseif (! count($GLOBALS['pma']->databases)) {
// no database available, so we break here
echo '<p>' . $GLOBALS['strNoDatabases'] . '</p>';
echo '<p>' . __('No databases') . '</p>';
PMA_exitNavigationFrame();
} elseif ($GLOBALS['cfg']['LeftFrameLight'] && count($GLOBALS['pma']->databases) > 1) {
$list = $cfg['DisplayDatabasesList'];
@@ -230,12 +230,12 @@ if (! $GLOBALS['server']) {
<div id="databaseList">
<form method="post" action="index.php" target="_parent" id="left">
<label for="lightm_db"><?php echo $GLOBALS['strDatabase']; ?></label>
<label for="lightm_db"><?php echo __('Database'); ?></label>
<?php
echo PMA_generate_common_hidden_inputs() . "\n";
echo $GLOBALS['pma']->databases->getHtmlSelectGrouped(true, $_SESSION['tmp_user_values']['navi_limit_offset'], $GLOBALS['cfg']['MaxDbList']) . "\n";
echo '<noscript>' . "\n"
.'<input type="submit" name="Go" value="' . $GLOBALS['strGo'] . '" />' . "\n"
.'<input type="submit" name="Go" value="' . __('Go') . '" />' . "\n"
.'</noscript>' . "\n"
.'</form>' . "\n";
} else {
@@ -343,14 +343,14 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
PMA_listNavigator($table_count, $tpos, $_url_params, 'navigation.php', 'frame_navigation', $GLOBALS['cfg']['MaxTableList']);
}
} else {
echo $GLOBALS['strNoTablesFound'];
echo __('No tables found in database.');
}
unset($table_list);
echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '">'
.'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" width="10" height="10" alt="' . _pgettext('short form', 'Create table') . '" />'
. _pgettext('short form', 'Create table') . '</a></li></ul>';
} elseif ($GLOBALS['cfg']['LeftFrameLight']) {
echo '<p>' . $GLOBALS['strSelectADb'] . '</p>';
echo '<p>' . __('Please select a database') . '</p>';
} else {
echo '<div id="databaseList">' . "\n";
$_url_params = array('pos' => $pos);
@@ -366,7 +366,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
*
* @uses $_REQUEST['dbgroup']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['strSelectADb']
* @uses __('Please select a database')
* @uses strpos()
* @uses urlencode()
* @uses printf()
@@ -513,7 +513,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
} elseif ($GLOBALS['cfg']['LeftFrameLight']) {
// no tables and LeftFrameLight:
// display message no tables in selected db
echo '<p>' . $GLOBALS['strSelectADb'] . '</p>' . "\n";
echo '<p>' . __('Please select a database') . '</p>' . "\n";
}
echo '</li>' . "\n";
} // end foreach db
@@ -550,8 +550,8 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
* @uses $GLOBALS['cfg']['LeftFrameTableSeparator']
* @uses $GLOBALS['cfg']['DefaultTabDatabase']
* @uses $GLOBALS['cfg']['DefaultTabTable']
* @uses $GLOBALS['strRows']
* @uses $GLOBALS['strBrowse']
* @uses __('Rows')
* @uses __('Browse')
* @global integer the element counter
* @global string html code for '-' image
* @global string html code for '+' image
@@ -649,7 +649,7 @@ function PMA_displayTableList($tables, $visible = false,
echo '<a class="tableicon" title="'
. htmlspecialchars($link_title)
. ': ' . htmlspecialchars($table['Comment'])
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . $GLOBALS['strRows'] . ')"'
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . __('Rows') . ')"'
.' id="quick_' . htmlspecialchars($table_db . '.' . $table['Name']) . '"'
.' href="' . $GLOBALS['cfg']['LeftDefaultTabTable'] . '?'
. $GLOBALS['common_url_query']
@@ -671,7 +671,7 @@ function PMA_displayTableList($tables, $visible = false,
.urlencode($table['Name']) . '&amp;pos=0';
echo '<a href="' . $href
. '" title="' . htmlspecialchars(PMA_getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']) . ': ' . $table['Comment']
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . $GLOBALS['strRows']) . ')"'
.' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . __('Rows')) . ')"'
.' id="' . htmlspecialchars($table_db . '.' . $table['Name']) . '">'
// preserve spaces in table name
. str_replace(' ', '&nbsp;', htmlspecialchars($table['disp_name'])) . '</a>';

68
pdf_schema.php
View File

@@ -229,7 +229,7 @@ class PMA_PDF extends TCPDF {
require_once './libraries/header.inc.php';
echo '<p><strong>PDF - ' . $GLOBALS['strError'] . '</strong></p>' . "\n";
echo '<p><strong>PDF - ' . __('Error') . '</strong></p>' . "\n";
if (!empty($error_message)) {
$error_message = htmlspecialchars($error_message);
}
@@ -238,7 +238,7 @@ class PMA_PDF extends TCPDF {
echo '</p>' . "\n";
echo '<a href="db_structure.php?' . PMA_generate_common_url($db)
. '">' . $GLOBALS['strBack'] . '</a>';
. '">' . __('Back') . '</a>';
echo "\n";
require_once './libraries/footer.inc.php';
@@ -281,7 +281,7 @@ class PMA_PDF extends TCPDF {
if ($with_doc) {
$this->SetY(-15);
$this->SetFont('', '', 14);
$this->Cell(0, 6, $GLOBALS['strPageNumber'] . ' ' . $this->PageNo() . '/{nb}', 'T', 0, 'C');
$this->Cell(0, 6, __('Page number:') . ' ' . $this->PageNo() . '/{nb}', 'T', 0, 'C');
$this->Cell(0, 6, PMA_localisedDate(), 0, 1, 'R');
$this->SetY(20);
}
@@ -606,7 +606,7 @@ class PMA_RT_Table {
$pdf->SetFillColor(255);
} // end while
/*if ($pdf->PageNo() > 1) {
$pdf->PMA_PDF_die($GLOBALS['strScaleFactorSmall']);
$pdf->PMA_PDF_die(__('The scale factor is too small to fit the schema on one page'));
} */
} // end of the "PMA_RT_Table_draw()" method
/**
@@ -634,7 +634,7 @@ class PMA_RT_Table {
$sql = 'DESCRIBE ' . PMA_backquote($table_name);
$result = PMA_DBI_try_query($sql, null, PMA_DBI_QUERY_STORE);
if (!$result || !PMA_DBI_num_rows($result)) {
$pdf->PMA_PDF_die(sprintf($GLOBALS['strPdfInvalidTblName'], $table_name));
$pdf->PMA_PDF_die(sprintf(__('The %s table doesn't exist!'), $table_name));
}
// load fields
//check to see if it will load all fields or only the foreign keys
@@ -670,7 +670,7 @@ class PMA_RT_Table {
$result = PMA_query_as_controluser($sql, false, PMA_DBI_QUERY_STORE);
if (!$result || !PMA_DBI_num_rows($result)) {
$pdf->PMA_PDF_die(sprintf($GLOBALS['strConfigureTableCoord'], $table_name));
$pdf->PMA_PDF_die(sprintf(__('Please configure the coordinates for table %s'), $table_name));
}
list($this->x, $this->y) = PMA_DBI_fetch_row($result);
$this->x = (double) $this->x;
@@ -993,7 +993,7 @@ class PMA_RT {
$this->same_wide = $all_tab_same_wide;
// Initializes a new document
$pdf = new PMA_PDF('L', 'mm', $paper);
$pdf->SetTitle(sprintf($GLOBALS['strPdfDbSchema'], $GLOBALS['db'], $which_rel));
$pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $which_rel));
$pdf->setCMargin(0);
$pdf->Open();
$pdf->SetAuthor('phpMyAdmin ' . PMA_VERSION);
@@ -1011,7 +1011,7 @@ class PMA_RT {
. ' AND pdf_page_number = ' . $which_rel;
$tab_rs = PMA_query_as_controluser($tab_sql, null, PMA_DBI_QUERY_STORE);
if (!$tab_rs || !PMA_DBI_num_rows($tab_rs) > 0) {
$pdf->PMA_PDF_die($GLOBALS['strPdfNoTables']);
$pdf->PMA_PDF_die(__('No tables'));
// die('No tables');
} while ($curr_table = @PMA_DBI_fetch_assoc($tab_rs)) {
$alltables[] = PMA_sqlAddslashes($curr_table['table_name']);
@@ -1030,7 +1030,7 @@ class PMA_RT {
if ($with_doc) {
$pdf->SetLink($pdf->PMA_links['RT']['-'], -1);
$pdf->Bookmark($GLOBALS['strRelationalSchema']);
$pdf->Bookmark(__('Relational schema'));
$pdf->SetAlias('{00}', $pdf->PageNo()) ;
$this->t_marg = 18;
$this->b_marg = 18;
@@ -1114,14 +1114,14 @@ function PMA_RT_DOC($alltables)
global $db, $pdf, $orientation, $paper;
// TOC
$pdf->addpage($GLOBALS['orientation']);
$pdf->Cell(0, 9, $GLOBALS['strTableOfContents'], 1, 0, 'C');
$pdf->Cell(0, 9, __('Table of contents'), 1, 0, 'C');
$pdf->Ln(15);
$i = 1;
foreach ($alltables AS $table) {
$pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink();
$pdf->SetX(10);
// $pdf->Ln(1);
$pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']);
$pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']);
$pdf->SetX(10);
$pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']);
// $pdf->Ln(1);
@@ -1137,9 +1137,9 @@ function PMA_RT_DOC($alltables)
}
$pdf->PMA_links['RT']['-'] = $pdf->AddLink();
$pdf->SetX(10);
$pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']);
$pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']);
$pdf->SetX(10);
$pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']);
$pdf->Cell(0, 6, $i + 1 . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']);
$z = 0;
foreach ($alltables AS $table) {
$z++;
@@ -1234,22 +1234,22 @@ function PMA_RT_DOC($alltables)
$break = false;
if (!empty($show_comment)) {
$pdf->Cell(0, 3, $GLOBALS['strTableComments'] . ' : ' . $show_comment, 0, 1);
$pdf->Cell(0, 3, __('Table comments') . ' : ' . $show_comment, 0, 1);
$break = true;
}
if (!empty($create_time)) {
$pdf->Cell(0, 3, $GLOBALS['strStatCreateTime'] . ': ' . $create_time, 0, 1);
$pdf->Cell(0, 3, __('Creation') . ': ' . $create_time, 0, 1);
$break = true;
}
if (!empty($update_time)) {
$pdf->Cell(0, 3, $GLOBALS['strStatUpdateTime'] . ': ' . $update_time, 0, 1);
$pdf->Cell(0, 3, __('Last update') . ': ' . $update_time, 0, 1);
$break = true;
}
if (!empty($check_time)) {
$pdf->Cell(0, 3, $GLOBALS['strStatCheckTime'] . ': ' . $check_time, 0, 1);
$pdf->Cell(0, 3, __('Last check') . ': ' . $check_time, 0, 1);
$break = true;
}
@@ -1260,13 +1260,13 @@ function PMA_RT_DOC($alltables)
$pdf->SetFont('', 'B');
if (isset($orientation) && $orientation == 'L') {
$pdf->Cell(25, 8, ucfirst($GLOBALS['strField']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst($GLOBALS['strType']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst($GLOBALS['strAttr']), 1, 0, 'C');
$pdf->Cell(10, 8, ucfirst($GLOBALS['strNull']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst($GLOBALS['strDefault']), 1, 0, 'C');
$pdf->Cell(25, 8, ucfirst($GLOBALS['strExtra']), 1, 0, 'C');
$pdf->Cell(45, 8, ucfirst($GLOBALS['strLinksTo']), 1, 0, 'C');
$pdf->Cell(25, 8, ucfirst(__('Field')), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C');
$pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Default')), 1, 0, 'C');
$pdf->Cell(25, 8, ucfirst(__('Extra')), 1, 0, 'C');
$pdf->Cell(45, 8, ucfirst(__('Links to')), 1, 0, 'C');
if ($paper == 'A4') {
$comments_width = 67;
@@ -1277,18 +1277,18 @@ function PMA_RT_DOC($alltables)
*/
$comments_width = 50;
}
$pdf->Cell($comments_width, 8, ucfirst($GLOBALS['strComments']), 1, 0, 'C');
$pdf->Cell($comments_width, 8, ucfirst(__('Comments')), 1, 0, 'C');
$pdf->Cell(45, 8, 'MIME', 1, 1, 'C');
$pdf->SetWidths(array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45));
} else {
$pdf->Cell(20, 8, ucfirst($GLOBALS['strField']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst($GLOBALS['strType']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst($GLOBALS['strAttr']), 1, 0, 'C');
$pdf->Cell(10, 8, ucfirst($GLOBALS['strNull']), 1, 0, 'C');
$pdf->Cell(15, 8, ucfirst($GLOBALS['strDefault']), 1, 0, 'C');
$pdf->Cell(15, 8, ucfirst($GLOBALS['strExtra']), 1, 0, 'C');
$pdf->Cell(30, 8, ucfirst($GLOBALS['strLinksTo']), 1, 0, 'C');
$pdf->Cell(30, 8, ucfirst($GLOBALS['strComments']), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Field')), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C');
$pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C');
$pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C');
$pdf->Cell(15, 8, ucfirst(__('Default')), 1, 0, 'C');
$pdf->Cell(15, 8, ucfirst(__('Extra')), 1, 0, 'C');
$pdf->Cell(30, 8, ucfirst(__('Links to')), 1, 0, 'C');
$pdf->Cell(30, 8, ucfirst(__('Comments')), 1, 0, 'C');
$pdf->Cell(30, 8, 'MIME', 1, 1, 'C');
$pdf->SetWidths(array(20, 20, 20, 10, 15, 15, 30, 30, 30));
}
@@ -1342,7 +1342,7 @@ function PMA_RT_DOC($alltables)
$pdf_row = array($field_name,
$type,
$attribute,
($row['Null'] == '' || $row['Null'] == 'NO') ? $GLOBALS['strNo'] : $GLOBALS['strYes'],
($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'),
((isset($row['Default'])) ? $row['Default'] : ''),
$row['Extra'],
((isset($res_rel[$field_name])) ? $res_rel[$field_name]['foreign_table'] . ' -> ' . $res_rel[$field_name]['foreign_field'] : ''),

4
pmd_pdf.php
View File

@@ -81,7 +81,7 @@ require_once './libraries/header_meta_style.inc.php';
<form name="form1" method="post" action="pmd_pdf.php">
<?php echo PMA_generate_common_hidden_inputs($db); ?>
<div>
<fieldset><legend><?php echo $GLOBALS['strExport'] . '/' . $GLOBALS['strImport']; ?></legend>
<fieldset><legend><?php echo __('Export') . '/' . __('Import'); ?></legend>
<p><?php echo __('Export/Import to scale'); ?>:
<select name="scale">
<option value="1">1:1</option>
@@ -111,7 +111,7 @@ require_once './libraries/header_meta_style.inc.php';
</fieldset>
</div>
<div>
<fieldset><legend><?php echo $GLOBALS['strCreatePage']; ?></legend>
<fieldset><legend><?php echo __('Create a page'); ?></legend>
<input type="text" name="newpage" />
<input type="submit" name="createpage" value="<?php echo __('Go'); ?>">
</fieldset>

2959
po/af.po
View File

File diff suppressed because it is too large Load Diff

2936
po/ar.po
View File

File diff suppressed because it is too large Load Diff

2970
po/az.po
View File

File diff suppressed because it is too large Load Diff

3073
po/be.po
View File

File diff suppressed because it is too large Load Diff

3086
po/be@latin.po
View File

File diff suppressed because it is too large Load Diff

2972
po/bg.po
View File

File diff suppressed because it is too large Load Diff

3003
po/bn.po
View File

File diff suppressed because it is too large Load Diff

2963
po/bs.po
View File

File diff suppressed because it is too large Load Diff

3080
po/ca.po
View File

File diff suppressed because it is too large Load Diff

3062
po/cs.po
View File

File diff suppressed because it is too large Load Diff

3000
po/da.po
View File

File diff suppressed because it is too large Load Diff

3096
po/de.po
View File

File diff suppressed because it is too large Load Diff

3095
po/el.po
View File

File diff suppressed because it is too large Load Diff

3064
po/en_GB.po
View File

File diff suppressed because it is too large Load Diff

3097
po/es.po
View File

File diff suppressed because it is too large Load Diff

2999
po/et.po
View File

File diff suppressed because it is too large Load Diff

2967
po/eu.po
View File

File diff suppressed because it is too large Load Diff

2922
po/fa.po
View File

File diff suppressed because it is too large Load Diff

3076
po/fi.po
View File

File diff suppressed because it is too large Load Diff

3169
po/fr.po
View File

File diff suppressed because it is too large Load Diff

3088
po/gl.po
View File

File diff suppressed because it is too large Load Diff

2932
po/he.po
View File

File diff suppressed because it is too large Load Diff

2901
po/hi.po
View File

File diff suppressed because it is too large Load Diff

3071
po/hr.po
View File

File diff suppressed because it is too large Load Diff

3077
po/hu.po
View File

File diff suppressed because it is too large Load Diff

3022
po/id.po
View File

File diff suppressed because it is too large Load Diff

3068
po/it.po
View File

File diff suppressed because it is too large Load Diff

3049
po/ja.po
View File

File diff suppressed because it is too large Load Diff

3058
po/ka.po
View File

File diff suppressed because it is too large Load Diff

2919
po/ko.po
View File

File diff suppressed because it is too large Load Diff

2987
po/lt.po
View File

File diff suppressed because it is too large Load Diff

2974
po/lv.po
View File

File diff suppressed because it is too large Load Diff

3018
po/mk.po
View File

File diff suppressed because it is too large Load Diff

2978
po/mn.po
View File

File diff suppressed because it is too large Load Diff

2965
po/ms.po
View File

File diff suppressed because it is too large Load Diff

3062
po/nb.po
View File

File diff suppressed because it is too large Load Diff

3100
po/nl.po
View File

File diff suppressed because it is too large Load Diff

2887
po/phpmyadmin.pot
View File

File diff suppressed because it is too large Load Diff

3054
po/pl.po
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More