16 Sep
2011
16 Sep
'11
9:24 p.m.
The branch, master has been updated
via 5d3735b3b4226e4b7c581d5015218a7dd35cf228 (commit)
via 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit)
from bee270dd400e34d1ee04d4696509f47b322aa319 (commit)
- Log -----------------------------------------------------------------
commit 5d3735b3b4226e4b7c581d5015218a7dd35cf228
Merge: bee270d 5511ae8
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Fri Sep 16 23:50:47 2011 +0530
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/config/messages.inc.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1ce49af..b0d3206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 77f5370..3c55558 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -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');
hooks/post-receive
--
phpMyAdmin