Merge remote-tracking branch 'origin/master'

2015-08-05 10:45:01 +02:00 · 2015-08-05 10:45:01 +02:00 · 441c23e997
commit 441c23e997
parent 64461b097c 201731121a
1 changed files with 1 additions and 1 deletions
--- 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 uploaded file.');
+            $this->_error_message = __('Cannot read uploaded file.');
            return false;
        }