aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-05-16 11:27:25 -0400
committerSteve Clay <steve@mrclay.org>2012-05-16 11:27:25 -0400
commit7c0215018897bfb578e6116ef9d36e5edc1fe5cf (patch)
tree79902b31740608a091045f31d32d368ac6b2b70e /languages
parent40d35166d3f2211ab76943834a983330413ab761 (diff)
downloadelgg-7c0215018897bfb578e6116ef9d36e5edc1fe5cf.tar.gz
elgg-7c0215018897bfb578e6116ef9d36e5edc1fe5cf.tar.bz2
Fixes #2411: Show message when upload exceeds PHP limits, and show limits in Server Info
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index 7b51b0c7d..ff730a018 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -741,6 +741,9 @@ $english = array(
'admin:server:label:mem_avail' => 'Memory available',
'admin:server:label:mem_used' => 'Memory used',
'admin:server:error_log' => "Web server's error log",
+ 'admin:server:label:post_max_size' => 'POST maximum size',
+ 'admin:server:label:upload_max_filesize' => 'Upload maximum size',
+ 'admin:server:warning:post_max_too_small' => '(Note: <code>post_max_size</code> must be larger than this value to support uploads of this size)',
'admin:user:label:search' => "Find users:",
'admin:user:label:searchbutton' => "Search",
@@ -1171,6 +1174,7 @@ You cannot reply to this email.",
'actiongatekeeper:tokeninvalid' => "We encountered an error (token mismatch). This probably means that the page you were using expired.",
'actiongatekeeper:timeerror' => 'The page you were using has expired. Please refresh and try again.',
'actiongatekeeper:pluginprevents' => 'A extension has prevented this form from being submitted.',
+ 'actiongatekeeper:uploadexceeded' => 'The size of file(s) uploaded exceeded the limit set by your site administrator',
/**