Merge conflict resolved for Lori's tree merge to main

setup/lib/config_info.inc.php

@@ -91,6 +91,7 @@ $cfg_db['Export']['format'] = array('codegen', 'csv', 'excel', 'htmlexcel',
     'yaml');
 $cfg_db['Export']['compression'] = array('none', 'zip', 'gzip', 'bzip2');
 $cfg_db['Export']['charset'] = array_merge(array(''), $GLOBALS['cfg']['AvailableCharsets']);
+$cfg_db['Export']['method'] = array('quick', 'custom', 'custom-no-form');
 
 /**
  * Config options which will be placed in config file even if they are set

setup/lib/forms.inc.php

@@ -170,6 +170,7 @@ $forms['Import_defaults'] = array('Import' => array(
     'skip_queries'));
 $forms['Export_defaults'] = array('Export' => array(
     'format',
+    'method',
     'compression',
     'asfile',
     'charset',

setup/lib/messages.inc.php

@@ -83,6 +83,7 @@ $strSetupExport_file_template_database_name = __('Database name template');
 $strSetupExport_file_template_server_name = __('Server name template');
 $strSetupExport_file_template_table_name = __('Table name template');
 $strSetupExport_format_name = __('Format');
+$strSetupExport_method_name = __('Method');
 $strSetupExport_onserver_name = __('Save on server');
 $strSetupExport_onserver_overwrite_name = __('Overwrite existing file(s)');
 $strSetupExport_remember_file_template_name = __('Remember file name template');