aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-07-15 19:55:02 -0400
committerNils Adermann <naderman@naderman.de>2011-07-15 19:55:02 -0400
commite327baaa8943349a439b4152461e84a3a4649c4f (patch)
treeb815dfb856569f0f4c716066a315155682da50b1
parent1ace10ab92a19a56bcbfda665c3bd154fd5a1c2c (diff)
parent2bba22e9d32785c4f998a39ab008a7551e7b9928 (diff)
downloadforums-e327baaa8943349a439b4152461e84a3a4649c4f.tar
forums-e327baaa8943349a439b4152461e84a3a4649c4f.tar.gz
forums-e327baaa8943349a439b4152461e84a3a4649c4f.tar.bz2
forums-e327baaa8943349a439b4152461e84a3a4649c4f.tar.xz
forums-e327baaa8943349a439b4152461e84a3a4649c4f.zip
Merge remote-tracking branch 'github-bantu/ticket/10208' into develop-olympus
* github-bantu/ticket/10208: [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0254bff992..5a9ca6231d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -53,7 +53,7 @@ $lang = array_merge($lang, array(
'SYSTEM_TIMEZONE' => 'Guest timezone',
'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
'WARNINGS_EXPIRE' => 'Warning duration',
- 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
+ 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a user’s record. Set this value to 0 to make warnings permanent.',
));
// Board Features