aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-20 15:53:32 -0700
committerCash Costello <cash.costello@gmail.com>2012-06-20 15:53:32 -0700
commit2826dc077c405ee0b63713d989983085ff230ac3 (patch)
treed9fa4e55822fac80d94d13500e06616821f640fb /languages
parent5023e99301cd7576ea25056b77a43576a6e36b9a (diff)
parent7e59ef7adec3b716aabc9c61c485ceb17e5d1f68 (diff)
downloadelgg-2826dc077c405ee0b63713d989983085ff230ac3.tar.gz
elgg-2826dc077c405ee0b63713d989983085ff230ac3.tar.bz2
Merge pull request #192 from jeabakker/#3405
#3405 Memcache: fault in contructor can cause site to go into English language
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/languages/en.php b/languages/en.php
index 93096df38..03e6dfa84 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -230,11 +230,6 @@ $english = array(
'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
'LoginException:ChangePasswordFailure' => 'Failed current password check.',
- 'memcache:notinstalled' => 'PHP memcache module not installed, you must install php5-memcache',
- 'memcache:noservers' => 'No memcache servers defined, please populate the $CONFIG->memcache_servers variable',
- 'memcache:versiontoolow' => 'Memcache needs at least version %s to run, you are running %s',
- 'memcache:noaddserver' => 'Multiple server support disabled, you may need to upgrade your PECL memcache library',
-
'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
'pageownerunavailable' => 'Warning: The page owner %d is not accessible!',