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 2015-07-20 12:31:55 +02:00
commit 672f189239
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/server_privileges.lib.php
View File

@ -1500,12 +1500,12 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new')
$html_output .= '<div class="item">' . "\n"
. '<label for="select_pred_hostname">' . "\n"
. ' ' . __('Host:') . "\n"
. ' ' . __('Host name:') . "\n"
. '</label>' . "\n";
$html_output .= '<span class="options">' . "\n"
. ' <select name="pred_hostname" id="select_pred_hostname" '
. 'title="' . __('Host') . '"' . "\n";
. 'title="' . __('Host name') . '"' . "\n";
$_current_user = $GLOBALS['dbi']->fetchValue('SELECT USER();');
if (! empty($_current_user)) {
$thishost = str_replace(
@ -1607,7 +1607,7 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new')
. $hostname_length . '" value="'
// use default value of '%' to match with the default 'Any host'
. htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '%')
. '" title="' . __('Host')
. '" title="' . __('Host name')
. '" onchange="pred_hostname.value = \'userdefined\'; this.required = true;" '
. ((isset($GLOBALS['pred_hostname'])
&& $GLOBALS['pred_hostname'] == 'userdefined'
@ -2239,7 +2239,7 @@ function PMA_getHtmlForPrivsTableHead()
. '<tr>'
. '<th></th>'
. '<th>' . __('User name') . '</th>'
. '<th>' . __('Host') . '</th>'
. '<th>' . __('Host name') . '</th>'
. '<th>' . __('Type') . '</th>'
. '<th>' . __('Privileges') . '</th>'
. '<th>' . __('Grant') . '</th>'
@ -3200,7 +3200,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
. '<thead>' . "\n"
. '<tr><th></th>' . "\n"
. '<th>' . __('User name') . '</th>' . "\n"
. '<th>' . __('Host') . '</th>' . "\n"
. '<th>' . __('Host name') . '</th>' . "\n"
. '<th>' . __('Password') . '</th>' . "\n"
. '<th>' . __('Global privileges') . ' '
. PMA_Util::showHint(