Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-09-16 20:40:16 +02:00
commit 7fcec353a3
2 changed files with 2 additions and 1 deletions

View File

@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
- bug #3403165 [interface] Collation not displayed for long enum fields
- bug #3399951 [export] Config for export compression not used
- bug #3400690 [privileges] DB-specific privileges won't submit
- bug #3410604 [config] Configuration storage incorrect suggested table name
3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd

View File

@ -440,7 +440,7 @@ $strConfigServers_tracking_desc = __('Leave blank for no SQL query tracking supp
$strConfigServers_tracking_name = __('SQL query tracking table');
$strConfigServers_tracking_version_auto_create_desc = __('Whether the tracking mechanism creates versions for tables and views automatically.');
$strConfigServers_tracking_version_auto_create_name = __('Automatically create versions');
$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_config[/kbd]');
$strConfigServers_userconfig_desc = __('Leave blank for no user preferences storage in database, suggested: [kbd]pma_userconfig[/kbd]');
$strConfigServers_userconfig_name = __('User preferences storage table');
$strConfigServers_user_desc = __('Leave empty if not using config auth');
$strConfigServers_user_name = __('User for config auth');