1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

Merge PR #1004 branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11131] Correctly use indefinite article for "warning".
This commit is contained in:
Oleg Pudeyev 2012-10-09 19:41:25 -04:00
commit 3fa0ab7073

View File

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