Show
Ignore:
Timestamp:
06/29/10 20:42:11 (3 years ago)
Author:
plg
Message:

merge r6624 from branch 2.1 to trunk

bug 1747 fixed: some checks were added to verify the upload will fail for a
too big size or if the upload has failed for a too big size (test on
upload_max_filesize and post_max_size)

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/language/en_UK/admin.lang.php

    r6419 r6625  
    758758$lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated'; 
    759759$lang['Pending Comments'] = 'Pending Comments'; 
     760$lang['In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'] = 'In your php.ini file, the upload_max_filesize (%sB) is bigger than post_max_size (%sB), you should change this setting'; 
     761$lang['Exif extension not available, admin should disable exif use'] = 'Exif extension not available, admin should disable exif use'; 
     762$lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'; 
     763$lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] = 'The uploaded files exceed the post_max_size directive in php.ini: %sB'; 
     764$lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'; 
     765$lang['The uploaded file was only partially uploaded'] = 'The uploaded file was only partially uploaded'; 
     766$lang['No file was uploaded'] = 'No file was uploaded'; 
     767$lang['Missing a temporary folder'] = 'Missing a temporary folder'; 
     768$lang['Failed to write file to disk'] = 'Failed to write file to disk'; 
     769$lang['File upload stopped by extension'] = 'File upload stopped by extension'; 
     770$lang['Unknown upload error'] = 'Unknown upload error'; 
     771$lang['Error on file "%s" : %s'] = 'Error on file "%s" : %s'; 
    760772?>