aboutsummaryrefslogtreecommitdiff
path: root/languages/en.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-02 07:14:18 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-02 07:14:18 -0700
commit4abe9e6727108efd1f834a80a7942ed92cae2a52 (patch)
tree14cb4712274f343ecc1dffb277b7521b19e9db3e /languages/en.php
parentb546494ea20aad1514f4127341a303c435e0d8f4 (diff)
parent7c0215018897bfb578e6116ef9d36e5edc1fe5cf (diff)
downloadelgg-4abe9e6727108efd1f834a80a7942ed92cae2a52.tar.gz
elgg-4abe9e6727108efd1f834a80a7942ed92cae2a52.tar.bz2
Merge pull request #222 from mrclay/issue2411
Fixes #2411: Show message when upload exceeds PHP limits
Diffstat (limited to 'languages/en.php')
-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',
/**