aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-05 11:21:40 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-05 11:21:40 +0100
commitb4bbc7056aed232dc7056103094843da8bfc2da2 (patch)
treed024240e76601bc9ef35dde5c69aa4c27f52840d /phpBB/language
parentcfd0ec7e09514d6bcc80b73cd323ced442ff4f49 (diff)
parent762b383d2b7b6784d19fac888dab5798fdeacc7f (diff)
downloadforums-b4bbc7056aed232dc7056103094843da8bfc2da2.tar
forums-b4bbc7056aed232dc7056103094843da8bfc2da2.tar.gz
forums-b4bbc7056aed232dc7056103094843da8bfc2da2.tar.bz2
forums-b4bbc7056aed232dc7056103094843da8bfc2da2.tar.xz
forums-b4bbc7056aed232dc7056103094843da8bfc2da2.zip
Merge pull request #4005 from Elsensee/ticket/14257
[ticket/14257] Reparse after update * Elsensee/ticket/14257: [ticket/14257] Add tests for reparser manager [ticket/14257] Fix CLI reparser and set cron interval [ticket/14257] Fix CLI error message [ticket/14257] Fix phpdoc in CLI command [ticket/14257] Add text_reparser manager [ticket/14257] Use migrations instead of cron job for some reparsers [ticket/14257] Fix lock acquire in CLI command [ticket/14257] Fix if condition [ticket/14257] Add reparse_lock to CLI command [ticket/14257] Add cron tasks for reparsing text
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 1a6168b63f..a1e2d1ef40 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -292,6 +292,7 @@ $lang = array_merge($lang, array(
'RELEASE_ANNOUNCEMENT' => 'Announcement',
'REMIND' => 'Remind',
+ 'REPARSE_LOCK_ERROR' => 'Reparsing is already in progress by another process.',
'RESYNC' => 'Resynchronise',
'RUNNING_TASK' => 'Running task: %s.',