diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-15 19:55:38 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-15 19:55:38 -0400 |
| commit | b876a1ff2063f1bcc88d35500643b0ec78ba9beb (patch) | |
| tree | ca812c8f3930416168607f41d5316111d872a9d5 | |
| parent | ec7ec9ecaceeb5c0345e9df676479aea06b09620 (diff) | |
| parent | e327baaa8943349a439b4152461e84a3a4649c4f (diff) | |
| download | forums-b876a1ff2063f1bcc88d35500643b0ec78ba9beb.tar forums-b876a1ff2063f1bcc88d35500643b0ec78ba9beb.tar.gz forums-b876a1ff2063f1bcc88d35500643b0ec78ba9beb.tar.bz2 forums-b876a1ff2063f1bcc88d35500643b0ec78ba9beb.tar.xz forums-b876a1ff2063f1bcc88d35500643b0ec78ba9beb.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10208] Explain what happens when 'Warning duration' is set to 0.
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 6044197cc0..abf346137d 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 |