Merge branch 'QA_4_3'

This commit is contained in:
Madhura Jayaratne 2015-01-01 11:17:05 +05:30
commit 08a352d469
2 changed files with 6 additions and 1 deletions

View File

@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
- bug #4678 Some of the data stored in configuration storage are not deleted upon db or table delete
- bug #4679 Setup does not allow providing a name for favorites table
- bug #4680 Number of favorite table are not configurable in setup
- bug #4681 'Central columns table' field in setup does not have a description
4.3.4.0 (2014-12-29)
- bug #4653 Always connection error was shown, on /setup at tab "configuration storage"

View File

@ -604,7 +604,11 @@ $strConfigServers_savedsearches_desc = __(
'Leave blank for no QBE saved searches support, suggested: '
. '[kbd]pma__savedsearches[/kbd].'
);
$strConfigServers_central_columns_name = __('Central columns table');
$strConfigServers_central_columns_desc = __(
'Leave blank for no central columns support, suggested: '
. '[kbd]pma__central_columns[/kbd].'
);
$strConfigServers_nopassword_desc = __('Try to connect without password.');
$strConfigServers_nopassword_name = __('Connect without password');
$strConfigServers_only_db_desc = __(