aboutsummaryrefslogtreecommitdiff
path: root/languages/en.php
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2012-12-16 17:32:01 -0500
committerBrett Profitt <brett.profitt@gmail.com>2012-12-16 17:32:01 -0500
commitcc0f1ddad2fac1d1761d59a818f1c41d7db6ed0d (patch)
tree322d7a5e3104a17b64d65a12ce1478a14ced4cb1 /languages/en.php
parentd719d03f1b0e636db021e728cf79a10176d991da (diff)
parent22e8d9be4582b78a500382e14046a653a14e3f43 (diff)
downloadelgg-cc0f1ddad2fac1d1761d59a818f1c41d7db6ed0d.tar.gz
elgg-cc0f1ddad2fac1d1761d59a818f1c41d7db6ed0d.tar.bz2
Merge branch 'pr-309' into 1.8
Diffstat (limited to 'languages/en.php')
-rw-r--r--languages/en.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index 2b5ba00fd..f3acc50ee 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1055,6 +1055,10 @@ Once you have logged in, we highly recommend that you change your password.
'upgrading' => 'Upgrading...',
'upgrade:db' => 'Your database was upgraded.',
'upgrade:core' => 'Your Elgg installation was upgraded.',
+ 'upgrade:unlock' => 'Unlock upgrade',
+ 'upgrade:unlock:confirm' => "The database is locked for another upgrade. Running concurrent upgrades is dangerous. You should only continue if you know there is not another upgrade running. Unlock?",
+ 'upgrade:locked' => "Cannot upgrade. Another upgrade is running. To clear the upgrade lock, visit the Admin section.",
+ 'upgrade:unlock:success' => "Upgrade unlocked suscessfully.",
'upgrade:unable_to_upgrade' => 'Unable to upgrade.',
'upgrade:unable_to_upgrade_info' =>
'This installation cannot be upgraded because legacy views