aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-11-14 20:37:17 -0500
committerSteve Clay <steve@mrclay.org>2012-11-14 20:37:17 -0500
commitde4cacceb3b9bc6b844a94494183a24a920e87e6 (patch)
treee0b7494b6f76ce7405292c7cfd4f2dc0862a02ea
parente079e1d433796ffd531700db0f96dfeffb940312 (diff)
parent72c444e03c02d0e77af1d2717d933cdc6e9b2175 (diff)
downloadelgg-de4cacceb3b9bc6b844a94494183a24a920e87e6.tar.gz
elgg-de4cacceb3b9bc6b844a94494183a24a920e87e6.tar.bz2
Merge branch 'pr-427' into 1.8
-rw-r--r--languages/en.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index bb5376a44..62b35dd81 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -229,6 +229,7 @@ $english = array(
'LoginException:PasswordFailure' => 'We could not log you in. Please check your username/email and password.',
'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
'LoginException:ChangePasswordFailure' => 'Failed current password check.',
+ 'LoginException:Unknown' => 'We could not log you in due to an unknown error.',
'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',