aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-06-23 20:35:36 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-06-23 20:35:36 +0200
commit8817b5937747f0b82e180bd3ce7d38b8aa68577e (patch)
tree1eec732bcc2809f1bc34ac728407e3288d6066f6 /phpBB/language/en
parent0499655ba4448fd2ae232d82bd78b47809e56591 (diff)
downloadforums-8817b5937747f0b82e180bd3ce7d38b8aa68577e.tar
forums-8817b5937747f0b82e180bd3ce7d38b8aa68577e.tar.gz
forums-8817b5937747f0b82e180bd3ce7d38b8aa68577e.tar.bz2
forums-8817b5937747f0b82e180bd3ce7d38b8aa68577e.tar.xz
forums-8817b5937747f0b82e180bd3ce7d38b8aa68577e.zip
[ticket/12755] Add language string for timed out remote upload
PHPBB3-12755
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php1
-rw-r--r--phpBB/language/en/posting.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index cc38804fe2..2d3710e15c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -88,6 +88,7 @@ $lang = array_merge($lang, array(
'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_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 df411c3228..5316011f4e 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -178,6 +178,7 @@ $lang = array_merge($lang, array(
'QUOTE_DEPTH_EXCEEDED' => 'You may embed only %1$d quotes within each other.',
+ 'REMOTE_UPLOAD_TIMEOUT' => 'The specified file could not be uploaded because the request timed out.',
'SAVE' => 'Save',
'SAVE_DATE' => 'Saved at',
'SAVE_DRAFT' => 'Save draft',