aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-09-09 10:43:12 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 10:43:12 +0200
commit70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f (patch)
tree2532298ac7bad2350af768a29d67bdc333cb2d8f /phpBB/language/en
parent327e36a4d68ff9607967af52ef8f6a00c60343ff (diff)
downloadforums-70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f.tar
forums-70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f.tar.gz
forums-70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f.tar.bz2
forums-70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f.tar.xz
forums-70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f.zip
[ticket/13904] Add language entries for error messages in upload class
PHPBB3-13904
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/posting.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 292d30dd1c..8e5ab53b0e 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -105,11 +105,13 @@ $lang = array_merge($lang, array(
'AVATAR_EMPTY_FILEUPLOAD' => 'The uploaded avatar file is empty.',
'AVATAR_INVALID_FILENAME' => '%s is an invalid filename.',
'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.',
+ 'AVATAR_NO_TEMP_DIR' => 'Temporary folder could not be found or is not writable.',
'AVATAR_NO_SIZE' => 'The width or height of the linked avatar could not be determined. Please enter them manually.',
'AVATAR_PARTIAL_UPLOAD' => 'The specified file was only partially uploaded.',
'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />The maximum allowed filesize set in php.ini could not be determined.',
'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
'AVATAR_REMOTE_UPLOAD_TIMEOUT' => 'The specified avatar could not be uploaded because the request timed out.',
+ 'AVATAR_PHP_UPLOAD_STOPPED' => 'A PHP extension has stopped the file upload.',
'AVATAR_URL_INVALID' => 'The URL you specified is invalid.',
'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.',
'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1$d %2$s.',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 924395ed44..0e2d706f19 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -176,8 +176,10 @@ $lang = array_merge($lang, array(
'NO_POLL_TITLE' => 'You have to enter a poll title.',
'NO_POST' => 'The requested post does not exist.',
'NO_POST_MODE' => 'No post mode specified.',
+ 'NO_TEMP_DIR' => 'Temporary folder could not be found or is not writable.',
'PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded.',
+ 'PHP_UPLOAD_STOPPED' => 'A PHP extension has stopped the file upload.',
'PHP_SIZE_NA' => 'The attachment’s file size is too large.<br />Could not determine the maximum size defined by PHP in php.ini.',
'PHP_SIZE_OVERRUN' => 'The attachment’s file size is too large, the maximum upload size is %1$d %2$s.<br />Please note this is set in php.ini and cannot be overridden.',
'PLACE_INLINE' => 'Place inline',