aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2011-11-17 17:32:56 +0000
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:22 +0200
commitf9ddeacd8e25f74845704d1186dbc4edde6a71d7 (patch)
tree6fe380ba4990449e2c2da12785a4e04a97ff09ce /phpBB/language/en
parent7e88dd0ba63d4322da480c46c4826e8dd174a8be (diff)
downloadforums-f9ddeacd8e25f74845704d1186dbc4edde6a71d7.tar
forums-f9ddeacd8e25f74845704d1186dbc4edde6a71d7.tar.gz
forums-f9ddeacd8e25f74845704d1186dbc4edde6a71d7.tar.bz2
forums-f9ddeacd8e25f74845704d1186dbc4edde6a71d7.tar.xz
forums-f9ddeacd8e25f74845704d1186dbc4edde6a71d7.zip
[ticket/10272] Renamed l-err-processing-req to l-timeout-processing-req.
PHPBB3-10272
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index ff3d229915..4983aaca69 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -179,7 +179,6 @@ $lang = array_merge($lang, array(
'ERR_CONNECTING_SERVER' => 'Error connecting to the server.',
'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.',
'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.',
- 'ERR_PROCESSING_REQ' => 'There was an error processing your request. Please try again.',
'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.',
'ERR_UNWATCHING' => 'An error occured while trying to unsubscribe.',
'ERR_WATCHING' => 'An error occured while trying to subscribe.',
@@ -601,6 +600,7 @@ $lang = array_merge($lang, array(
'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team',
'TIME' => 'Time',
+ 'TIMEOUT_PROCESSING_REQ' => 'Request timed out.',
'TOO_LARGE' => 'The value you entered is too large.',
'TOO_LARGE_MAX_RECIPIENTS' => 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too large.',