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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-04-25 14:22:55 +02:00
commit f67afeb125
40 changed files with 168 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browse_foreigners.php
View File

@ -163,7 +163,7 @@ if (isset($rownumber)) {
. htmlspecialchars($rownumber) . '" />';
}
$output .= '<span class="formelement">'
. '<label for="input_foreign_filter">' . __('Search') . ':' . '</label>'
. '<label for="input_foreign_filter">' . __('Search:') . '</label>'
. '<input type="text" name="foreign_filter" id="input_foreign_filter" value="'
. (isset($foreign_filter) ? htmlspecialchars($foreign_filter) : '') . '" />'
. '<input type="submit" name="submit_foreign_filter" value="'

2
db_datadict.php
View File

@ -154,7 +154,7 @@ foreach ($tables as $table) {
* Displays the comments of the table if MySQL >= 3.23
*/
if (!empty($show_comment)) {
echo __('Table comments') . ': ' . htmlspecialchars($show_comment) . '<br /><br />';
echo __('Table comments:') . ' ' . htmlspecialchars($show_comment) . '<br /><br />';
}
/**

6
db_printview.php
View File

@ -182,7 +182,7 @@ if ($num_tables == 0) {
if (! empty($sts_data['Create_time'])) {
?>
<tr>
<td class="right"><?php echo __('Creation') . ': '; ?></td>
<td class="right"><?php echo __('Creation:'); ?></td>
<td class="right"><?php echo PMA_Util::localisedDate(strtotime($sts_data['Create_time'])); ?></td>
</tr>
<?php
@ -191,7 +191,7 @@ if ($num_tables == 0) {
if (! empty($sts_data['Update_time'])) {
?>
<tr>
<td class="right"><?php echo __('Last update') . ': '; ?></td>
<td class="right"><?php echo __('Last update:'); ?></td>
<td class="right"><?php echo PMA_Util::localisedDate(strtotime($sts_data['Update_time'])); ?></td>
</tr>
<?php
@ -200,7 +200,7 @@ if ($num_tables == 0) {
if (! empty($sts_data['Check_time'])) {
?>
<tr>
<td class="right"><?php echo __('Last check') . ': '; ?></td>
<td class="right"><?php echo __('Last check:'); ?></td>
<td class="right"><?php echo PMA_Util::localisedDate(strtotime($sts_data['Check_time'])); ?></td>
</tr>
<?php

18
gis_data_editor.php
View File

@ -158,7 +158,7 @@ foreach ($gis_types as $gis_type) {
}
echo '</select>';
echo '&nbsp;&nbsp;&nbsp;&nbsp;';
echo '<label for="srid">' . __("SRID") . ':</label>';
echo '<label for="srid">' . __('SRID:') . '</label>';
echo '<input name="gis_data[srid]" type="text" value="' . $srid . '" />';
echo '</div>';
echo '<!-- End of header section -->';
@ -181,7 +181,7 @@ for ($a = 0; $a < $geom_count; $a++) {
if ($geom_type == 'GEOMETRYCOLLECTION') {
echo '<br/><br/>';
echo __("Geometry") . ' ' . ($a + 1) . ': ';
printf(__('Geometry %d:'), $a + 1);
echo '<br/>';
if (isset($gis_data[$a]['gis_type'])) {
$type = $gis_data[$a]['gis_type'];
@ -203,7 +203,7 @@ for ($a = 0; $a < $geom_count; $a++) {
if ($type == 'POINT') {
echo '<br/>';
echo __("Point") . ': ';
echo __('Point:');
echo '<label for="x">' . __("X") . '</label>';
echo '<input name="gis_data[' . $a . '][POINT][x]" type="text"'
. ' value="' . escape($gis_data[$a]['POINT']['x']) . '" />';
@ -259,12 +259,12 @@ for ($a = 0; $a < $geom_count; $a++) {
for ($i = 0; $i < $no_of_lines; $i++) {
echo '<br/>';
if ($type == 'MULTILINESTRING') {
echo __("Linestring") . ' ' . ($i + 1) . ':';
printf(__('Linestring %d:'), $i + 1);
} else {
if ($i == 0) {
echo __("Outer Ring") . ':';
echo __('Outer ring:');
} else {
echo __("Inner Ring") . ' ' . $i . ':';
printf(__('Inner ring %d:'), $i);
}
}
@ -322,7 +322,7 @@ for ($a = 0; $a < $geom_count; $a++) {
for ($k = 0; $k < $no_of_polygons; $k++) {
echo '<br/>';
echo __("Polygon") . ' ' . ($k + 1) . ':';
printf(__('Polygon %d:'), $k + 1);
$no_of_lines = isset($gis_data[$a][$type][$k]['no_of_lines'])
? $gis_data[$a][$type][$k]['no_of_lines'] : 1;
if ($no_of_lines < 1) {
@ -338,9 +338,9 @@ for ($a = 0; $a < $geom_count; $a++) {
for ($i = 0; $i < $no_of_lines; $i++) {
echo '<br/><br/>';
if ($i == 0) {
echo __("Outer Ring") . ':';
echo __('Outer ring:');
} else {
echo __("Inner Ring") . ' ' . $i . ':';
printf(__('Inner ring %d:'), $i);
}
$no_of_points = isset($gis_data[$a][$type][$k][$i]['no_of_points'])

20
index.php
View File

@ -152,7 +152,7 @@ if ($server > 0
echo ' <form method="post" action="index.php">' . "\n"
. PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection')
. ' <label for="select_collation_connection">' . "\n"
. ' '. PMA_Util::getImage('s_asci.png') . " "
. ' '. PMA_Util::getImage('s_asci.png') . " "
. __('Server connection collation') . "\n"
// put the doc link in the form so that it appears on the same line
. PMA_Util::showMySQLDocu(
@ -233,28 +233,28 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) {
echo '<h2>' . __('Database server') . '</h2>';
echo '<ul>' . "\n";
PMA_printListItem(
__('Server') . ': ' . $server_info,
__('Server:') . ' ' . $server_info,
'li_server_info'
);
PMA_printListItem(
__('Server type') . ': ' . PMA_Util::getServerType(),
__('Server type:') . ' ' . PMA_Util::getServerType(),
'li_server_type'
);
PMA_printListItem(
__('Server version') . ': ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT,
__('Server version:') . ' ' . PMA_MYSQL_STR_VERSION . ' - ' . PMA_MYSQL_VERSION_COMMENT,
'li_server_version'
);
PMA_printListItem(
__('Protocol version') . ': ' . PMA_DBI_get_proto_info(),
__('Protocol version:') . ' ' . PMA_DBI_get_proto_info(),
'li_mysql_proto'
);
PMA_printListItem(
__('User') . ': ' . htmlspecialchars($mysql_cur_user_and_host),
__('User:') . ' ' . htmlspecialchars($mysql_cur_user_and_host),
'li_user_info'
);
echo ' <li id="li_select_mysql_charset">';
echo ' ' . __('Server charset') . ': '
echo ' ' . __('Server charset:') . ' '
. ' <span lang="en" dir="ltr">'
. ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n"
. ' (' . $mysql_charset_map['utf-8'] . ')' . "\n"
@ -279,11 +279,11 @@ if ($GLOBALS['cfg']['ShowServerInfo'] || $GLOBALS['cfg']['ShowPhpInfo']) {
$client_version_str = 'libmysql - ' . $client_version_str;
}
PMA_printListItem(
__('Database client version') . ': ' . $client_version_str,
__('Database client version:') . ' ' . $client_version_str,
'li_mysql_client_version'
);
$php_ext_string = __('PHP extension') . ': '
$php_ext_string = __('PHP extension:') . ' '
. $GLOBALS['cfg']['Server']['extension'] . ' '
. PMA_Util::showPHPDocu(
'book.' . $GLOBALS['cfg']['Server']['extension'] . '.php'
@ -320,7 +320,7 @@ if ($GLOBALS['cfg']['VersionCheck']
$class = 'jsversioncheck';
}
PMA_printListItem(
__('Version information') . ': ' . PMA_VERSION,
__('Version information:') . ' ' . PMA_VERSION,
'li_pma_version',
null,
null,

22
libraries/DBQbe.class.php
View File

@ -361,7 +361,7 @@ class PMA_DbQbe
private function _getColumnNamesRow()
{
$html_output = '<tr class="odd noclick">';
$html_output .= '<th>' . __('Column') . ':</th>';
$html_output .= '<th>' . __('Column:') . '</th>';
$new_column_count = 0;
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
if (isset($this->_criteriaColumnInsert[$column_index])
@ -403,7 +403,7 @@ class PMA_DbQbe
private function _getSortRow()
{
$html_output = '<tr class="even noclick">';
$html_output .= '<th>' . __('Sort') . ':</th>';
$html_output .= '<th>' . __('Sort:') . '</th>';
$new_column_count = 0;
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
if (! empty($this->_criteriaColumnInsert)
@ -465,7 +465,7 @@ class PMA_DbQbe
private function _getShowRow()
{
$html_output = '<tr class="odd noclick">';
$html_output .= '<th>' . __('Show') . ':</th>';
$html_output .= '<th>' . __('Show:') . '</th>';
$new_column_count = 0;
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
if (! empty($this->_criteriaColumnInsert)
@ -510,7 +510,7 @@ class PMA_DbQbe
private function _getCriteriaInputboxRow()
{
$html_output = '<tr class="even noclick">';
$html_output .= '<th>' . __('Criteria') . ':</th>';
$html_output .= '<th>' . __('Criteria:') . '</th>';
$new_column_count = 0;
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
if (! empty($this->_criteriaColumnInsert)
@ -650,11 +650,11 @@ class PMA_DbQbe
private function _getAndOrColCell($column_number, $selected = null)
{
$html_output = '<td class="center">';
$html_output .= '<strong>' . __('Or') . ':</strong>';
$html_output .= '<strong>' . __('Or:') . '</strong>';
$html_output .= '<input type="radio"'
. ' name="criteriaAndOrColumn[' . $column_number . ']"'
. ' value="or"' . $selected['or'] . ' />';
$html_output .= '&nbsp;&nbsp;<strong>' . __('And') . ':</strong>';
$html_output .= '&nbsp;&nbsp;<strong>' . __('And:') . '</strong>';
$html_output .= '<input type="radio"'
. ' name="criteriaAndOrColumn[' . $column_number . ']"'
. ' value="and"' . $selected['and'] . ' />';
@ -677,7 +677,7 @@ class PMA_DbQbe
private function _getModifyColumnsRow()
{
$html_output = '<tr class="even noclick">';
$html_output .= '<th>' . __('Modify') . ':</th>';
$html_output .= '<th>' . __('Modify:') . '</th>';
$new_column_count = 0;
for ($column_index = 0; $column_index < $this->_criteria_column_count; $column_index++) {
if (! empty($this->_criteriaColumnInsert)
@ -734,12 +734,12 @@ class PMA_DbQbe
$html_output .= '<table class="nospacing nopadding">';
$html_output .= '<tr>';
$html_output .= '<td class="' . $GLOBALS['cell_align_right'] . ' nowrap">';
$html_output .= '<small>' . __('Ins') . ':</small>';
$html_output .= '<small>' . __('Ins:') . '</small>';
$html_output .= '<input type="checkbox"'
. ' name="criteriaRowInsert[' . $row_index . ']" />';
$html_output .= '</td>';
$html_output .= '<td class="' . $GLOBALS['cell_align_right'] . '">';
$html_output .= '<strong>' . __('And') . ':</strong>';
$html_output .= '<strong>' . __('And:') . '</strong>';
$html_output .= '</td>';
$html_output .= '<td>';
$html_output .= '<input type="radio"'
@ -749,12 +749,12 @@ class PMA_DbQbe
$html_output .= '</tr>';
$html_output .= '<tr>';
$html_output .= '<td class="' . $GLOBALS['cell_align_right'] . ' nowrap">';
$html_output .= '<small>' . __('Del') . ':</small>';
$html_output .= '<small>' . __('Del:') . '</small>';
$html_output .= '<input type="checkbox"'
. ' name="criteriaRowDelete[' . $row_index . ']" />';
$html_output .= '</td>';
$html_output .= '<td class="' . $GLOBALS['cell_align_right'] . '">';
$html_output .= '<strong>' . __('Or') . ':</strong>';
$html_output .= '<strong>' . __('Or:') . '</strong>';
$html_output .= '</td>';
$html_output .= '<td>';
$html_output .= '<input type="radio"'

8
libraries/DisplayResults.class.php
View File

@ -900,12 +900,12 @@ class PMA_DisplayResults
. '" />'
. '<input type="submit" name="navig"'
. ' class="ajax"'
. ' value="' . __('Show') . ' :" />'
. __('Start row') . ': ' . "\n"
. ' value="' . __('Show:') . '" />'
. __('Start row:') . ' ' . "\n"
. '<input type="text" name="pos" size="3" value="'
. (($pos_next >= $this->__get('unlim_num_rows')) ? 0 : $pos_next)
. '" class="textfield" onfocus="this.select()" />'
. __('Number of rows') . ': ' . "\n"
. __('Number of rows:') . ' ' . "\n"
. '<input type="text" name="session_max_rows" size="3" value="'
. (($_SESSION['tmp_user_values']['max_rows'] != self::ALL_ROWS)
? $_SESSION['tmp_user_values']['max_rows']
@ -914,7 +914,7 @@ class PMA_DisplayResults
if ($GLOBALS['cfg']['ShowDisplayDirection']) {
// Display mode (horizontal/vertical and repeat headers)
$additional_fields_html .= __('Mode') . ': ' . "\n";
$additional_fields_html .= __('Mode:') . ' ' . "\n";
$choices = array(
'horizontal' => __('horizontal'),
'horizontalflipped' => __('horizontal (rotated headers)'),

8
libraries/Table.class.php
View File

@ -1161,7 +1161,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[] = __('Invalid database') . ': ' . $new_db;
$this->errors[] = __('Invalid database:') . ' ' . $new_db;
return false;
}
} else {
@ -1175,7 +1175,7 @@ class PMA_Table
}
if (! PMA_Table::isValidName($new_name)) {
$this->errors[] = __('Invalid table name') . ': '
$this->errors[] = __('Invalid table name:') . ' '
. $new_table->getFullName();
return false;
}
@ -1575,7 +1575,7 @@ class PMA_Table
/**
* Get all column names which are MySQL reserved words
*
*
* @return array
* @access public
*/
@ -1589,7 +1589,7 @@ class PMA_Table
if (PMA_SQP_isKeyWord($column_name)) {
$return[] = $column_name;
}
}
}
return $return;
}
}

2
libraries/Theme_Manager.class.php
View File

@ -360,7 +360,7 @@ class PMA_Theme_Manager
$theme_preview_path= './themes.php';
$theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
$select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n";
$select_box .= $theme_preview_href . __('Theme:') . '</a>' . "\n";
$select_box .= '<select name="set_theme" lang="en" dir="ltr" class="autosubmit">';
foreach ($this->themes as $each_theme_id => $each_theme) {

2
libraries/Util.class.php
View File

@ -671,7 +671,7 @@ class PMA_Util
}
// ---
// modified to show the help on sql errors
$error_msg .= '<p><strong>' . __('SQL query') . ':</strong>' . "\n";
$error_msg .= '<p><strong>' . __('SQL query:') . '</strong>' . "\n";
if (strstr(strtolower($formatted_sql), 'select')) {
// please show me help to the error on select
$error_msg .= self::showMySQLDocu('SQL-Syntax', 'SELECT');

2
libraries/config/validate.lib.php
View File

@ -432,7 +432,7 @@ function validate_trusted_proxies($path, $values)
$matches = array();
// we catch anything that may (or may not) be an IP
if (!preg_match("/^(.+):(?:[ ]?)\\w+$/", $line, $matches)) {
$result[$path][] = __('Incorrect value') . ': ' . $line;
$result[$path][] = __('Incorrect value:') . ' ' . $line;
continue;
}
// now let's check whether we really have an IP address

14
libraries/display_change_password.lib.php
View File

@ -10,7 +10,7 @@ if (! defined('PHPMYADMIN')) {
}
/**
* Get HTML for the Change password dialog
* Get HTML for the Change password dialog
*
* @param string $username username
* @param string $hostname hostname
@ -31,7 +31,7 @@ function PMA_getHtmlForChangePassword($username, $hostname)
$html = '<form method="post" id="change_password_form" '
. 'action="' . $GLOBALS['PMA_PHP_SELF'] . '" '
. 'name="chgPassword" '
. 'name="chgPassword" '
. 'class="ajax" >';
$html .= PMA_generate_common_hidden_inputs();
@ -58,20 +58,20 @@ function PMA_getHtmlForChangePassword($username, $hostname)
. '<input type="radio" name="nopass" value="0" id="nopass_0" '
. 'onclick="document.getElementById(\'text_pma_pw\').focus();" '
. 'checked="checked " />'
. '<label for="nopass_0">' . __('Password') . ':&nbsp;</label>'
. '<label for="nopass_0">' . __('Password:') . '&nbsp;</label>'
. '</td>'
. '<td>'
. '<input type="password" name="pma_pw" id="text_pma_pw" size="10" '
. 'class="textfield"'
. 'class="textfield"'
. $chg_evt_handler . '="nopass[1].checked = true" />'
. '&nbsp;&nbsp;' . __('Re-type') . ':&nbsp;'
. '&nbsp;&nbsp;' . __('Re-type:') . '&nbsp;'
. '<input type="password" name="pma_pw2" id="text_pma_pw2" size="10" '
. 'class="textfield"'
. $chg_evt_handler . '="nopass[1].checked = true" />'
. '</td>'
. '</tr>'
. '<tr class="vmiddle">'
. '<td>' . __('Password Hashing') . ':'
. '<td>' . __('Password Hashing:')
. '</td>'
. '<td>'
. '<input type="radio" name="pw_hash" id="radio_pw_hash_new" '
@ -84,7 +84,7 @@ function PMA_getHtmlForChangePassword($username, $hostname)
. '<td>'
. '<input type="radio" name="pw_hash" id="radio_pw_hash_old" '
. 'value="old" />'
. '<label for="radio_pw_hash_old">' . __('MySQL 4.0 compatible')
. '<label for="radio_pw_hash_old">' . __('MySQL 4.0 compatible')
. '</label>'
. '</td>'
. '</tr>'

4
libraries/display_create_database.lib.php
View File

@ -18,7 +18,7 @@ if ($is_create_db_priv) {
// The user is allowed to create a db
?>
<form method="post" action="db_create.php" id="create_database_form" class="ajax"><strong>
<?php echo '<label for="text_create_db">'
<?php echo '<label for="text_create_db">'
. PMA_Util::getImage('b_newdb.png')
. " " . __('Create database')
. '</label>&nbsp;'
@ -40,7 +40,7 @@ if ($is_create_db_priv) {
} else {
?>
<!-- db creation no privileges message -->
<strong><?php echo __('Create database') . ':&nbsp;' . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<strong><?php echo __('Create database:') . '&nbsp;' . PMA_Util::showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<?php
echo '<span class="noPrivileges">'
. PMA_Util::getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle'))

2
libraries/display_git_revision.lib.php
View File

@ -61,7 +61,7 @@ function PMA_printGitRevision()
$committer = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_COMMITTER');
$author = $GLOBALS['PMA_Config']->get('PMA_VERSION_GIT_AUTHOR');
PMA_printListItem(
__('Git revision') . ': '
__('Git revision:') . ' '
. $branch . ',<br /> '
. sprintf(
__('committed on %1$s by %2$s'),

8
libraries/insert_edit.lib.php
View File

@ -1182,7 +1182,7 @@ function PMA_getSelectOptionForUpload($vkey, $column)
} elseif (!empty($files)) {
return "<br />\n"
. '<i>' . __('Or') . '</i>' . ' '
. __('web server upload directory') . ':<br />' . "\n"
. __('web server upload directory:') . '<br />' . "\n"
. '<select size="1" name="fields_uploadlocal'
. $vkey . '[' . $column['Field_md5'] . ']">' . "\n"
. '<option value="" selected="selected"></option>' . "\n"
@ -2346,9 +2346,9 @@ function PMA_getCurrentValueForDifferentTypes($possibly_uploaded_val, $key,
function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
$db, $table, $column_name, &$extra_data
) {
$extra_data['isNeedToRecheck'] = true;
$sql_for_real_value = 'SELECT '. PMA_Util::backquote($table) . '.'
. PMA_Util::backquote($column_name)
. ' FROM ' . PMA_Util::backquote($db) . '.'
@ -2360,7 +2360,7 @@ function PMA_verifyWhetherValueCanBeTruncatedAndAppendExtraData(
} else {
$extra_data['isNeedToRecheck'] = false;
}
}
?>

4
libraries/operations.lib.php
View File

@ -72,7 +72,7 @@ function PMA_getHtmlForRenameDatabase($db)
if ($GLOBALS['cfg']['PropertiesIconic']) {
$html_output .= PMA_Util::getImage('b_edit.png');
}
$html_output .= __('Rename database to') . ':'
$html_output .= __('Rename database to:')
. '</legend>';
$html_output .= '<input id="new_db_name" type="text" name="newname" '
@ -172,7 +172,7 @@ function PMA_getHtmlForCopyDatabase($db)
if ($GLOBALS['cfg']['PropertiesIconic']) {
$html_output .= PMA_Util::getImage('b_edit.png');
}
$html_output .= __('Copy database to') . ':'
$html_output .= __('Copy database to:')
. '</legend>'
. '<input type="text" name="newname" size="30" '
. 'class="textfield" value="" /><br />'

6
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -77,8 +77,8 @@ class AuthenticationCookie extends AuthenticationPlugin
$login_link = '<br /><br />[ ' .
sprintf(
'<a href="%s" class="ajax login-link">%s</a>',
$GLOBALS['cfg']['PmaAbsoluteUri'],
'<a href="%s" class="ajax login-link">%s</a>',
$GLOBALS['cfg']['PmaAbsoluteUri'],
__('Log in')
)
. ' ]';
@ -222,7 +222,7 @@ class AuthenticationCookie extends AuthenticationPlugin
</div>';
if (count($GLOBALS['cfg']['Servers']) > 1) {
echo '<div class="item">
<label for="select_server">' . __('Server Choice') .':</label>
<label for="select_server">' . __('Server Choice:') .'</label>
<select name="server" id="select_server"';
if ($GLOBALS['cfg']['AllowArbitraryServer']) {
echo ' onchange="document.forms[\'login_form\'].'

14
libraries/plugins/export/ExportLatex.class.php
View File

@ -215,15 +215,15 @@ class ExportLatex extends ExportPlugin
. '% version ' . PMA_VERSION . $crlf
. '% http://www.phpmyadmin.net' . $crlf
. '%' . $crlf
. '% ' . __('Host') . ': ' . $cfg['Server']['host'];
. '% ' . __('Host:') . ' ' . $cfg['Server']['host'];
if (! empty($cfg['Server']['port'])) {
$head .= ':' . $cfg['Server']['port'];
}
$head .= $crlf
. '% ' . __('Generation Time') . ': '
. '% ' . __('Generation Time:') . ' '
. PMA_Util::localisedDate() . $crlf
. '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
. '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
. '% ' . __('Server version:') . ' ' . PMA_MYSQL_STR_VERSION . $crlf
. '% ' . __('PHP Version:') . ' ' . phpversion() . $crlf;
return PMA_exportOutputHandler($head);
}
@ -248,7 +248,7 @@ class ExportLatex extends ExportPlugin
{
global $crlf;
$head = '% ' . $crlf
. '% ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf
. '% ' . __('Database:') . ' ' . '\'' . $db . '\'' . $crlf
. '% ' . $crlf;
return PMA_exportOutputHandler($head);
}
@ -298,7 +298,7 @@ class ExportLatex extends ExportPlugin
}
unset($i);
$buffer = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table
$buffer = $crlf . '%' . $crlf . '% ' . __('Data:') . ' ' . $table
. $crlf . '%' . $crlf . ' \\begin{longtable}{|';
for ($index = 0; $index < $columns_cnt; $index++) {
@ -482,7 +482,7 @@ class ExportLatex extends ExportPlugin
/**
* Displays the table structure
*/
$buffer = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table
$buffer = $crlf . '%' . $crlf . '% ' . __('Structure:') . ' ' . $table
. $crlf . '%' . $crlf . ' \\begin{longtable}{';
if (! PMA_exportOutputHandler($buffer)) {
return false;

20
libraries/plugins/export/ExportSql.class.php
View File

@ -598,20 +598,20 @@ class ExportSql extends ExportPlugin
. $this->_exportComment('version ' . PMA_VERSION)
. $this->_exportComment('http://www.phpmyadmin.net')
. $this->_exportComment();
$host_string = __('Host') . ': ' . $cfg['Server']['host'];
$host_string = __('Host:') . ' ' . $cfg['Server']['host'];
if (! empty($cfg['Server']['port'])) {
$host_string .= ':' . $cfg['Server']['port'];
}
$head .= $this->_exportComment($host_string);
$head .=
$this->_exportComment(
__('Generation Time') . ': '
__('Generation Time:') . ' '
. PMA_Util::localisedDate()
)
. $this->_exportComment(
__('Server version') . ': ' . PMA_MYSQL_STR_VERSION
__('Server version:') . ' ' . PMA_MYSQL_STR_VERSION
)
. $this->_exportComment(__('PHP Version') . ': ' . phpversion())
. $this->_exportComment(__('PHP Version:') . ' ' . phpversion())
. $this->_possibleCRLF();
if (isset($GLOBALS['sql_header_comment'])
@ -757,7 +757,7 @@ class ExportSql extends ExportPlugin
}
$head = $this->_exportComment()
. $this->_exportComment(
__('Database') . ': '
__('Database:') . ' '
. (isset($GLOBALS['sql_backquotes'])
? PMA_Util::backquoteCompat($db, $compat)
: '\'' . $db . '\'')
@ -943,7 +943,7 @@ class ExportSql extends ExportPlugin
&& ! empty($tmpres['Create_time'])
) {
$schema_create .= $this->_exportComment(
__('Creation') . ': '
__('Creation:') . ' '
. PMA_Util::localisedDate(
strtotime($tmpres['Create_time'])
)
@ -956,7 +956,7 @@ class ExportSql extends ExportPlugin
&& ! empty($tmpres['Update_time'])
) {
$schema_create .= $this->_exportComment(
__('Last update') . ': '
__('Last update:') . ' '
. PMA_Util::localisedDate(
strtotime($tmpres['Update_time'])
)
@ -969,7 +969,7 @@ class ExportSql extends ExportPlugin
&& ! empty($tmpres['Check_time'])
) {
$schema_create .= $this->_exportComment(
__('Last check') . ': '
__('Last check:') . ' '
. PMA_Util::localisedDate(
strtotime($tmpres['Check_time'])
)
@ -1542,7 +1542,7 @@ class ExportSql extends ExportPlugin
$head = $this->_possibleCRLF()
. $this->_exportComment()
. $this->_exportComment('VIEW ' . ' ' . $formatted_table_name)
. $this->_exportComment(__('Data') . ': ' . __('None'))
. $this->_exportComment(__('Data:') . ' ' . __('None'))
. $this->_exportComment()
. $this->_possibleCRLF();
@ -1873,4 +1873,4 @@ class ExportSql extends ExportPlugin
return true;
} // end of the 'exportData()' function
}
}

10
libraries/plugins/export/ExportXml.class.php
View File

@ -188,15 +188,15 @@ class ExportXml extends ExportPlugin
. '- version ' . PMA_VERSION . $crlf
. '- http://www.phpmyadmin.net' . $crlf
. '-' . $crlf
. '- ' . __('Host') . ': ' . $cfg['Server']['host'];
. '- ' . __('Host:') . ' ' . $cfg['Server']['host'];
if (! empty($cfg['Server']['port'])) {
$head .= ':' . $cfg['Server']['port'];
}
$head .= $crlf
. '- ' . __('Generation Time') . ': '
. '- ' . __('Generation Time:') . ' '
. PMA_Util::localisedDate() . $crlf
. '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
. '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
. '- ' . __('Server version:') . ' ' . PMA_MYSQL_STR_VERSION . $crlf
. '- ' . __('PHP Version:') . ' ' . phpversion() . $crlf
. '-->' . $crlf . $crlf;
$head .= '<pma_xml_export version="1.0"'
@ -387,7 +387,7 @@ class ExportXml extends ExportPlugin
&& $GLOBALS['xml_export_contents']
) {
$head = ' <!--' . $crlf
. ' - ' . __('Database') . ': ' . '\'' . $db . '\'' . $crlf
. ' - ' . __('Database:') . ' ' . '\'' . $db . '\'' . $crlf
. ' -->' . $crlf
. ' <database name="' . htmlspecialchars($db) . '">' . $crlf;

4
libraries/plugins/export/PMA_ExportPdf.class.php
View File

@ -112,8 +112,8 @@ class PMA_ExportPdf extends PMA_PDF
$this->Cell(
0,
$this->FontSizePt,
__('Database') . ': ' . $this->currentDb . ', '
. __('Table') . ': ' . $this->currentTable,
__('Database:') . ' ' . $this->currentDb . ', '
. __('Table:') . ' ' . $this->currentTable,
0, 1, 'L'
);
$l = ($this->lMargin);

24
libraries/replication_gui.lib.php
View File

@ -57,19 +57,19 @@ function PMA_replication_gui_changemaster($submitname)
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">' . __('User name') . ':</label>';
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">' . __('Password') .' :</label>';
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">' . __('Host') . ' :</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">' . __('Port') . ':</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>';
@ -270,13 +270,13 @@ function PMA_replication_gui_master_addslaveuser()
. '<input type="hidden" name="sr_take_action" value="true" />'
. '<div class="item">'
. '<label for="select_pred_username">'
. ' ' . __('User name') . ':'
. ' ' . __('User name:')
. '</label>'
. '<span class="options">'
. ' <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"' : '') . '>' . __('Any user') . '</option>'
. ' <option value="userdefined"' . ((! isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . __('Use text field') . ':</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="'
@ -290,7 +290,7 @@ function PMA_replication_gui_master_addslaveuser()
. '</div>'
. '<div class="item">'
. '<label for="select_pred_hostname">'
. ' ' . __('Host') . ':'
. ' ' . __('Host:')
. '</label>'
. '<span class="options">'
. ' <select name="pred_hostname" id="select_pred_hostname" title="' . __('Host') . '"';
@ -344,7 +344,7 @@ function PMA_replication_gui_master_addslaveuser()
. ' <option value="userdefined"'
. ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined')
? ' selected="selected"' : '')
. '>' . __('Use text field') . ':</option>'
. '>' . __('Use text field:') . '</option>'
. ' </select>'
. '</span>'
. '<input type="text" name="hostname" maxlength="'
@ -358,7 +358,7 @@ function PMA_replication_gui_master_addslaveuser()
. '</div>'
. '<div class="item">'
. '<label for="select_pred_password">'
. ' ' . __('Password') . ':'
. ' ' . __('Password:')
. '</label>'
. '<span class="options">'
. ' <select name="pred_password" id="select_pred_password" title="'
@ -369,21 +369,21 @@ function PMA_replication_gui_master_addslaveuser()
echo ' selected="selected"';
}
echo '>' . __('No Password') . '</option>'
. ' <option value="userdefined"' . (isset($GLOBALS['username']) ? '' : ' selected="selected"') . '>' . __('Use text field') . ':</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="' . __('Password') . '" onchange="pred_password.value = \'userdefined\';" />'
. '</div>'
. '<div class="item">'
. '<label for="text_pma_pw2">'
. ' ' . __('Re-type') . ':'
. ' ' . __('Re-type:')
. '</label>'
. '<span class="options">&nbsp;</span>'
. '<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">'
. ' ' . __('Generate Password') . ':'
. ' ' . __('Generate Password:')
. '</label>'
. '<span class="options">'
. ' <input type="button" class="button" id="button_generate_password" value="' . __('Generate') . '" onclick="suggestPassword(this.form)" />'

2
libraries/rte/rte_events.lib.php
View File

@ -252,7 +252,7 @@ function PMA_EVN_handleEditor()
}
exit;
} else {
$message = __('Error in processing request') . ' : ';
$message = __('Error in processing request:') . ' ';
$message .= sprintf(
PMA_RTE_getWord('not_found'),
htmlspecialchars(PMA_Util::backquote($_REQUEST['item_name'])),

2
libraries/rte/rte_export.lib.php
View File

@ -40,7 +40,7 @@ function PMA_RTE_handleExport($item_name, $export_data)
}
} else {
$_db = htmlspecialchars(PMA_Util::backquote($db));
$response = __('Error in Processing Request') . ' : '
$message = __('Error in processing request:') . ' '
. sprintf(PMA_RTE_getWord('not_found'), $item_name, $_db);
$response = PMA_message::error($response);
if ($GLOBALS['is_ajax_request'] == true) {

8
libraries/rte/rte_routines.lib.php
View File

@ -461,7 +461,7 @@ function PMA_RTN_handleEditor()
}
exit;
} else {
$message = __('Error in processing request') . ' : ';
$message = __('Error in processing request:') . ' ';
$message .= sprintf(
PMA_RTE_getWord('not_found'),
htmlspecialchars(PMA_Util::backquote($_REQUEST['item_name'])),
@ -1179,7 +1179,7 @@ function PMA_RTN_getQueryFromRequest()
}
if (! empty($_REQUEST['item_param_opts_text'][$i])) {
if ($GLOBALS['PMA_Types']->getTypeClass($_REQUEST['item_param_type'][$i]) == 'CHAR') {
$params .= ' CHARSET '
$params .= ' CHARSET '
. strtolower($_REQUEST['item_param_opts_text'][$i]);
}
}
@ -1475,7 +1475,7 @@ function PMA_RTN_handleExecute()
// Now deliberately fall through to displaying the routines list
}
} else {
$message = __('Error in processing request') . ' : ';
$message = __('Error in processing request:') . ' ';
$message .= sprintf(
PMA_RTE_getWord('not_found'),
htmlspecialchars(PMA_Util::backquote($_REQUEST['item_name'])),
@ -1515,7 +1515,7 @@ function PMA_RTN_handleExecute()
}
exit;
} else if (($GLOBALS['is_ajax_request'] == true)) {
$message = __('Error in processing request') . ' : ';
$message = __('Error in processing request:') . ' ';
$message .= sprintf(
PMA_RTE_getWord('not_found'),
htmlspecialchars(PMA_Util::backquote($_REQUEST['item_name'])),

2
libraries/rte/rte_triggers.lib.php
View File

@ -227,7 +227,7 @@ function PMA_TRI_handleEditor()
}
exit;
} else {
$message = __('Error in processing request') . ' : ';
$message = __('Error in processing request:') . ' ';
$message .= sprintf(
PMA_RTE_getWord('not_found'),
htmlspecialchars(PMA_Util::backquote($_REQUEST['item_name'])),

8
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -1329,22 +1329,22 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
$break = false;
if (! empty($show_comment)) {
$pdf->Cell(0, 3, __('Table comments') . ' : ' . $show_comment, 0, 1);
$pdf->Cell(0, 3, __('Table comments:') . ' ' . $show_comment, 0, 1);
$break = true;
}
if (! empty($create_time)) {
$pdf->Cell(0, 3, __('Creation') . ': ' . $create_time, 0, 1);
$pdf->Cell(0, 3, __('Creation:') . ' ' . $create_time, 0, 1);
$break = true;
}
if (! empty($update_time)) {
$pdf->Cell(0, 3, __('Last update') . ': ' . $update_time, 0, 1);
$pdf->Cell(0, 3, __('Last update:') . ' ' . $update_time, 0, 1);
$break = true;
}
if (! empty($check_time)) {
$pdf->Cell(0, 3, __('Last check') . ': ' . $check_time, 0, 1);
$pdf->Cell(0, 3, __('Last check:') . ' ' . $check_time, 0, 1);
$break = true;
}

4
libraries/select_server.lib.php
View File

@ -36,12 +36,12 @@ function PMA_selectServer($not_only_options, $ommit_fieldset)
if (! $ommit_fieldset) {
$retval .= '<fieldset>';
}
$retval .= '<label for="select_server">' . __('Current Server') . ':</label> ';
$retval .= '<label for="select_server">' . __('Current Server:') . '</label> ';
$retval .= '<select name="server" id="select_server" class="autosubmit">';
$retval .= '<option value="">(' . __('Servers') . ') ...</option>' . "\n";
} elseif ($list) {
$retval .= __('Current Server') . ':<br />';
$retval .= __('Current Server:') . '<br />';
$retval .= '<ul id="list_server">';
}

18
libraries/server_privileges.lib.php
View File

@ -1024,7 +1024,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
. '<legend>' . __('Login Information') . '</legend>' . "\n"
. '<div class="item">' . "\n"
. '<label for="select_pred_username">' . "\n"
. ' ' . __('User name') . ':' . "\n"
. ' ' . __('User name:') . "\n"
. '</label>' . "\n"
. '<span class="options">' . "\n";
@ -1073,7 +1073,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
$html_output .= '<div class="item">' . "\n"
. '<label for="select_pred_hostname">' . "\n"
. ' ' . __('Host') . ':' . "\n"
. ' ' . __('Host:') . "\n"
. '</label>' . "\n";
$html_output .= '<span class="options">' . "\n"
@ -1167,7 +1167,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
)
? ' selected="selected"'
: '') . '>'
. __('Use text field') . ':</option>' . "\n"
. __('Use text field:') . '</option>' . "\n"
. '</select>' . "\n"
. '</span>' . "\n";
@ -1183,7 +1183,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
$html_output .= '<div class="item">' . "\n"
. '<label for="select_pred_password">' . "\n"
. ' ' . __('Password') . ':' . "\n"
. ' ' . __('Password:') . "\n"
. '</label>' . "\n"
. '<span class="options">' . "\n"
. '<select name="pred_password" id="select_pred_password" title="'
@ -1218,7 +1218,7 @@ function PMA_getHtmlForDisplayLoginInformationFields($mode = 'new')
$html_output .= '<div class="item" '
. 'id="div_element_before_generate_password">' . "\n"
. '<label for="text_pma_pw2">' . "\n"
. ' ' . __('Re-type') . ':' . "\n"
. ' ' . __('Re-type:') . "\n"
. '</label>' . "\n"
. '<span class="options">&nbsp;</span>' . "\n"
. '<input type="password" name="pma_pw2" id="text_pma_pw2" '
@ -2267,11 +2267,11 @@ function PMA_getHTmlForDisplaySelectDbInEditPrivs($found_rows)
$pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
$html_output = '<label for="text_dbname">'
. __('Add privileges on the following database') . ':</label>' . "\n";
. __('Add privileges on the following database:') . '</label>' . "\n";
if (! empty($pred_db_array)) {
$html_output .= '<select name="pred_dbname" class="autosubmit">' . "\n"
. '<option value="" selected="selected">'
. __('Use text field') . ':</option>' . "\n";
. __('Use text field:') . '</option>' . "\n";
foreach ($pred_db_array as $current_db) {
$current_db = PMA_Util::escapeMysqlWildcards($current_db);
// cannot use array_diff() once, outside of the loop,
@ -2305,7 +2305,7 @@ function PMA_displayTablesInEditPrivs($dbname, $found_rows)
$html_output = '<input type="hidden" name="dbname"
'. 'value="' . htmlspecialchars($dbname) . '"/>' . "\n";
$html_output .= '<label for="text_tablename">'
. __('Add privileges on the following table') . ':</label>' . "\n";
. __('Add privileges on the following table:') . '</label>' . "\n";
$result = @PMA_DBI_try_query(
'SHOW TABLES FROM ' . PMA_Util::backquote(
@ -2839,7 +2839,7 @@ function PMA_getHtmlHeaderForDisplayUserProperties(
) {
$html_output = '<h2>' . "\n"
. PMA_Util::getIcon('b_usredit.png')
. __('Edit Privileges') . ': '
. __('Edit Privileges:') . ' '
. __('User');
if (isset($dbname)) {

16
libraries/sql_query_form.lib.php
View File

@ -98,16 +98,16 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
}
if ($is_querywindow) {
$html .= '<input type="hidden" name="focus_querywindow"'
$html .= '<input type="hidden" name="focus_querywindow"'
.' value="true" />' . "\n";
if ($display_tab != 'sql' && $display_tab != 'full') {
$html .= '<input type="hidden" name="sql_query"'
$html .= '<input type="hidden" name="sql_query"'
.' value="" />' . "\n";
$html .= '<input type="hidden" name="show_query"'
$html .= '<input type="hidden" name="show_query"'
.' value="1" />' . "\n";
}
}
$html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
$html .= '<input type="hidden" name="is_js_confirmed" value="0" />'
. "\n" . PMA_generate_common_hidden_inputs($db, $table) . "\n"
.'<input type="hidden" name="pos" value="0" />' . "\n"
.'<input type="hidden" name="goto" value="'
@ -116,7 +116,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';')
. __('Your SQL query has been executed successfully') . '" />'
. "\n" .'<input type="hidden" name="prev_sql_query" value="'
. htmlspecialchars($query) . '" />' . "\n";
echo $html;
// display querybox
@ -315,7 +315,7 @@ function PMA_sqlQueryFormInsert(
$html .= '<div id="bookmarkoptions">';
$html .= '<div class="formelement">';
$html .= '<label for="bkm_label">'
. __('Bookmark this SQL query') . ':</label>';
. __('Bookmark this SQL query:') . '</label>';
$html .= '<input type="text" name="bkm_label" id="bkm_label"'
. ' tabindex="110" value="" />';
$html .= '</div>';
@ -341,7 +341,7 @@ function PMA_sqlQueryFormInsert(
$html .= '<fieldset id="queryboxfooter" class="tblFooters">' . "\n";
$html .= '<div class="formelement">' . "\n";
echo $html;
if ($is_querywindow) {
?>
<script type="text/javascript">
@ -477,7 +477,7 @@ function PMA_sqlQueryFormUpload()
$errors[] = PMA_Message::error(__('The directory you set for upload work cannot be reached'));
} elseif (!empty($files)) {
echo '<div class="formelement">';
echo '<strong>' . __('web server upload directory') .':</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;

18
libraries/tbl_columns_definition_form.inc.php
View File

@ -30,9 +30,9 @@ require_once './libraries/Partition.class.php';
/**
* We are in transition between old-style echo and new-style PMA_Response
* so this script generates $html and at the bottom, either echos it
* or uses addHTML on it.
* or uses addHTML on it.
*
* Initialize $html in case this variable was used by a caller
* Initialize $html in case this variable was used by a caller
* (yes, this script should be refactored into functions)
*/
$html = '';
@ -116,7 +116,7 @@ $header_cells[] = __('Attributes');
$header_cells[] = __('Null');
// We could remove this 'if' and let the key information be shown and
// editable. However, for this to work, structure.lib.php must be modified
// editable. However, for this to work, structure.lib.php must be modified
// to use the key fields, as tbl_addfield does.
if (! $is_backup) {
@ -137,7 +137,7 @@ $header_cells[] = __('Comments');
if (isset($fields_meta)) {
// for moving, load all available column names
$move_columns_sql_query = 'SELECT * FROM '
$move_columns_sql_query = 'SELECT * FROM '
. PMA_Util::backquote($db)
. '.'
. PMA_Util::backquote($table)
@ -447,7 +447,7 @@ for ($i = 0; $i < $num_fields; $i++) {
}
$content_cells[$i][$ci] = '<select name="field_default_type[' . $i
. ']" id="field_' . $i . '_' . ($ci - $ci_offset)
. ']" id="field_' . $i . '_' . ($ci - $ci_offset)
. '" class="default_type">';
foreach ($default_options as $key => $value) {
$content_cells[$i][$ci] .= '<option value="' . $key . '"';
@ -833,13 +833,13 @@ function addField()
if ($action == 'tbl_create.php') {
$html .= '<table>'
. '<tr class="vtop">'
. '<th>' . __('Table comments') . ':&nbsp;</th>'
. '<th>' . __('Table comments:') . '</th>'
. '<td width="25">&nbsp;</td>'
. '<th>' . __('Storage Engine') . ':'
. '<th>' . __('Storage Engine:')
. PMA_Util::showMySQLDocu('Storage_engines', 'Storage_engines')
. '</th>'
. '<td width="25">&nbsp;</td>'
. '<th>' . __('Collation') . ':&nbsp;</th>'
. '<th>' . __('Collation:') . '</th>'
. '</tr>'
. '<tr><td><input type="text" name="comment" size="40" maxlength="80"'
. 'value="'
@ -873,7 +873,7 @@ if ($action == 'tbl_create.php') {
if (PMA_Partition::havePartitioning()) {
$html .= '<tr class="vtop">'
. '<th>' . __('PARTITION definition') . ':&nbsp;'
. '<th>' . __('PARTITION definition:') . '&nbsp;'
. PMA_Util::showMySQLDocu('Partitioning', 'Partitioning')
. '</th>'
. '</tr>'

2
pmd_general.php
View File

@ -215,7 +215,7 @@ echo '</table>';
echo '</div>';
echo '<div class="center">';
echo __('Number of tables') . ': ' . $name_cnt;
echo __('Number of tables:') . ' ' . $name_cnt;
echo '</div>';
echo '<div class="floatright">';
echo '<div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">';

4
pmd_pdf.php
View File

@ -110,7 +110,7 @@ $table_info_result = PMA_queryAsControlUser(
);
if (PMA_DBI_num_rows($table_info_result) > 0) {
echo '<p>' . __('Page') . ':';
echo '<p>' . __('Page:');
echo '<select name="pdf_page_number">';
while ($page = PMA_DBI_fetch_assoc($table_info_result)) {
@ -138,7 +138,7 @@ echo '<br />';
echo '<label for="newpage">' . __('New page name: ') . '</label>';
echo '<input id="newpage" type="text" name="newpage" />';
echo '<p>' . __('Export/Import to scale') . ':';
echo '<p>' . __('Export/Import to scale:');
?>
<select name="scale">
<option value="1">1:1</option>

2
pmd_relation_new.php
View File

@ -79,7 +79,7 @@ if (PMA_Util::isForeignKeySupported($type_T1)
}
} else { // internal (pmadb) relation
if ($GLOBALS['cfgRelation']['relwork'] == false) {
PMD_return_new(0, __('General relation features') . ':' . __('Disabled'));
PMD_return_new(0, __('General relation features:') . ' ' . __('Disabled'));
} else {
// no need to recheck if the keys are primary or unique at this point,
// this was checked on the interface part

2
querywindow.php
View File

@ -151,7 +151,7 @@ if (! empty($_sql_history)
&& ($querydisplay_tab == 'history' || $querydisplay_tab == 'full')
) {
$tab = $querydisplay_tab != 'full' ? 'sql' : 'full';
echo __('SQL history') . ':<br />'
echo __('SQL history:') . '<br />'
. '<ul>';
foreach ($_sql_history as $query) {
echo '<li>' . "\n";

6
server_status_queries.php
View File

@ -76,14 +76,14 @@ function getQueryStatisticsHtml($ServerStatusData)
);
$retval .= '<br />';
$retval .= '<span>';
$retval .= '&oslash; ' . __('per hour') . ': ';
$retval .= '&oslash; ' . __('per hour:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * $hour_factor, 0);
$retval .= '<br />';
$retval .= '&oslash; ' . __('per minute') . ': ';
$retval .= '&oslash; ' . __('per minute:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries * 60 / $ServerStatusData->status['Uptime'], 0);
$retval .= '<br />';
if ($total_queries / $ServerStatusData->status['Uptime'] >= 1) {
$retval .= '&oslash; ' . __('per second') . ': ';
$retval .= '&oslash; ' . __('per second:') . ' ';
$retval .= PMA_Util::formatNumber($total_queries / $ServerStatusData->status['Uptime'], 0);
}
$retval .= '</span>';

26
sql.php
View File

@ -230,23 +230,23 @@ if (isset($_REQUEST['get_set_values']) && $_REQUEST['get_set_values'] == true) {
$values = PMA_Util::parseEnumSetValues($field_info_result[0]['Type']);
$select = '';
//converts characters of $_REQUEST['curr_value'] to HTML entities
$converted_curr_value = htmlentities(
$_REQUEST['curr_value'], ENT_COMPAT, "UTF-8"
);
$selected_values = explode(',', $converted_curr_value);
foreach ($values as $value) {
foreach ($values as $value) {
$select .= '<option value="' . $value . '"';
if ($value == $converted_curr_value
if ($value == $converted_curr_value
|| in_array($value, $selected_values, true)
) {
$select .= ' selected="selected" ';
}
$select .= '>' . $value . '</option>';
}
}
$select_size = (sizeof($values) > 10) ? 10 : sizeof($values);
$select = '<select multiple="multiple" size="' . $select_size . '">'
@ -1104,17 +1104,17 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
echo "<h1>" . __('SQL result') . "</h1>";
echo "<p>";
echo "<strong>" . __('Host') . ":</strong> $hostname<br />";
echo "<strong>" . __('Database') . ":</strong> "
echo "<strong>" . __('Host:') . "</strong> $hostname<br />";
echo "<strong>" . __('Database:') . "</strong> "
. htmlspecialchars($db) . "<br />";
echo "<strong>" . __('Generation Time') . ":</strong> "
echo "<strong>" . __('Generation Time:') . "</strong> "
. PMA_Util::localisedDate() . "<br />";
echo "<strong>" . __('Generated by') . ":</strong> $versions<br />";
echo "<strong>" . __('SQL query') . ":</strong> "
echo "<strong>" . __('Generated by:') . "</strong> $versions<br />";
echo "<strong>" . __('SQL query:') . "</strong> "
. htmlspecialchars($full_sql_query) . ";";
if (isset($num_rows)) {
echo "<br />";
echo "<strong>" . __('Rows') . ":</strong> $num_rows";
echo "<strong>" . __('Rows:') . "</strong> $num_rows";
}
echo "</p>";
} else {
@ -1316,7 +1316,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
);
echo '</legend>';
echo '<div class="formelement">';
echo '<label for="fields_label_">' . __('Label') . ':</label>';
echo '<label for="fields_label_">' . __('Label:') . '</label>';
echo '<input type="text" id="fields_label_"'
. ' name="fields[label]" value="" />';
echo '</div>';
@ -1692,7 +1692,7 @@ function PMA_getColumnNameInColumnDropSql($sql)
}
/**
* Verify whether the result set contains all the columns
* Verify whether the result set contains all the columns
* of at least one unique key
*
* @param string $db database name

4
tbl_chart.php
View File

@ -238,11 +238,11 @@ $htmlString .= '<div style="float:left; padding-left:40px;">'
. '<p style="clear:both;">&nbsp;</p>'
. '<fieldset>'
. '<div>'
. '<label for="pos">' . __('Start row') . ': ' . "\n" . '</label>'
. '<label for="pos">' . __('Start row:') . '</label>'
. '<input type="text" name="pos" size="3" value="'
. $_SESSION['tmp_user_values']['pos'] . '" />'
. '<label for="session_max_rows">'
. __('Number of rows') . ': ' . "\n" . '</label>'
. __('Number of rows:') . '</label>'
. '<input type="text" name="session_max_rows" size="3" value="'
. (($_SESSION['tmp_user_values']['max_rows'] != 'all')
? $_SESSION['tmp_user_values']['max_rows']

8
tbl_printview.php
View File

@ -62,7 +62,7 @@ if ($multi_tables) {
$tbl_list .= (empty($tbl_list) ? '' : ', ')
. PMA_Util::backquote($table);
}
echo '<strong>'. __('Showing tables') . ': '
echo '<strong>'. __('Showing tables:') . ' '
. htmlspecialchars($tbl_list) . '</strong>' . "\n";
echo '<hr />' . "\n";
} // end if
@ -117,7 +117,7 @@ foreach ($the_tables as $key => $table) {
* Displays the comments of the table if MySQL >= 3.23
*/
if (!empty($show_comment)) {
echo __('Table comments') . ': '
echo __('Table comments:') . ' '
. htmlspecialchars($show_comment) . '<br /><br />';
}
@ -293,7 +293,7 @@ foreach ($the_tables as $key => $table) {
// Space usage
echo '<td class="vtop">';
echo '<big>' . __('Space usage') . ':</big>';
echo '<big>' . __('Space usage:') . '</big>';
echo '<table width="100%">';
echo '<tr>';
echo '<td style="padding-right: 10px">' . __('Data') . '</td>';
@ -342,7 +342,7 @@ foreach ($the_tables as $key => $table) {
// Rows Statistic
echo "\n";
echo '<td class="vtop">';
echo '<big>' . __('Row Statistics') . ':</big>';
echo '<big>' . __('Row Statistics:') . '</big>';
echo '<table width="100%">';
if (isset($showtable['Row_format'])) {
echo "\n";

2
tbl_relation.php
View File

@ -541,7 +541,7 @@ if (count($columns) > 0) {
// Get "display_field" infos
$disp = PMA_getDisplayField($db, $table);
$html_output .= '<fieldset>'
. '<label>' . __('Choose column to display') . ': </label>'
. '<label>' . __('Choose column to display:') . '</label>'
. '<select name="display_field">'
. '<option value="">---</option>';