bug #2414056 [auth] AllowNoPasswordRoot error message is too vague

ChangeLog

@@ -26,6 +26,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer
 + bug #2565948 [core] Changing the connection collation changed the client
   charset. 
+- bug #2414056 [auth] AllowNoPasswordRoot error message is too vague 
 
 3.1.3.0 (not yet released)
 + [lang] Turkish update, thanks to Burak Yavuz

lang/afrikaans-utf-8.inc.php

@@ -1473,4 +1473,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/albanian-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/arabic-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/azerbaijani-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/bangla-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/basque-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/belarusian_cyrillic-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/belarusian_latin-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/bosnian-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/catalan-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/chinese_simplified-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/chinese_traditional-utf-8.inc.php

@@ -1453,4 +1453,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/croatian-utf-8.inc.php

@@ -1450,4 +1450,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/czech-utf-8.inc.php

@@ -1452,4 +1452,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/danish-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/dutch-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strSetupServers_verbose_desc = 'Een gebruiksvriendelijke naam voor deze server.
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/english-utf-8.inc.php

@@ -721,6 +721,7 @@ $strRevokeAndDelete = 'Revoke all active privileges from the users and delete th
 $strRevokeMessage = 'You have revoked the privileges for %s';
 $strRevoke = 'Revoke';
 $strRomanian = 'Romanian';
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';
 $strRoutineReturnType = 'Return type';
 $strRoutines = 'Routines';
 $strRowLength = 'Row length';

lang/estonian-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/finnish-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/french-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strYes = 'Oui';
 $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
 $strZip = '"zippé"';
 
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/galician-utf-8.inc.php

@@ -1447,4 +1447,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/georgian-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/german-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strSetupLoginCookieDeleteAll_desc = 'If TRUE, logout deletes cookies for all se
 $strSetupLoginCookieStore_desc = 'Define how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.';  //to translate
 $strSetupServerAuthConfigMsg = 'You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/greek-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/hebrew-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/hindi-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/hungarian-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/indonesian-utf-8.inc.php

@@ -1464,4 +1464,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/italian-utf-8.inc.php

@@ -1453,4 +1453,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/japanese-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/korean-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/latvian-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php

@@ -1464,4 +1464,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/macedonian_cyrillic-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/malay-utf-8.inc.php

@@ -1486,4 +1486,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/mongolian-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strWebServer = 'Web server';  //to translate
 $strWiki = 'Wiki';  //to translate
 
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/norwegian-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/persian-utf-8.inc.php

@@ -1500,4 +1500,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/polish-utf-8.inc.php

@@ -1442,4 +1442,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/portuguese-utf-8.inc.php

@@ -1475,4 +1475,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/romanian-utf-8.inc.php

@@ -1450,4 +1450,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/russian-utf-8.inc.php

@@ -1459,4 +1459,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/serbian_cyrillic-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/serbian_latin-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/sinhala-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/slovak-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/slovenian-utf-8.inc.php

@@ -1468,4 +1468,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/spanish-utf-8.inc.php

@@ -1444,4 +1444,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/swedish-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/tatarish-utf-8.inc.php

@@ -1459,4 +1459,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/thai-utf-8.inc.php

@@ -1470,4 +1470,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/turkish-utf-8.inc.php

@@ -1452,4 +1452,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php

@@ -1468,4 +1468,5 @@ $strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s&qu
 $strShowBinaryContents = 'Show binary contents';  //to translate
 $strShowBLOBContents = 'Show BLOB contents';  //to translate
 $strStatic = 'static';  //to translate
+$strRootWithoutPassword = 'Login to root without a password is forbidden by configuration (see AllowNoPasswordRoot)';  //to translate
 ?>

libraries/auth/cookie.auth.lib.php

@@ -654,7 +654,9 @@ function PMA_auth_fails()
     // Deletes password cookie and displays the login form
     PMA_removeCookie('pmaPass-' . $GLOBALS['server']);
 
-    if (! empty($GLOBALS['allowDeny_forbidden'])) {
+    if (! empty($GLOBALS['root_without_password_is_forbidden'])) {
+        $conn_error = $GLOBALS['strRootWithoutPassword'];
+    } elseif (! empty($GLOBALS['allowDeny_forbidden'])) {
         $conn_error = $GLOBALS['strAccessDenied'];
     } elseif (! empty($GLOBALS['no_activity'])) {
         $conn_error = sprintf($GLOBALS['strNoActivity'], $GLOBALS['cfg']['LoginCookieValidity']);

libraries/common.inc.php

@@ -884,9 +884,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
         // is root without password allowed?
         if (!$cfg['Server']['AllowNoPasswordRoot'] && $cfg['Server']['user'] == 'root' && $cfg['Server']['password'] == '') {
-            $allowDeny_forbidden = true;
+            $root_without_password_is_forbidden = true;
             PMA_auth_fails();
-            unset($allowDeny_forbidden); //Clean up after you!
+            unset($root_without_password_is_forbidden); //Clean up after you!
         }
 
         // Try to connect MySQL with the control user profile (will be used to