diff --git a/ChangeLog b/ChangeLog
index 826a39a5c..d5044a3d8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-09-13 Loïc Chapeaux  <lolo@phpheaven.net>  and Marc
+    * db_details.php3, line 121: XHTML fix.
+    * tbl_properties_export.php3; libraries/build_dump.lib.php3; lang/*:
+      feature #601603 (Field names on CSV export).
+
 2002-09-12 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: bug 601809: when two fields have the
       same name, both are showed NULL even if only one is NULL
diff --git a/db_details.php3 b/db_details.php3
index c2b99df05..84fb84185 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -118,7 +118,7 @@ if ($cfg['UploadDir'] != '') {
                     echo '    <i>' . $strOr . '</i> ' . $strWebServerUploadDirectory . '&nbsp;:<br />' . "\n";
                     echo '    <div style="margin-bottom: 5px">' . "\n";
                     echo '        <select size="1" name="sql_localfile">' . "\n";
-                    echo '            <option value="" selected></option>' . "\n";
+                    echo '            <option value="" selected="selected"></option>' . "\n";
                 } // end if (is_first)
                 echo '            <option value="' . htmlspecialchars($file) . '">' . htmlspecialchars($file) . '</option>' . "\n";
                 $is_first++;
diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3
index c5f188abf..025b377c2 100644
--- a/lang/afrikaans-iso-8859-1.inc.php3
+++ b/lang/afrikaans-iso-8859-1.inc.php3
@@ -434,4 +434,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3
index fa78bfe14..9d56dd3df 100644
--- a/lang/afrikaans-utf-8.inc.php3
+++ b/lang/afrikaans-utf-8.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3
index c221a602d..546f8d0fb 100644
--- a/lang/albanian-iso-8859-1.inc.php3
+++ b/lang/albanian-iso-8859-1.inc.php3
@@ -433,4 +433,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3
index 5d16290b6..9f2a23d64 100644
--- a/lang/albanian-utf-8.inc.php3
+++ b/lang/albanian-utf-8.inc.php3
@@ -434,4 +434,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3
index 4d906ab92..382ba5532 100644
--- a/lang/arabic-utf-8.inc.php3
+++ b/lang/arabic-utf-8.inc.php3
@@ -449,4 +449,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3
index 2ec765694..b3175d84c 100644
--- a/lang/arabic-windows-1256.inc.php3
+++ b/lang/arabic-windows-1256.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3
index 19431796b..f312515e7 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php3
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3
index 7db95a461..fd9b57d4b 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php3
+++ b/lang/brazilian_portuguese-utf-8.inc.php3
@@ -449,4 +449,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3
index 922d23f95..aa718e5ae 100644
--- a/lang/bulgarian-koi8-r.inc.php3
+++ b/lang/bulgarian-koi8-r.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3
index f973a3aa1..e78ceb56c 100644
--- a/lang/bulgarian-utf-8.inc.php3
+++ b/lang/bulgarian-utf-8.inc.php3
@@ -449,4 +449,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3
index 98d71766a..2e6d0cf8b 100644
--- a/lang/bulgarian-windows-1251.inc.php3
+++ b/lang/bulgarian-windows-1251.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3
index f34b8a671..e6c3fb32d 100644
--- a/lang/catalan-iso-8859-1.inc.php3
+++ b/lang/catalan-iso-8859-1.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3
index 26d5e339a..4791b848c 100644
--- a/lang/catalan-utf-8.inc.php3
+++ b/lang/catalan-utf-8.inc.php3
@@ -436,4 +436,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3
index c9509cf63..bafab7a31 100644
--- a/lang/chinese_big5-utf-8.inc.php3
+++ b/lang/chinese_big5-utf-8.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index 083d6ffeb..468cd1c2f 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -434,4 +434,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3
index e37f095fb..ad7ee4017 100644
--- a/lang/chinese_gb-utf-8.inc.php3
+++ b/lang/chinese_gb-utf-8.inc.php3
@@ -434,4 +434,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index 5699296f4..3fc4eb313 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -432,4 +432,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3
index c29b72b17..d9e8bc22d 100644
--- a/lang/croatian-iso-8859-2.inc.php3
+++ b/lang/croatian-iso-8859-2.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3
index 136ed7329..54ca2d7d6 100644
--- a/lang/croatian-utf-8.inc.php3
+++ b/lang/croatian-utf-8.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3
index 9605c12cf..773ba7ec7 100644
--- a/lang/croatian-windows-1250.inc.php3
+++ b/lang/croatian-windows-1250.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3
index 4aee4ae31..c8b3c11f6 100644
--- a/lang/czech-iso-8859-2.inc.php3
+++ b/lang/czech-iso-8859-2.inc.php3
@@ -433,4 +433,6 @@ $strYes = 'Ano';
 $strZip = '"zazipováno"';
 // To translate
 
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3
index 391c71efe..5379b23ff 100644
--- a/lang/czech-utf-8.inc.php3
+++ b/lang/czech-utf-8.inc.php3
@@ -434,4 +434,6 @@ $strYes = 'Ano';
 $strZip = '"zazipováno"';
 // To translate
 
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3
index 4dfc613f2..febe11b52 100644
--- a/lang/czech-windows-1250.inc.php3
+++ b/lang/czech-windows-1250.inc.php3
@@ -433,4 +433,6 @@ $strYes = 'Ano';
 $strZip = '"zazipováno"';
 // To translate
 
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3
index 8afcf457d..61eb65d24 100644
--- a/lang/danish-iso-8859-1.inc.php3
+++ b/lang/danish-iso-8859-1.inc.php3
@@ -442,4 +442,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3
index e9fa1319d..a70700600 100644
--- a/lang/danish-utf-8.inc.php3
+++ b/lang/danish-utf-8.inc.php3
@@ -443,4 +443,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3
index db3689da2..d63b51252 100644
--- a/lang/dutch-iso-8859-1.inc.php3
+++ b/lang/dutch-iso-8859-1.inc.php3
@@ -431,4 +431,6 @@ $strYes = 'Ja';
 $strZip = '"Gezipt"';
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3
index 7b0b466f1..3e1d8ebcd 100644
--- a/lang/dutch-utf-8.inc.php3
+++ b/lang/dutch-utf-8.inc.php3
@@ -432,4 +432,6 @@ $strYes = 'Ja';
 $strZip = '"Gezipt"';
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3
index 12576b1fd..af8e64563 100644
--- a/lang/english-iso-8859-1.inc.php3
+++ b/lang/english-iso-8859-1.inc.php3
@@ -95,6 +95,7 @@ $strCreateNewTable = 'Create new table on database %s';
 $strCreatePage = 'Create a new Page';
 $strCreatePdfFeat = 'Creation of PDFs';
 $strCriteria = 'Criteria';
+$strCvsData = 'CSV data';
 
 $strData = 'Data';
 $strDatabase = 'Database ';
@@ -284,6 +285,7 @@ $strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b
 $strPrintView = 'Print view';
 $strPrivileges = 'Privileges';
 $strProperties = 'Properties';
+$strPutColNames = 'Put fields names at first row';
 
 $strQBE = 'Query';
 $strQBEDel = 'Del';
diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3
index b39cdc901..408d20e66 100644
--- a/lang/english-utf-8.inc.php3
+++ b/lang/english-utf-8.inc.php3
@@ -96,6 +96,7 @@ $strCreateNewTable = 'Create new table on database %s';
 $strCreatePage = 'Create a new Page';
 $strCreatePdfFeat = 'Creation of PDFs';
 $strCriteria = 'Criteria';
+$strCvsData = 'CSV data';
 
 $strData = 'Data';
 $strDatabase = 'Database ';
@@ -285,6 +286,7 @@ $strPrimaryKeyWarning = '("PRIMARY" <b>must</b> be the name of and <b>only of</b
 $strPrintView = 'Print view';
 $strPrivileges = 'Privileges';
 $strProperties = 'Properties';
+$strPutColNames = 'Put fields names at first row';
 
 $strQBE = 'Query';
 $strQBEDel = 'Del';
diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3
index 38d77d63d..4f19b8f1b 100644
--- a/lang/estonian-iso-8859-1.inc.php3
+++ b/lang/estonian-iso-8859-1.inc.php3
@@ -428,4 +428,6 @@ $strZip = '"zipitud"';
 // To translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3
index 49953a62c..df683381b 100644
--- a/lang/estonian-utf-8.inc.php3
+++ b/lang/estonian-utf-8.inc.php3
@@ -429,4 +429,6 @@ $strZip = '"zipitud"';
 // To translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3
index 56e01b967..53f294a16 100644
--- a/lang/finnish-iso-8859-1.inc.php3
+++ b/lang/finnish-iso-8859-1.inc.php3
@@ -431,4 +431,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3
index fdd08d49b..cdac322fa 100644
--- a/lang/finnish-utf-8.inc.php3
+++ b/lang/finnish-utf-8.inc.php3
@@ -432,4 +432,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3
index c5a0d9d60..2f381e3bb 100644
--- a/lang/french-iso-8859-1.inc.php3
+++ b/lang/french-iso-8859-1.inc.php3
@@ -95,6 +95,7 @@ $strCreateNewTable = 'Cr
 $strCreatePage = 'Créer une page';
 $strCreatePdfFeat = 'Génération de schémas en PDF';
 $strCriteria = 'Critère';
+$strCvsData = 'Données CSV';
 
 $strData = 'Données';
 $strDatabase = 'Base de données';
@@ -284,6 +285,7 @@ $strPrimaryKeyWarning = '("PRIMARY" <b>doit et ne peut 
 $strPrintView = 'Version imprimable';
 $strPrivileges = 'Privilèges';
 $strProperties = 'Propriétés';
+$strPutColNames = 'Afficher les noms de champ en première ligne';
 
 $strQBE = 'Requête';
 $strQBEDel = 'Effacer';
@@ -340,6 +342,7 @@ $strSelectFields = 'Choisir les champs 
 $strSelectNumRows = 'dans la requête';
 $strSelectTables = 'Choisissez les tables';
 $strSend = 'Transmettre';
+$strServer = 'Serveur %s';
 $strServerChoice = 'Choix du serveur';
 $strServerVersion = 'Version du serveur';
 $strSetEnumVal = 'Les différentes valeurs des champs de type enum/set sont à spécifier sous la forme \'a\',\'b\',\'c\'...<br />Pour utiliser un caractère "\\" ou "\'" dans l\'une de ces valeurs, faites le précéder du caractère d\'échappement "\\" (par exemple \'\\\\xyz\' ou \'a\\\'b\').';
@@ -411,6 +414,7 @@ $strUsers = 'Utilisateurs et privil
 $strUseTables = 'Utiliser les tables';
 
 $strValidateSQL = 'Valider SQL';
+$strValidatorError = 'Le validateur SQL n\'a pas pu être initialisé. Vérifiez que les extensions PHP nécessaires ont bien été installées (voir la %sdocumentation%s).';
 $strValue = 'Valeur';
 $strViewDump = '<b>Afficher le schéma</b> de la table';
 $strViewDumpDB = 'Afficher le schéma de la base ';
@@ -426,7 +430,4 @@ $strYes = 'Oui';
 $strZip = '"zippé"';
 
 // To translate
-$strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
-
-$strServer = 'Server %s';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3
index b1827c470..b8db9ed99 100644
--- a/lang/french-utf-8.inc.php3
+++ b/lang/french-utf-8.inc.php3
@@ -96,6 +96,7 @@ $strCreateNewTable = 'Créer une nouvelle table sur la base %s';
 $strCreatePage = 'Créer une page';
 $strCreatePdfFeat = 'Génération de schémas en PDF';
 $strCriteria = 'Critère';
+$strCvsData = 'Données CSV';
 
 $strData = 'Données';
 $strDatabase = 'Base de données';
@@ -285,6 +286,7 @@ $strPrimaryKeyWarning = '("PRIMARY" <b>doit et ne peut être</b> que le nom d\'u
 $strPrintView = 'Version imprimable';
 $strPrivileges = 'Privilèges';
 $strProperties = 'Propriétés';
+$strPutColNames = 'Afficher les noms de champ en première ligne';
 
 $strQBE = 'Requête';
 $strQBEDel = 'Effacer';
@@ -341,6 +343,7 @@ $strSelectFields = 'Choisir les champs à afficher (au moins un)';
 $strSelectNumRows = 'dans la requête';
 $strSelectTables = 'Choisissez les tables';
 $strSend = 'Transmettre';
+$strServer = 'Serveur %s';
 $strServerChoice = 'Choix du serveur';
 $strServerVersion = 'Version du serveur';
 $strSetEnumVal = 'Les différentes valeurs des champs de type enum/set sont à spécifier sous la forme \'a\',\'b\',\'c\'...<br />Pour utiliser un caractère "\\" ou "\'" dans l\'une de ces valeurs, faites le précéder du caractère d\'échappement "\\" (par exemple \'\\\\xyz\' ou \'a\\\'b\').';
@@ -412,6 +415,7 @@ $strUsers = 'Utilisateurs et privilèges';
 $strUseTables = 'Utiliser les tables';
 
 $strValidateSQL = 'Valider SQL';
+$strValidatorError = 'Le validateur SQL n\'a pas pu être initialisé. Vérifiez que les extensions PHP nécessaires ont bien été installées (voir la %sdocumentation%s).';
 $strValue = 'Valeur';
 $strViewDump = '<b>Afficher le schéma</b> de la table';
 $strViewDumpDB = 'Afficher le schéma de la base ';
@@ -427,7 +431,4 @@ $strYes = 'Oui';
 $strZip = '"zippé"';
 
 // To translate
-$strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
-
-$strServer = 'Server %s';  //to translate
 ?>
diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3
index 043cae35c..4cdec1e9c 100644
--- a/lang/galician-iso-8859-1.inc.php3
+++ b/lang/galician-iso-8859-1.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3
index 75da4d631..73a23a6d4 100644
--- a/lang/galician-utf-8.inc.php3
+++ b/lang/galician-utf-8.inc.php3
@@ -436,4 +436,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3
index 336091e8b..3052e3854 100644
--- a/lang/georgian-utf-8.inc.php3
+++ b/lang/georgian-utf-8.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3
index 6d8ef8137..4562dc871 100644
--- a/lang/german-iso-8859-1.inc.php3
+++ b/lang/german-iso-8859-1.inc.php3
@@ -436,4 +436,6 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3
index 2defa347c..bd4ffac32 100644
--- a/lang/german-utf-8.inc.php3
+++ b/lang/german-utf-8.inc.php3
@@ -437,4 +437,6 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3
index 1930706b4..21f8cdc59 100644
--- a/lang/greek-iso-8859-7.inc.php3
+++ b/lang/greek-iso-8859-7.inc.php3
@@ -446,4 +446,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3
index ed5437ff7..862e92f46 100644
--- a/lang/greek-utf-8.inc.php3
+++ b/lang/greek-utf-8.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3
index 65bcb53d7..5bcd0415a 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php3
+++ b/lang/hebrew-iso-8859-8-i.inc.php3
@@ -444,4 +444,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3
index f537e4c10..865870895 100644
--- a/lang/hindi-utf-8.inc.php3
+++ b/lang/hindi-utf-8.inc.php3
@@ -457,4 +457,6 @@ $strWebServerUploadDirectoryError = 'The directory you set for upload work canno
 
 $strZip = '"zipped"' ;  //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3
index 2613d9ff6..07e989393 100644
--- a/lang/hungarian-iso-8859-2.inc.php3
+++ b/lang/hungarian-iso-8859-2.inc.php3
@@ -432,4 +432,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3
index a6736c7cc..8c3c72791 100644
--- a/lang/hungarian-utf-8.inc.php3
+++ b/lang/hungarian-utf-8.inc.php3
@@ -433,4 +433,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3
index 19b87b29a..271aa0731 100644
--- a/lang/indonesian-iso-8859-1.inc.php3
+++ b/lang/indonesian-iso-8859-1.inc.php3
@@ -430,4 +430,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3
index 66f3689cc..081baa339 100644
--- a/lang/indonesian-utf-8.inc.php3
+++ b/lang/indonesian-utf-8.inc.php3
@@ -431,4 +431,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3
index 674583271..026023fad 100644
--- a/lang/italian-iso-8859-1.inc.php3
+++ b/lang/italian-iso-8859-1.inc.php3
@@ -434,4 +434,6 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3
index 1a2e7521d..f017734bf 100644
--- a/lang/italian-utf-8.inc.php3
+++ b/lang/italian-utf-8.inc.php3
@@ -435,4 +435,6 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3
index 00cc8aa2f..c64758291 100644
--- a/lang/japanese-euc.inc.php3
+++ b/lang/japanese-euc.inc.php3
@@ -437,4 +437,6 @@ $strYes = '
 
 $strZip = '"zip¤µ¤ì¤ë"';
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3
index 4fd01219c..cae496e15 100644
--- a/lang/japanese-sjis.inc.php3
+++ b/lang/japanese-sjis.inc.php3
@@ -436,4 +436,6 @@ $strYes = '
 
 $strZip = '"zip‚³‚ê‚é"';
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3
index 560d95b53..b282bf824 100644
--- a/lang/japanese-utf-8.inc.php3
+++ b/lang/japanese-utf-8.inc.php3
@@ -438,4 +438,6 @@ $strYes = '��';
 
 $strZip = '"zip�れる"';
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3
index 496a31365..ce21ffa28 100644
--- a/lang/korean-ks_c_5601-1987.inc.php3
+++ b/lang/korean-ks_c_5601-1987.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3
index 29c4f7009..3dba04c6d 100644
--- a/lang/latvian-utf-8.inc.php3
+++ b/lang/latvian-utf-8.inc.php3
@@ -448,4 +448,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3
index 5f64f0323..7384d67d8 100644
--- a/lang/latvian-windows-1257.inc.php3
+++ b/lang/latvian-windows-1257.inc.php3
@@ -447,4 +447,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3
index bb40834b6..5bac3a033 100644
--- a/lang/lithuanian-utf-8.inc.php3
+++ b/lang/lithuanian-utf-8.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3
index d1b792158..da6ab2ffa 100644
--- a/lang/lithuanian-windows-1257.inc.php3
+++ b/lang/lithuanian-windows-1257.inc.php3
@@ -434,4 +434,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3
index 9920d9c67..8ac15a656 100644
--- a/lang/malay-iso-8859-1.inc.php3
+++ b/lang/malay-iso-8859-1.inc.php3
@@ -449,4 +449,6 @@ $strZip = '"zipped"';
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3
index 601e71b8b..005beac4f 100644
--- a/lang/malay-utf-8.inc.php3
+++ b/lang/malay-utf-8.inc.php3
@@ -450,4 +450,6 @@ $strZip = '"zipped"';
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3
index e8d89ef18..17c529949 100644
--- a/lang/norwegian-iso-8859-1.inc.php3
+++ b/lang/norwegian-iso-8859-1.inc.php3
@@ -433,4 +433,6 @@ $strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3
index ef46b447b..c533d24f7 100644
--- a/lang/norwegian-utf-8.inc.php3
+++ b/lang/norwegian-utf-8.inc.php3
@@ -434,4 +434,6 @@ $strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3
index 07ff85126..8522e281f 100644
--- a/lang/polish-iso-8859-2.inc.php3
+++ b/lang/polish-iso-8859-2.inc.php3
@@ -428,4 +428,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3
index f50fe731b..cb125eb3b 100644
--- a/lang/polish-utf-8.inc.php3
+++ b/lang/polish-utf-8.inc.php3
@@ -429,4 +429,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3
index e6555d875..288b6f08e 100644
--- a/lang/portuguese-iso-8859-1.inc.php3
+++ b/lang/portuguese-iso-8859-1.inc.php3
@@ -439,4 +439,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3
index 6790bf139..ce041bdc2 100644
--- a/lang/portuguese-utf-8.inc.php3
+++ b/lang/portuguese-utf-8.inc.php3
@@ -440,4 +440,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3
index fecd225e8..de2de5aae 100644
--- a/lang/romanian-iso-8859-1.inc.php3
+++ b/lang/romanian-iso-8859-1.inc.php3
@@ -428,4 +428,6 @@ $strZip = '"arhivat"';
 // To translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3
index f681acf09..5ed4e62dd 100644
--- a/lang/romanian-utf-8.inc.php3
+++ b/lang/romanian-utf-8.inc.php3
@@ -429,4 +429,6 @@ $strZip = '"arhivat"';
 // To translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3
index be48951d3..0d613dc50 100644
--- a/lang/russian-koi8-r.inc.php3
+++ b/lang/russian-koi8-r.inc.php3
@@ -438,4 +438,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3
index 0ffde822c..50aa42f24 100644
--- a/lang/russian-utf-8.inc.php3
+++ b/lang/russian-utf-8.inc.php3
@@ -439,4 +439,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3
index 19c724ef9..b1819f3dc 100644
--- a/lang/russian-windows-1251.inc.php3
+++ b/lang/russian-windows-1251.inc.php3
@@ -438,4 +438,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3
index 17ed98046..47f870f04 100644
--- a/lang/serbian-utf-8.inc.php3
+++ b/lang/serbian-utf-8.inc.php3
@@ -450,4 +450,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3
index aa21dc831..169de1cc2 100644
--- a/lang/serbian-windows-1250.inc.php3
+++ b/lang/serbian-windows-1250.inc.php3
@@ -449,4 +449,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3
index 30eab97ca..235c4b218 100644
--- a/lang/slovak-iso-8859-2.inc.php3
+++ b/lang/slovak-iso-8859-2.inc.php3
@@ -430,4 +430,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3
index cb097ac33..60f7a461d 100644
--- a/lang/slovak-utf-8.inc.php3
+++ b/lang/slovak-utf-8.inc.php3
@@ -431,4 +431,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3
index 4f505f29f..0ca82ab6e 100644
--- a/lang/slovak-windows-1250.inc.php3
+++ b/lang/slovak-windows-1250.inc.php3
@@ -430,4 +430,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3
index 300d37e3f..e7f95ace7 100644
--- a/lang/slovenian-iso-8859-2.inc.php3
+++ b/lang/slovenian-iso-8859-2.inc.php3
@@ -432,4 +432,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3
index a7a57141e..ff468c329 100644
--- a/lang/slovenian-utf-8.inc.php3
+++ b/lang/slovenian-utf-8.inc.php3
@@ -433,4 +433,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3
index 24fa995d7..aa9b60a8e 100644
--- a/lang/slovenian-windows-1250.inc.php3
+++ b/lang/slovenian-windows-1250.inc.php3
@@ -432,4 +432,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3
index 4d82a73ec..e6fbd8003 100644
--- a/lang/spanish-iso-8859-1.inc.php3
+++ b/lang/spanish-iso-8859-1.inc.php3
@@ -429,4 +429,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3
index 273ab3483..d0b5e882d 100644
--- a/lang/spanish-utf-8.inc.php3
+++ b/lang/spanish-utf-8.inc.php3
@@ -430,4 +430,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3
index f3df869f2..16149f7bd 100644
--- a/lang/swedish-iso-8859-1.inc.php3
+++ b/lang/swedish-iso-8859-1.inc.php3
@@ -429,4 +429,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3
index 8fccac503..000f48394 100644
--- a/lang/swedish-utf-8.inc.php3
+++ b/lang/swedish-utf-8.inc.php3
@@ -430,4 +430,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3
index d17f99a1d..a01663dda 100644
--- a/lang/thai-tis-620.inc.php3
+++ b/lang/thai-tis-620.inc.php3
@@ -430,4 +430,6 @@ $strYes = '
 $strZip = '"¶Ù¡ºÕºÍÑ´ÍÂÙè (zip)"';
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3
index adb1e1877..4aa796dd8 100644
--- a/lang/thai-utf-8.inc.php3
+++ b/lang/thai-utf-8.inc.php3
@@ -431,4 +431,6 @@ $strYes = 'ใช่';
 $strZip = '"ถู�บีบอัดอยู่ (zip)"';
 
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3
index d80bcb4dd..7ef7435eb 100644
--- a/lang/turkish-iso-8859-9.inc.php3
+++ b/lang/turkish-iso-8859-9.inc.php3
@@ -435,4 +435,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3
index 3203a0280..0bfe0e80d 100644
--- a/lang/turkish-utf-8.inc.php3
+++ b/lang/turkish-utf-8.inc.php3
@@ -436,4 +436,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3
index 629d9607d..b78a3a8eb 100644
--- a/lang/ukrainian-utf-8.inc.php3
+++ b/lang/ukrainian-utf-8.inc.php3
@@ -438,4 +438,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3
index ee07729de..4347a6945 100644
--- a/lang/ukrainian-windows-1251.inc.php3
+++ b/lang/ukrainian-windows-1251.inc.php3
@@ -437,4 +437,6 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 $strServer = 'Server %s';  //to translate
+$strCvsData = 'CSV data';  //to translate
+$strPutColNames = 'Put fields names at first row';  //to translate
 ?>
diff --git a/libraries/build_dump.lib.php3 b/libraries/build_dump.lib.php3
index f6d3f762c..15ae15d71 100644
--- a/libraries/build_dump.lib.php3
+++ b/libraries/build_dump.lib.php3
@@ -503,6 +503,24 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
             $add_query  = '';
         }
 
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['showcsvnames']) && $GLOBALS['showcsvnames'] == 'yes') {
+            $schema_insert = '';
+            $local_query   = 'SHOW COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db);
+            $result        = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url);
+            while ($row = PMA_mysql_fetch_array($result)) {
+                if ($enc_by == '') {
+                    $schema_insert .= $row['Field'];
+                } else {
+                    $schema_insert .= $enc_by
+                                   . str_replace($enc_by, $esc_by . $enc_by, $row['Field'])
+                                   . $enc_by;
+                }
+                $schema_insert     .= $sep;
+            } // end while
+            $handler(trim(substr($schema_insert, 0, -1)));
+        } // end if
+
         // Gets the data from the database
         $local_query = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
         $result      = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url);
diff --git a/tbl_properties_export.php3 b/tbl_properties_export.php3
index 3fecee6e5..4aa243728 100755
--- a/tbl_properties_export.php3
+++ b/tbl_properties_export.php3
@@ -84,6 +84,12 @@ echo "\n";
             <label for="checkbox_dump_extended_ins"><?php echo $strExtendedInserts; ?></label><br />
             &nbsp;&nbsp;
             <?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . PMA_countRecords($db, $table, TRUE) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" />') . "\n"; ?>
+            <br /><br />
+            <!-- For CSV data -->
+            <?php echo $strCvsData; ?><br />
+            &nbsp;&nbsp;
+            <input type="checkbox" name="showcsvnames" value="yes" id="checkbox_dump_showcsvnames" />
+            <label for="checkbox_dump_showcsvnames"><?php echo $strPutColNames; ?></label>
         </td>
     </tr>