MDL-18535:

Adding checks for field name mismatches and "proper" error messages.

Merged from STABLE_19

diff --git a/lang/en_utf8/data.php b/lang/en_utf8/data.php
index afa55d9c28abc8e86e768f751b94b9f17a87fc4e..823fcc75f6c2236ac45f45bdac9058112779c1c8 100644 (file)
--- a/lang/en_utf8/data.php
+++ b/lang/en_utf8/data.php
@@ -47,9 +47,10 @@ $string['configenablerssfeeds'] = 'This switch will enable the possibility of RS
 $string['confirmdeletefield'] = 'You are about to delete this field, are you sure?';
 $string['confirmdeleterecord'] = 'Are you sure you want to delete this entry?';
 $string['csstemplate'] = 'CSS template';
+$string['csvfailed'] = 'Unable to read the raw data from the CSV file';
 $string['csvfile'] = 'CSV file';
-$string['csvwithselecteddelimiter'] = '<acronym title=\"Comma Separated Values\">CSV</acronym> text with selected delimiter:';
 $string['csvimport'] = 'CSV file import';
+$string['csvwithselecteddelimiter'] = '<acronym title=\"Comma Separated Values\">CSV</acronym> text with selected delimiter:';
 $string['data:approve'] = 'Approve unapproved entries';
 $string['data:comment'] = 'Write comments';
 $string['data:exportentry'] = 'Export a database entry';
@@ -114,6 +115,7 @@ $string['fieldname'] = 'Field name';
 $string['fieldoptions'] = 'Options (one per line)';
 $string['fields'] = 'Fields';
 $string['fieldids'] = 'Field ids';
+$string['fieldnotmatched'] = 'The following fields in your file are not known in this database: $a';
 $string['fieldupdated'] = 'Field updated';
 $string['fieldwidth'] = 'Width';
 $string['fieldwidthlistview'] = 'Width in list view';