Move some messages to places where they belong.

This is bascially just test that everything works as expected, much more
messages should follow.

libraries/auth/config.auth.lib.php

@@ -104,7 +104,7 @@ function PMA_auth_fails()
     } else {
         // Check whether user has configured something
         if ($GLOBALS['PMA_Config']->source_mtime == 0) {
-            echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="setup/">', '</a>') . '</p>' . "\n";
+            echo '<p>' . sprintf(__('You probably did not create a configuration file. You might want to use the %1$ssetup script%2$s to create one.'), '<a href="setup/">', '</a>') . '</p>' . "\n";
         } elseif (!isset($GLOBALS['errno']) || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002) && $GLOBALS['errno'] != 2003) {
         // if we display the "Server not responding" error, do not confuse users
         // by telling them they have a settings problem
@@ -113,7 +113,7 @@ function PMA_auth_fails()
         //  rejected the connection, which is not really what happened)
         // 2002 is the error given by mysqli
         // 2003 is the error given by mysql
-            trigger_error($GLOBALS['strAccessDeniedExplanation'], E_USER_WARNING);
+            trigger_error(__('phpMyAdmin tried to connect to the MySQL server, and the server rejected the connection. You should check the host, username and password in your configuration and make sure that they correspond to the information given by the administrator of the MySQL server.'), E_USER_WARNING);
         }
         PMA_mysqlDie($conn_error, '', true, '', false);
     }

libraries/messages.inc.php

@@ -35,8 +35,6 @@ $timespanfmt = __('%s days, %s hours, %s minutes and %s seconds');
 
 $strAbortedClients = __('Aborted');
 $strAccessDenied = __('Access denied');
-$strAccessDeniedCreateConfig = __('You probably did not create a configuration file. You might want to use the %1$ssetup script%2$s to create one.');
-$strAccessDeniedExplanation = __('phpMyAdmin tried to connect to the MySQL server, and the server rejected the connection. You should check the host, username and password in your configuration and make sure that they correspond to the information given by the administrator of the MySQL server.');
 $strAction = __('Action');
 $strActions = __('Actions');
 $strAddAutoIncrement = __('Add AUTO_INCREMENT value');
@@ -316,7 +314,6 @@ $strErrorRelationAdded = __('Error: Relation not added.');
 $strErrorRelationExists = __('Error: relation already exists.');
 $strErrorRenamingTable = __('Error renaming table %1$s to %2$s');
 $strErrorSaveTable = __('Error saving coordinates for Designer.');
-$strEscapeWildcards = __('Wildcards _ and % should be escaped with a \ to use them literally');
 $strEsperanto = __('Esperanto');
 $strEstonian = __('Estonian');
 $strEvent = __('Event');

server_privileges.php

@@ -1901,7 +1901,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                     echo '    </select>' . "\n";
                 }
                 echo '    <input type="text" id="text_dbname" name="dbname" />' . "\n"
-                    . PMA_showHint($GLOBALS['strEscapeWildcards']);
+                    . PMA_showHint(__('Wildcards _ and % should be escaped with a \ to use them literally'));
             } else {
                 echo '    <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n"
                    . '    <label for="text_tablename">' . $GLOBALS['strAddPrivilegesOnTbl'] . ':</label>' . "\n";