diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-20 14:51:05 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-20 14:51:05 -0500 |
| commit | fd4043526d9008de30ee82b4ea38efaef01796d0 (patch) | |
| tree | befb34873a75fd80ce79ba0a066e757c3c04da56 /phpBB/language/en/common.php | |
| parent | 778658f7876db462fdc37fdfa91c02ad0c4baea1 (diff) | |
| parent | 67053d0b4efdffa12ba6dce40a0f556a9f88f46c (diff) | |
| download | forums-fd4043526d9008de30ee82b4ea38efaef01796d0.tar forums-fd4043526d9008de30ee82b4ea38efaef01796d0.tar.gz forums-fd4043526d9008de30ee82b4ea38efaef01796d0.tar.bz2 forums-fd4043526d9008de30ee82b4ea38efaef01796d0.tar.xz forums-fd4043526d9008de30ee82b4ea38efaef01796d0.zip | |
Merge remote-tracking branch 'remotes/cyberalien/ticket/11279' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11279:
[ticket/11279] Log error in console
[ticket/11279] Clearer AJAX errors
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 47a77d1dee..6e1782d551 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -70,6 +70,9 @@ $lang = array_merge($lang, array( 'AIM' => 'AIM', 'AJAX_ERROR_TITLE' => 'AJAX error', 'AJAX_ERROR_TEXT' => 'Something went wrong when processing your request.', + 'AJAX_ERROR_TEXT_ABORT' => 'User aborted request.', + 'AJAX_ERROR_TEXT_TIMEOUT' => 'Your request timed out; please try again.', + 'AJAX_ERROR_TEXT_PARSERERROR' => 'Something went wrong with the request and the server returned an invalid reply.', 'ALLOWED' => 'Allowed', 'ALL_FILES' => 'All files', 'ALL_FORUMS' => 'All forums', |