Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10208] Explain what happens when 'Warning duration' is set to 0.
This commit is contained in:
Nils Adermann 2011-07-15 19:55:38 -04:00
commit b876a1ff20

View file

@ -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 users record.',
'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a users record. Set this value to 0 to make warnings permanent.',
));
// Board Features