diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 20:59:11 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-24 20:59:11 +0200 |
| commit | b5b0175d59ce32e5bd16d71d3ab1aec8435388ea (patch) | |
| tree | 768b5cb3ae9ad6a69e76aac7d87492fecb8fc70b /phpBB/language | |
| parent | 1edcfcb5020f8199860295020e5e33d030ab772b (diff) | |
| parent | 2596dbc850df86dd0d620e9d90bfd59a2f23a0eb (diff) | |
| download | forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.gz forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.bz2 forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.tar.xz forums-b5b0175d59ce32e5bd16d71d3ab1aec8435388ea.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12755] Apply de morgan to conditional
[ticket/12755] Terminate upload loop if upload reaches filesize
[ticket/12755] Change upload in remote_upload() method to fit get_remote_file
[ticket/12755] Add language string for timed out remote upload
[ticket/12755] Add timeout to remote upload to prevent infinite loop
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 68b8b594c4..b9eb0fd11d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -109,6 +109,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 e8a8643cfd..31d49e8bdf 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -225,6 +225,7 @@ $lang = array_merge($lang, array( ), 'QUOTE_NO_NESTING' => 'You may not embed 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', |