diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-15 13:03:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-15 13:03:57 +0000 |
| commit | d907d066f2e0d7974766370b11dab69a59962f97 (patch) | |
| tree | 146a203caa445298e084088c30311b959d00c9f1 /phpBB/language/en | |
| parent | 8c3f94f9ae8a1333be8c01dd2e0be74dffc91831 (diff) | |
| download | forums-d907d066f2e0d7974766370b11dab69a59962f97.tar forums-d907d066f2e0d7974766370b11dab69a59962f97.tar.gz forums-d907d066f2e0d7974766370b11dab69a59962f97.tar.bz2 forums-d907d066f2e0d7974766370b11dab69a59962f97.tar.xz forums-d907d066f2e0d7974766370b11dab69a59962f97.zip | |
- adding ability to assign moderator specific ban options
- fixing destroying of sql caches
- fixing referencing of sql cached queries if more than one are active on one page
- other fixes
git-svn-id: file:///svn/phpbb/trunk@5633 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 0e7a4cd3e1..6def9cdf6b 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -52,6 +52,7 @@ $lang = array_merge($lang, array( 'IP_BAN' => 'Ban one or more ips', 'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', 'IP_BAN_EXPLAIN' => 'To specify several different IP\'s or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use *', + 'IP_HOSTNAME' => 'IP addresses or hostnames', 'IP_NO_BANNED' => 'No banned IP addresses', 'IP_UNBAN' => 'Un-ban or Un-exclude IPs', 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a grey background.', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 4a868535f6..a46ff1816b 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -167,6 +167,7 @@ $lang = array_merge($lang, array( 'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'), 'acl_m_warn' => array('lang' => 'Can issue warnings', 'cat' => 'misc'), + 'acl_m_ban' => array('lang' => 'Can manage bans', 'cat' => 'misc'), // This moderator setting is only global (and not local) )); // Admin Permissions diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index d9a17511a2..0a7816ca5f 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -128,6 +128,11 @@ $lang = array_merge($lang, array( 'MCP_ADD' => 'Add a warning', + 'MCP_BAN' => 'Banning', + 'MCP_BAN_EMAILS' => 'Ban Emails', + 'MCP_BAN_IPS' => 'Ban IPs', + 'MCP_BAN_USERNAMES' => 'Ban Usernames', + 'MCP_LOGS' => 'Moderator Logs', 'MCP_LOGS_FRONT' => 'Front Page', 'MCP_LOGS_FORUM_VIEW' => 'Forum Logs', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index d1d507a94b..fa95420607 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -109,6 +109,7 @@ $lang = array_merge($lang, array( 'LOAD_DRAFT' => 'Load Draft', 'LOAD_DRAFT_EXPLAIN' => 'Here you are able to select the draft you want to continue writing. Your current post will be canceled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.', 'LOGIN_EXPLAIN_POST' => 'You need to login in order to post within this forum', + 'LOGIN_EXPLAIN_REPLY' => 'You need to login in order to reply to topics within this forum', 'MAX_FONT_SIZE_EXCEEDED' => 'You may only use fonts up to size %1$d.', 'MAX_IMG_HEIGHT_EXCEEDED' => 'Your images may only be up to %1$d pixels high.', @@ -176,6 +177,7 @@ $lang = array_merge($lang, array( 'TOPIC_BUMPED' => 'Topic has been bumped successfully', 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', + 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed', 'UPDATE_COMMENT' => 'Update comment', 'URL_INVALID' => 'The URL you specified is invalid.', 'USER_CANNOT_BUMP' => 'You cannot bump topics in this forum', |