Merge branch 'QA_4_3'

ChangeLog

@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - bug       Auto-configuration: tables were not created automatically
 - bug #4677 Advanced feature checker does not check for favorite tables feature
 - 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
 
 4.3.4.0 (2014-12-29)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"

libraries/config/messages.inc.php

@@ -633,6 +633,11 @@ $strConfigServers_recent_desc = __(
     . 'suggested: [kbd]pma__recent[/kbd].'
 );
 $strConfigServers_recent_name = __('Recently used table');
+$strConfigServers_favorite_desc = __(
+    'Leave blank for no "persistent" favorite tables across sessions, '
+    . 'suggested: [kbd]pma__favorite[/kbd].'
+);
+$strConfigServers_favorite_name = __('Favorites table');
 $strConfigServers_relation_desc = __(
     'Leave blank for no '
     . '[a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, '

libraries/config/setup.forms.php

@@ -75,6 +75,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
     'column_info' => 'pma__column_info',
     'history' => 'pma__history',
     'recent' => 'pma__recent',
+    'favorite' => 'pma_favorite',
     'table_uiprefs' => 'pma__table_uiprefs',
     'tracking' => 'pma__tracking',
     'table_coords' => 'pma__table_coords',