diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
| commit | c01597499cbfbce0a429b7196a315e1643d9e5c2 (patch) | |
| tree | a93e25f2581db47848a99cbde681193e35f6f74f /phpBB/language/en/acp/board.php | |
| parent | 14b6714c93944b6af9ec01d978cfe7f387dc7e9a (diff) | |
| download | forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.gz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.bz2 forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.xz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.zip | |
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)
- fixed forum editing and parent id selection
- completely removed HTML support (it only creates security problems)
- changed cache_moderators() to reflect permission changes
git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/board.php')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b28827a0c9..ab1a6a9e98 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -71,7 +71,6 @@ $lang = array_merge($lang, array( 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity', 'ALLOW_MASS_PM' => 'Allow Mass PM\'s', - 'ALLOW_HTML_PM' => 'Allow HTML in private messages', 'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages', 'ALLOW_SMILIES_PM' => 'Allow smilies in private messages', 'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages', @@ -330,7 +329,7 @@ $lang = array_merge($lang, array( // Board defaults $lang = array_merge($lang, array( - 'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.', + 'ACP_BOARD_DEFAULTS_EXPLAIN' => 'These settings allow you to define a number of default or global settings used by the board. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.', 'DEFAULT_STYLE' => 'Default Style', 'OVERRIDE_STYLE' => 'Override user style', 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces users style with the default.', @@ -359,16 +358,12 @@ $lang = array_merge($lang, array( 'MIN_RATINGS_EXPLAIN' => 'Number of distinct ratings before users karma is calculated.', 'ALLOW_ATTACHMENTS' => 'Allow Attachments', 'ALLOW_PM_ATTACHMENTS' => 'Allow Attachments in Private Messages', - 'ALLOW_HTML' => 'Allow HTML', - 'ALLOWED_TAGS' => 'Allowed HTML tags', - 'ALLOWED_TAGS_EXPLAIN' => 'Separate tags with commas.', 'ALLOW_BBCODE' => 'Allow BBCode', 'ALLOW_SMILIES' => 'Allow Smilies', 'ALLOW_SIG' => 'Allow Signatures', 'ALLOW_SIG_IMG' => 'Allow use of IMG BBCode Tag in user signatures', 'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures', 'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures', - 'ALLOW_SIG_HTML' => 'Allow use of HTML in user signatures', 'ALLOW_SIG_FLASH' => 'Allow use of FLASH BBCode Tag in user signatures', 'ALLOW_NO_CENSORS' => 'Allow Disable of Censors', 'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.', |