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-08-03 09:51:02 +02:00
commit 7e6c7fbc98
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/File.class.php
View File

@ -484,7 +484,7 @@ class PMA_File
$this->isTemp(true);
if (! $this->isReadable()) {
$this->_error_message = __('Cannot read (moved) upload file.');
$this->_error_message = __('Cannot read moved uploaded file.');
return false;
}

3
libraries/display_change_password.lib.php
View File

@ -92,7 +92,8 @@ function PMA_getHtmlForChangePassword($username, $hostname)
$html .= '" checked="checked"';
}
$html .= ' />'
. '<label for="radio_pw_hash_mysql_native">' . 'mysql_native_password'
. '<label for="radio_pw_hash_mysql_native">'
. __('MySQL native password')
. '</label>'
. '</td>'
. '</tr>'

2
libraries/server_privileges.lib.php
View File

@ -1695,7 +1695,7 @@ function PMA_getHtmlForLoginInformationFields(
. '<select id="select_authentication_plugin" name="authentication_plugin">'
. '<option value="mysql_native_password" '
. ($orig_auth_plugin == 'mysql_native_password' ? 'selected ' : '')
. '>' . __('mysql_native_password') . '</option>';
. '>' . __('MySQL native password') . '</option>';
// Since, 5.6.6 does not provide a syntax to alter
// the authentication plugin used for a user,