diff --git a/ChangeLog b/ChangeLog index d5d1eaedb..9ae378e36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #2937850 [doc] Add some hints to chk_rel.php for quick setup. + rfe #2938579 [interface] Add class to some elements for easier theming. + rfe #2937840 [doc] Add some interesting configs to config.sample.inc.php. ++ rfe #2792992 [doc] Added advice to re-login after changing pmadb settings 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index aa41a7542..255c75256 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1655,4 +1655,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index bbeb4c9e9..04767b4d4 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1653,4 +1653,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 706d3a164..51e575e32 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1657,4 +1657,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index db5be365f..ce439c55d 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 55aabf7a4..8ca1429b4 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 7cbe99643..106e769c4 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 970c558b6..c6d42129f 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 50f973cc7..c2ee5f33b 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1661,4 +1661,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 8a4eeabfc..74454995c 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1655,4 +1655,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 3e0cca0e4..ebcfacdcb 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 53440f9d1..d9e42d1cd 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1655,4 +1655,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index cd11ca054..e82282183 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1634,4 +1634,5 @@ $strRenameView = 'Rename view to'; //to translate $strShowInsert = 'Show insert query'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index a546fcde1..8ca372144 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 24e310c65..d8bfafc2d 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1656,4 +1656,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 7f55f567c..a8c1be344 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index ddca54168..4278c65df 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; //to $strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index d04b16f16..928b91b52 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 69f8db8bf..c1ff4d2e0 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1638,4 +1638,5 @@ $strShowInsert = 'Show insert query'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 22b45f4b4..69684b752 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -666,6 +666,7 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPmadbCreateHelp = 'Quick steps to setup advanced features:'; $strPmadbCreateTables = 'Create the needed tables with the script/create_tables.sql.'; $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; $strPmaDocumentation = 'phpMyAdmin documentation'; $strPmaUriError = 'The $cfg[\'PmaAbsoluteUri\'] directive MUST be set in your configuration file!'; $strPolish = 'Polish'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 4e7888a83..a5151e224 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index ee97d3a73..d694c5a94 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1631,4 +1631,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 46a2f9069..e280837a4 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1627,4 +1627,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 36568f973..96bb62b79 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1635,4 +1635,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 6bb846f01..3f8ca39d2 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 5eb88d92a..a7c52219b 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 76d08dc11..46ce58a5b 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1658,4 +1658,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 735ff66b8..a8308f682 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1650,4 +1650,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index ebdbea99b..8afce6968 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1656,4 +1656,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 5df6997b3..4e14d5ca6 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 924375c7f..23bc71968 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 48bd4fdea..74e6d551f 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1649,4 +1649,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index b057abd15..039b4be6f 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 42854a830..0baeb5d33 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1651,4 +1651,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index a8565b719..306e0a646 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index f9fefbdf7..0a131031c 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1647,4 +1647,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index c066a0605..8afca431c 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1655,4 +1655,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 0f80edc8b..f5e232ddd 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1668,4 +1668,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 687c4f80e..bddff9eba 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1654,4 +1654,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index d9b0867a6..c5720ba40 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1630,4 +1630,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index c3f142766..d7c6371b0 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1657,4 +1657,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index bed3b40b5..ffe25ae51 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1640,4 +1640,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 9a1f2257b..2e7e9c6ea 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1658,4 +1658,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 080598959..e78b7ceff 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index dace5fe05..5ea7bd450 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1633,4 +1633,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index a6f6d222d..28d56c1b9 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 94a84ea9a..1a8f4fccf 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1652,4 +1652,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index a6e169ec3..4097edcb4 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1656,4 +1656,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 854685d88..f3c267cce 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index c16bf1feb..2a72e36ea 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1651,4 +1651,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index e747f6b00..6188726c4 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 66df53878..1f8e74700 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1644,4 +1644,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index f3790626c..1bf2ab232 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 69452d065..c219c5d31 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1653,4 +1653,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index d54b6cf9a..f1e2304de 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1643,4 +1643,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index c6ec065f6..022e991e6 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1651,4 +1651,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index 60a65c0bc..4cb888f66 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index a701e9f56..b9f3e401d 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1648,4 +1648,5 @@ $strPmadbCreateUser = 'Create a pma user and give access to these tables.'; //t $strPmadbCreateConfig = 'Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php.'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate +$strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate ?> diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index fe50ce62b..7f0d4d3ce 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -162,6 +162,7 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) echo '
  • ' . $GLOBALS['strPmadbCreateTables'] . ' ' . PMA_showDocu('linked-tables') . '
    • '; echo '
  • ' . $GLOBALS['strPmadbCreateUser'] . ' ' . PMA_showDocu('pmausr') . '
    • '; echo '
  • ' . $GLOBALS['strPmadbCreateConfig'] . ' ' . PMA_showDocu('quick_install') . '
    • '; + echo '
  • ' . $GLOBALS['strPmadbReLoginToEnable'] . '
    • '; echo ''; }