diff options
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/forums.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index 7a7176369f..d92d3f8c9e 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -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', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 64740b311b..2c7b3d3aee 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -81,8 +81,8 @@ $lang = array_merge($lang, array( 'ACL_U_SIG' => 'Can use signature', 'ACL_U_SENDPM' => 'Can send private messages', - 'ACL_U_MASSPM' => 'Can send messages to multiple users', - 'ACL_U_MASSPM_GROUP'=> 'Can send messages to groups', + 'ACL_U_MASSPM' => 'Can send private messages to multiple users', + 'ACL_U_MASSPM_GROUP'=> 'Can send private messages to groups', 'ACL_U_READPM' => 'Can read private messages', 'ACL_U_PM_EDIT' => 'Can edit own private messages', 'ACL_U_PM_DELETE' => 'Can remove private messages from own folder', |