aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/forums.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en/acp/forums.php')
-rw-r--r--phpBB/language/en/acp/forums.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 541d05c255..d92d3f8c9e 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.',
'FORUM_DELETED' => 'Forum successfully deleted.',
'FORUM_DESC' => 'Description',
- 'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is.',
+ 'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is. If the selected forum type is a category the description is not used.',
'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.',
'FORUM_IMAGE' => 'Forum image',
'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.',
@@ -97,6 +97,7 @@ $lang = array_merge($lang, array(
'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.',
'FORUM_NAME' => 'Forum name',
'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.',
+ 'FORUM_NAME_EMOJI' => 'The forum name you entered is invalid.<br>It contains the following unsupported characters:<br>%s',
'FORUM_PARENT' => 'Parent forum',
'FORUM_PASSWORD' => 'Forum password',
'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password',