patch #2506831 [privileges] Create user for existing database

ChangeLog

@@ -21,6 +21,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2498350 [cleanup] XHTML cleanup, thanks to Virsacer - virsacer 
 + patch #2494192 [display] Possibility of disabling the sliders, 
   thanks to Virsacer - virsacer 
++ patch #2506831 [privileges] Create user for existing database, 
+  thanks to Herman van Rink - helmo
 
 3.1.3.0 (not yet released)
 + [lang] Turkish update, thanks to Burak Yavuz

db_search.php

@@ -314,7 +314,7 @@ $choices = array(
     '3' => $GLOBALS['strSearchOption3'],
     '4' => $GLOBALS['strSearchOption4'] . ' ' . PMA_showMySQLDocu('Regexp', 'Regexp')
 );
-// 4th parameter set to false to add line breaks
+// 4th parameter set to true to add line breaks
 // 5th parameter set to false to avoid htmlspecialchars() escaping in the label
 //  since we have some HTML in some labels
 PMA_generate_html_radio('search_option', $choices, $search_option, true, false);

lang/afrikaans-utf-8.inc.php

@@ -1470,4 +1470,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/albanian-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/arabic-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/azerbaijani-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/bangla-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/basque-utf-8.inc.php

@@ -1463,4 +1463,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/belarusian_cyrillic-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/belarusian_latin-utf-8.inc.php

@@ -1453,4 +1453,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/bosnian-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php

@@ -1443,4 +1443,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/catalan-utf-8.inc.php

@@ -1443,4 +1443,5 @@ $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.c
 
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/chinese_simplified-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/chinese_traditional-utf-8.inc.php

@@ -1450,4 +1450,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/croatian-utf-8.inc.php

@@ -1447,4 +1447,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/czech-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strShowKeys = 'Only show keys';  //to translate
 
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/danish-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/dutch-utf-8.inc.php

@@ -197,6 +197,7 @@ $strCreateUserDatabase = 'Database voor gebruiker';
 $strCreateUserDatabaseName = 'Maak een database met dezelfde naam en geef alle rechten hierop';
 $strCreateUserDatabaseNone = 'Geen';
 $strCreateUserDatabaseWildcard = 'Geef alle rechten op de wildcard naam (gebruikersnaam\_%)';
+$strCreateUserDatabasePrivileges = 'Geef alle rechten op de database "%s"';
 $strCreationDates = 'Creatie/Update/Controleer datum';
 $strCriteria = 'Criteria';
 $strCroatian = 'Kroatisch';

lang/english-utf-8.inc.php

@@ -191,6 +191,7 @@ $strCreateTable  = 'Create table';
 $strCreateUserDatabase = 'Database for user';
 $strCreateUserDatabaseName = 'Create database with same name and grant all privileges';
 $strCreateUserDatabaseNone = 'None';
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';
 $strCreateUserDatabaseWildcard = 'Grant all privileges on wildcard name (username\_%)';
 $strCreationDates = 'Creation/Update/Check dates';
 $strCriteria = 'Criteria';

lang/estonian-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/finnish-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strZip = '"zip-pakattu"';
 
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/french-utf-8.inc.php

@@ -1442,4 +1442,5 @@ $strYes = 'Oui';
 $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.';
 $strZip = '"zippé"';
 
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/galician-utf-8.inc.php

@@ -1444,4 +1444,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/georgian-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/german-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/greek-utf-8.inc.php

@@ -1468,4 +1468,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/hebrew-utf-8.inc.php

@@ -1463,4 +1463,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/hindi-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/hungarian-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strZip = '"zip tömörítés"';
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/indonesian-utf-8.inc.php

@@ -1461,4 +1461,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/italian-utf-8.inc.php

@@ -1450,4 +1450,5 @@ $strSetupZipDump_name = 'ZIP';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/japanese-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/korean-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/latvian-utf-8.inc.php

@@ -1468,4 +1468,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php

@@ -1461,4 +1461,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/macedonian_cyrillic-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/malay-utf-8.inc.php

@@ -1483,4 +1483,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/mongolian-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/norwegian-utf-8.inc.php

@@ -1443,4 +1443,5 @@ $strZip = 'Komprimert (zip)';
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/persian-utf-8.inc.php

@@ -1497,4 +1497,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/polish-utf-8.inc.php

@@ -1439,4 +1439,5 @@ $strSetupExport_file_template_server_name = 'Server name template';  //to transl
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/portuguese-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/romanian-utf-8.inc.php

@@ -1447,4 +1447,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/russian-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/serbian_cyrillic-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/serbian_latin-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/sinhala-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/slovak-utf-8.inc.php

@@ -1446,4 +1446,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/slovenian-utf-8.inc.php

@@ -1465,4 +1465,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/spanish-utf-8.inc.php

@@ -1441,4 +1441,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/swedish-utf-8.inc.php

@@ -1443,4 +1443,5 @@ $strZip = '"zippad"';
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/tatarish-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/thai-utf-8.inc.php

@@ -1467,4 +1467,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/turkish-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strYes = 'Evet';
 $strZeroRemovesTheLimit = 'Not: Bu seçeneklerin 0 (sıfır)\'a ayarlanması sınırı kaldırır.';
 $strZip = '"zip olarak"';
 
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php

@@ -1465,4 +1465,5 @@ $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 $strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
+$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"';  //to translate
 ?>

server_privileges.php

@@ -934,6 +934,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
 
             switch (PMA_ifSetOr($_REQUEST['createdb'], '0')) {
                 case '1' :
+                    // Create database with same name and grant all privileges
                     $q = 'CREATE DATABASE IF NOT EXISTS '
                         . PMA_backquote(PMA_sqlAddslashes($username)) . ';';
                     $sql_query .= $q;
@@ -953,12 +954,23 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
                     }
                     break;
                 case '2' :
+                    // Grant all privileges on wildcard name (username\_%)
                     $q = 'GRANT ALL PRIVILEGES ON '
                         . PMA_backquote(PMA_sqlAddslashes($username) . '\_%') . '.* TO \''
                         . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
                     $sql_query .= $q;
                     if (! PMA_DBI_try_query($q)) {
                         $message = PMA_Message::rawError(PMA_DBI_getError());
+                    }
+					break;
+                case '3' :
+                    // Grant all privileges on the specified database to the new user
+                    $q = 'GRANT ALL PRIVILEGES ON '
+                    . PMA_backquote(PMA_sqlAddslashes($dbname)) . '.* TO \''
+                    . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\';';
+                    $sql_query .= $q;
+                    if (! PMA_DBI_try_query($q)) {
+                    $message = PMA_Message::rawError(PMA_DBI_getError());
                     }
                     break;
                 case '0' :
@@ -1963,12 +1975,24 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
     echo '<fieldset id="fieldset_add_user_database">' . "\n"
         . '<legend>' . $GLOBALS['strCreateUserDatabase'] . '</legend>' . "\n";
 
+    $default_choice = 0;
     $choices = array(
         '0' => $GLOBALS['strCreateUserDatabaseNone'],
         '1' => $GLOBALS['strCreateUserDatabaseName'],
         '2' => $GLOBALS['strCreateUserDatabaseWildcard']);
-    PMA_generate_html_radio('createdb', $choices, '0', true);
+
+    if ( !empty($dbname) ) {
+        $choices['3'] = sprintf($GLOBALS['strCreateUserDatabasePrivileges'], htmlspecialchars($dbname));
+        $default_choice = 3;
+        echo '<input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '" />' . "\n";
+    }
+
+    // 4th parameter set to true to add line breaks
+    // 5th parameter set to false to avoid htmlspecialchars() escaping in the label
+    //  since we have some HTML in some labels
+    PMA_generate_html_radio('createdb', $choices, $default_choice, true, false);
     unset($choices);
+    unset($default_choice);
 
     echo '</fieldset>' . "\n";
     PMA_displayPrivTable('*', '*', FALSE);
@@ -2118,6 +2142,15 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
             }
             $odd_row = ! $odd_row;
         }
+
+        // Offer to create a new user for the current database
+        echo '<tr><td colspan="6">';	
+                echo '    <fieldset id="fieldset_add_user">' . "\n"
+                   . '        <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . $checkprivs .'">' . "\n"
+                   . PMA_getIcon('b_usradd.png')
+                   . '            ' . $GLOBALS['strAddUser'] . '</a>' . "\n"
+                   . '    </fieldset>' . "\n";
+        echo '</td></tr>';	
     } else {
         echo '    <tr class="odd">' . "\n"
            . '        <td colspan="6">' . "\n"