The branch, QA_3_4 has been updated
       via  5511ae8fbc577abb44206e35dd61a947dd60c814 (commit)
      from  d3bd40b56d619f0672e323844095cc8b36e9e49e (commit)


- Log -----------------------------------------------------------------
commit 5511ae8fbc577abb44206e35dd61a947dd60c814
Author: Madhura Jayaratne <[email protected]>
Date:   Fri Sep 16 23:45:36 2011 +0530

    bug #3410604 [config] Configuration storage incorrect suggested table name

-----------------------------------------------------------------------

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 83aa38d..3287323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,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 266bac7..97fc191 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -428,7 +428,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

------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to