Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle

This commit is contained in:
Sam Hemelryk
2012-10-08 11:18:54 +13:00
@@ -34,4 +34,4 @@ $string['upload_error_no_file'] = 'No file was uploaded.';
$string['upload_error_no_tmp_dir'] = 'PHP is missing a temporary folder.';
$string['upload_error_cant_write'] = 'Failed to write file to disk.';
$string['upload_error_extension'] = 'A PHP extension stopped the file upload.';
$string['upload_error_invalid_file'] = 'The file \'{$a}\' has no data in it - did you try to upload a folder?';
$string['upload_error_invalid_file'] = 'The file \'{$a}\' is either empty or a folder. To upload folders zip them first.';