diff --git a/ChangeLog b/ChangeLog index 09102c203..85c66e455 100644 --- a/ChangeLog +++ b/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 diff --git a/db_search.php b/db_search.php index bbdffaf15..4b5a65e34 100644 --- a/db_search.php +++ b/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); diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 011b442e6..664930b4a 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/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 ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 528f38a3c..85e8b0f35 100644 --- a/lang/albanian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 3c5a70928..87e6e4965 100644 --- a/lang/arabic-utf-8.inc.php +++ b/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 ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 84f6d76d7..898c0af14 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/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 ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 5b7404a5b..2e6722bcb 100644 --- a/lang/bangla-utf-8.inc.php +++ b/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 ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 8d78d2d35..880955dfe 100644 --- a/lang/basque-utf-8.inc.php +++ b/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 ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 3e4dff42d..e8305b8c5 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/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 ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index fd825d6e9..d09415d52 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/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 ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 3cda5e280..f9ebdea3a 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index b5ee67b91..ec9e6e93e 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/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 ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 4aa294f8b..e9707dc5f 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 50656f202..7e0a95dc6 100644 --- a/lang/catalan-utf-8.inc.php +++ b/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 ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 0ac6b3e4b..3d2cafc89 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/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 ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 5e7a334de..1168c7f6f 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/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 ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 3911929c0..56e92cfb3 100644 --- a/lang/croatian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index d2d3ecb7b..8442aea43 100644 --- a/lang/czech-utf-8.inc.php +++ b/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 ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 83b951f2d..8f51a0887 100644 --- a/lang/danish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index c00196143..a79825b7e 100644 --- a/lang/dutch-utf-8.inc.php +++ b/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'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index d41af7418..74cdad10a 100644 --- a/lang/english-utf-8.inc.php +++ b/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'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 7a52a7fa4..bb4fd6548 100644 --- a/lang/estonian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 1cd4ef868..b9e31dacb 100644 --- a/lang/finnish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index f8bd83d01..96617bf4f 100644 --- a/lang/french-utf-8.inc.php +++ b/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 ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 2a53ddf08..23a5fd1ab 100644 --- a/lang/galician-utf-8.inc.php +++ b/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 ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index c06d2283f..1950a27a6 100644 --- a/lang/georgian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 780ae9536..da16534b5 100644 --- a/lang/german-utf-8.inc.php +++ b/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 ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index df80d26d4..34081011f 100644 --- a/lang/greek-utf-8.inc.php +++ b/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 ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 94bf983d3..62b5a2b9a 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/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 ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index e980b1b33..b92d917bf 100644 --- a/lang/hindi-utf-8.inc.php +++ b/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 ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 406b35ed0..4ec7ddf47 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 490a765e5..9a446de8f 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index a831b3c41..bc0f060df 100644 --- a/lang/italian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 7d5e95446..44f26347e 100644 --- a/lang/japanese-utf-8.inc.php +++ b/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 ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index b5a2a843e..704f5c6cd 100644 --- a/lang/korean-utf-8.inc.php +++ b/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 ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index cc3d3c3cb..dfc449a46 100644 --- a/lang/latvian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index f043ba1cc..7bc84ff1c 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index feb7d5c00..53ac3b0d7 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/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 ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 7ca36cb5e..9fceb038c 100644 --- a/lang/malay-utf-8.inc.php +++ b/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 ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 6313bd712..5312237d7 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index dfb7bf518..12e5bb105 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 181d89a4d..258c22429 100644 --- a/lang/persian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index c48f717ec..f69038fc0 100644 --- a/lang/polish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 964fe633b..f0ceb1811 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/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 ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index a0d4da7ae..6f60efac7 100644 --- a/lang/romanian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index b10a9136d..0d98bc22d 100644 --- a/lang/russian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index aa01330f0..dde251890 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/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 ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index fc4664a2d..4bcba9b8d 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/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 ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 43e15e617..910d1f1af 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/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 ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index e1aafbf67..4c9a7c63c 100644 --- a/lang/slovak-utf-8.inc.php +++ b/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 ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 41b2a097f..f86109391 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/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 ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 2ca4f5ecc..9f98a66d5 100644 --- a/lang/spanish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 1a5ac5c4d..82fb7ed91 100644 --- a/lang/swedish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index aa9c28086..cc18a7d1c 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index a44bb4446..b7fc8460b 100644 --- a/lang/thai-utf-8.inc.php +++ b/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 ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 795a27b31..682c182c1 100644 --- a/lang/turkish-utf-8.inc.php +++ b/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 ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 375f5d739..289c54c9e 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/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 ?> diff --git a/server_privileges.php b/server_privileges.php index bae17b7c8..348a901ab 100644 --- a/server_privileges.php +++ b/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 '
' . "\n" . '' . $GLOBALS['strCreateUserDatabase'] . '' . "\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 '' . "\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 '
' . "\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 ''; + echo '
' . "\n" + . ' ' . "\n" + . PMA_getIcon('b_usradd.png') + . ' ' . $GLOBALS['strAddUser'] . '' . "\n" + . '
' . "\n"; + echo ''; } else { echo ' ' . "\n" . ' ' . "\n"