diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
| commit | f0176b53934e78b830b890ef46c1e8e7c233bee4 (patch) | |
| tree | 9fc72119ba4003f15b06cd6cfd15d66790f6828f /phpBB/language | |
| parent | 6f122d688660adbdb6284625c499216da3bf5ebf (diff) | |
| parent | e83c6cb61dcac9c8460e0e8fd22cb2f3324fb248 (diff) | |
| download | forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.gz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.bz2 forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.xz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.zip | |
Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
[ticket/12150] Use correct license URL in prune shadow migrations file
[ticket/12150] Remove 'after' for columns from migrations file
[ticket/12150] Update schema files for prune shadow topics
[ticket/12150] Use log service instead of add_log() function
[ticket/12150] Use shorter column names for prune settings
[ticket/12150] Add functional tests for pruning shadow topics
[ticket/12150] Add missing space to query for shadow topics
[ticket/12150] Add missing prune settings variables in acp_forums
[ticket/12150] Add file and caller for pruning shadow topics
[ticket/12150] Add prune columns to schema files and migration file
[ticket/12150] Add options to acp
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index cf32c7c225..2dc58d8361 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -676,6 +676,7 @@ $lang = array_merge($lang, array( 'LOG_PRUNE' => '<strong>Pruned forums</strong><br />» %s', 'LOG_AUTO_PRUNE' => '<strong>Auto-pruned forums</strong><br />» %s', + 'LOG_PRUNE_SHADOW' => '<strong>Auto-pruned shadow topics</strong><br />» %s', 'LOG_PRUNE_USER_DEAC' => '<strong>Users deactivated</strong><br />» %s', 'LOG_PRUNE_USER_DEL_DEL' => '<strong>Users pruned and posts deleted</strong><br />» %s', 'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 756cb7ae0f..d64380b6b6 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -101,6 +101,8 @@ $lang = array_merge($lang, array( 'FORUM_PASSWORD_OLD' => 'The forum password is using an old hashing method and should be changed.', 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings', + 'FORUM_PRUNE_SHADOW' => 'Enable auto-pruning of shadow topics', + 'FORUM_PRUNE_SHADOW_EXPLAIN' => 'Prunes the forum of shadow topics, set the frequency/age parameters below.', 'FORUM_RESYNCED' => 'Forum “%s” successfully resynced', 'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.', 'FORUM_RULES_LINK' => 'Link to forum rules', |