diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:23:10 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:23:10 +0100 |
commit | fd70ceb017b13db3faf54fa43df850c1b82abedb (patch) | |
tree | 55c547a55b349e83db32a357a48040769027fd32 /system/language/english/upload_lang.php | |
parent | 5f2214f0526b823c92f308312d883147a4c9faed (diff) | |
parent | 55201acd0692f02eb5927f412db73b925b6ba738 (diff) |
Merge upstream branch
Diffstat (limited to 'system/language/english/upload_lang.php')
-rw-r--r-- | system/language/english/upload_lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php index a9a2fe74b..4fa8394ec 100644 --- a/system/language/english/upload_lang.php +++ b/system/language/english/upload_lang.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -35,7 +35,7 @@ $lang['upload_stopped_by_extension'] = "The file upload was stopped by extension $lang['upload_no_file_selected'] = "You did not select a file to upload."; $lang['upload_invalid_filetype'] = "The filetype you are attempting to upload is not allowed."; $lang['upload_invalid_filesize'] = "The file you are attempting to upload is larger than the permitted size."; -$lang['upload_invalid_dimensions'] = "The image you are attempting to upload exceedes the maximum height or width."; +$lang['upload_invalid_dimensions'] = "The image you are attempting to upload exceeds the maximum height or width."; $lang['upload_destination_error'] = "A problem was encountered while attempting to move the uploaded file to the final destination."; $lang['upload_no_filepath'] = "The upload path does not appear to be valid."; $lang['upload_no_file_types'] = "You have not specified any allowed file types."; |