aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-09 22:03:18 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-09 22:03:18 -0500
commit9d955507b6314ccd52d4d7d42a6d2514f14db9f3 (patch)
treef0343160fdc43c818bb772e86ae6613179de510e /phpBB/language
parentb33e5273942c4f67e8168763eec224fd61edaa8f (diff)
parentcf810fb775407d6e6e5aa62a072b141bdb61e3c9 (diff)
downloadforums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.gz
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.bz2
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.tar.xz
forums-9d955507b6314ccd52d4d7d42a6d2514f14db9f3.zip
Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/language')
-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 a4597a1014..a4380486cc 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -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 user’s 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 user’s record. Set this value to 0 to make warnings permanent.',
));
// Board Features