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/common.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/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 93f42b58ec..32a7bed741 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -110,7 +110,7 @@ $lang = array_merge($lang, array( 'ACP_MESSAGE_SETTINGS' => 'Message Settings', 'ACP_MODULE_MANAGEMENT' => 'Module Management', 'ACP_MOD_LOGS' => 'Moderator Log', - 'ACP_MOD_ROLES' => 'Mod Roles', + 'ACP_MOD_ROLES' => 'Moderator Roles', 'ACP_ORPHAN_ATTACHMENTS' => 'Orphan Attachments', @@ -377,18 +377,19 @@ $lang = array_merge($lang, array( 'LOG_ERROR_EMAIL' => '<b>Email Error</b><br />» %s', 'LOG_FORUM_ADD' => '<b>Created new forum</b><br />» %s', + 'LOG_FORUM_DEL_FORUM' => '<b>Deleted forum</b><br />» %s', + 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s', + 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s', + 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s', + 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s', 'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />» %s', 'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %s <b>below</b> %s', 'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %s <b>above</b> %s', 'LOG_FORUM_SYNC' => '<b>Re-synchronised forum</b><br />» %s', - 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s', - 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s', - 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s', - 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s', 'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />» %s', 'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />» %s', @@ -438,9 +439,9 @@ $lang = array_merge($lang, array( 'LOG_F_ROLE_ADD' => '<b>Forum Role added</b><br />» %s', 'LOG_F_ROLE_EDIT' => '<b>Forum Role edited</b><br />» %s', 'LOG_F_ROLE_REMOVED' => '<b>Forum Role removed</b><br />» %s', - 'LOG_M_ROLE_ADD' => '<b>Mod Role added</b><br />» %s', - 'LOG_M_ROLE_EDIT' => '<b>Mod Role edited</b><br />» %s', - 'LOG_M_ROLE_REMOVED' => '<b>Mod Role removed</b><br />» %s', + 'LOG_M_ROLE_ADD' => '<b>Moderator Role added</b><br />» %s', + 'LOG_M_ROLE_EDIT' => '<b>Moderator Role edited</b><br />» %s', + 'LOG_M_ROLE_REMOVED' => '<b>Moderator Role removed</b><br />» %s', 'LOG_U_ROLE_ADD' => '<b>User Role added</b><br />» %s', 'LOG_U_ROLE_EDIT' => '<b>User Role edited</b><br />» %s', 'LOG_U_ROLE_REMOVED' => '<b>User Role removed</b><br />» %s', |