summaryrefslogtreecommitdiffstats
path: root/system/language
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-03-20 14:40:56 +0100
committerAndrey Andreev <narf@bofh.bg>2012-03-20 14:40:56 +0100
commit84a3b25b11da0f5b69c9a128cd79b98bfb70dc30 (patch)
treea5fd16fe0ae7b0ab3e8ee9a56683da7c3cc7225a /system/language
parent75124a53cf54f2a8c094756f9189be9159957f28 (diff)
parent820999cb0d82c80d6dc5dde133568812c8113e29 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-sst
Diffstat (limited to 'system/language')
-rw-r--r--system/language/english/upload_lang.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php
index ec5de1e6b..4fa8394ec 100644
--- a/system/language/english/upload_lang.php
+++ b/system/language/english/upload_lang.php
@@ -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.";