From 5664fe52fb69410e533af0c9b7a733d57b1a6eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 3 Aug 2015 09:49:34 +0200
Subject: [PATCH 1/2] Better string for MySQL native password
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/display_change_password.lib.php | 3 ++-
 libraries/server_privileges.lib.php       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 2b23c25be9..7d0c54e0bd 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -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>'
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 1eb66ec396..ffa0a675fa 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -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,

From d8b48ac7a7e8d55bd2566027fd0a7c0c0de3550b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 3 Aug 2015 09:50:37 +0200
Subject: [PATCH 2/2] Clarify error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/File.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/File.class.php b/libraries/File.class.php
index 879711f78b..59280b548e 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -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;
         }