diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 21:51:07 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 21:51:07 -0500 |
| commit | 052bbf654f4c1f60b58a622250ef97bc1e036426 (patch) | |
| tree | 168cb3bdb66674c468e029ae2aa56adc38879b0b /phpBB/language | |
| parent | 3181c44fc98c1dbba123bf9be7c862716d122694 (diff) | |
| parent | 9aa947f7fbda5ffa44ab65ee90dc62400c0cb71e (diff) | |
| download | forums-052bbf654f4c1f60b58a622250ef97bc1e036426.tar forums-052bbf654f4c1f60b58a622250ef97bc1e036426.tar.gz forums-052bbf654f4c1f60b58a622250ef97bc1e036426.tar.bz2 forums-052bbf654f4c1f60b58a622250ef97bc1e036426.tar.xz forums-052bbf654f4c1f60b58a622250ef97bc1e036426.zip | |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
[ticket/12106] Combined first and second sentence
[ticket/12106] Adds a explaination that admin/mods still able to use the board
Conflicts:
phpBB/language/en/acp/board.php
Diffstat (limited to 'phpBB/language')
| -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 8ca937a58d..18968d6c97 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -45,7 +45,7 @@ $lang = array_merge($lang, array( 'DEFAULT_LANGUAGE' => 'Default language', 'DEFAULT_STYLE' => 'Default style', 'DISABLE_BOARD' => 'Disable board', - 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.', + 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users who are neither administrators nor moderators. You can also enter a short (255 character) message to display if you wish.', 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list', 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'The subject of the last added post will be displayed in the forum list with a hyperlink to the post. Subjects from password protected forums and forums in which user doesn’t have read access are not shown.', 'OVERRIDE_STYLE' => 'Override user style', |