- banning, disallow usernames and ranks

git-svn-id: file:///svn/phpbb/trunk@5323 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2005-12-09 18:09:43 +00:00
parent 28661d6106
commit 877d71528d
14 changed files with 738 additions and 831 deletions
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -107,7 +107,6 @@ $lang += array(
 	'NO_EXT_GROUP_NAME'			=> 'No Group Name entered',
 	'NO_EXT_GROUP_SPECIFIED'	=> 'No Extension Group specified',
 	'NO_IMAGE'					=> 'No Image',
-	'NO_IPS_DEFINED'			=> 'No IPs or Hostnames defined',
 	'NO_UPLOAD_DIR'				=> 'The upload directory you specified does not exist.',
 	'NO_WRITE_UPLOAD'			=> 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',

--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -0,0 +1,70 @@
+<?php
+/** 
+*
+* acp_ban [English]
+*
+* @package language
+* @version $Id$
+* @copyright (c) 2005 phpBB Group 
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License 
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE 
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+// Banning
+$lang += array(
+	'1_HOUR'		=> '1 Hour',
+	'30_MINS'		=> '30 Minutes',
+	'6_HOURS'		=> '6 Hours',
+
+	'ACP_BAN_EXPLAIN'	=> 'Here you can control the banning of users by name, IP or email address. These methods prevent a user reaching any part of the board. You can give a short (255 character) reason for the ban if you wish. This will be displayed in the admin log. The length of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select <u>Until</u> for the ban length and enter a date in yyyy-mm-dd format.',
+
+	'BAN_EXCLUDE'			=> 'Exclude from banning',
+	'BAN_LENGTH'			=> 'Length of ban',
+	'BAN_REASON'			=> 'Reason for ban',
+	'BAN_GIVE_REASON'		=> 'Reason shown to the banned',
+	'BAN_UPDATE_SUCESSFUL'	=> 'The banlist has been updated successfully',
+
+	'EMAIL_BAN'					=> 'Ban one or more email addresses',
+	'EMAIL_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered email address from all current bans.',
+	'EMAIL_BAN_EXPLAIN'			=> 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.',
+	'EMAIL_NO_BANNED'			=> 'No banned email addresses',
+	'EMAIL_UNBAN'				=> 'Un-ban or Un-exclude Emails',
+	'EMAIL_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a grey background.',
+
+	'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_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.',
+
+	'PERMANENT'		=> 'Permanent',
+	
+	'UNTIL'						=> 'Until',
+	'USER_BAN'					=> 'Ban one or more usernames',
+	'USER_BAN_EXCLUDE_EXPLAIN'	=> 'Enable this to exclude the entered users from all current bans.',
+	'USER_BAN_EXPLAIN'			=> 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a Username</u> facility to look up and add one or more users automatically.',
+	'USER_NO_BANNED'			=> 'No banned usernames',
+	'USER_UNBAN'				=> 'Un-ban or Un-exclude usernames',
+	'USER_UNBAN_EXPLAIN'		=> 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.',
+);
+
+?>
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -36,20 +36,31 @@ $lang += array(
 	'ACP_AUTH_SETTINGS'			=> 'Authentication',
 	'ACP_AUTOMATION'			=> 'Automation',
 	'ACP_AVATAR_SETTINGS'		=> 'Avatar Settings',
+	'ACP_BAN'					=> 'Banning',
+	'ACP_BAN_EMAILS'			=> 'Ban Emails',
+	'ACP_BAN_IPS'				=> 'Ban IPs',
+	'ACP_BAN_USERNAMES'			=> 'Ban Usernames',
 	'ACP_BBCODES'				=> 'BBCodes',
 	'ACP_BOARD_DEFAULTS'		=> 'Board Defaults',
 	'ACP_BOARD_MANAGEMENT'		=> 'Board Management',
 	'ACP_BOARD_SETTINGS'		=> 'Board Settings',
 	'ACP_BOTS'					=> 'Spiders/Robots',
+	'ACP_CAT_DATABASE'			=> 'Database',
 	'ACP_CAT_DOT_MODS'			=> '.Mods',
+	'ACP_CAT_FORUMS'			=> 'Forums',
 	'ACP_CAT_GENERAL'			=> 'General',
 	'ACP_CAT_MAINTANENCE'		=> 'Maintanence',
+	'ACP_CAT_PERMISSIONS'		=> 'Permissions',
 	'ACP_CAT_POSTING'			=> 'Posting',
+	'ACP_CAT_STYLES'			=> 'Styles',
 	'ACP_CAT_SYSTEM'			=> 'System',
 	'ACP_CAT_USERGROUP'			=> 'Users and Groups',
+	'ACP_CAT_USERS'				=> 'Users',
 	'ACP_CLIENT_COMMUNICATION'	=> 'Client Communication',
 	'ACP_COOKIE_SETTINGS'		=> 'Cookie Settings',
 	'ACP_CRITICAL_LOGS'			=> 'Error Log',
+	'ACP_DISALLOW'				=> 'Disallow',
+	'ACP_DISALLOW_USERNAMES'	=> 'Disallow Usernames',
 	'ACP_EMAIL_SETTINGS'		=> 'Email Settings',
 	'ACP_EXTENSION_GROUPS'		=> 'Manage Extension Groups',
 	'ACP_FORUM_LOGS'			=> 'Forum Logs',
@@ -68,16 +79,21 @@ $lang += array(
 	'ACP_LOGGING'				=> 'Logging',
 	'ACP_MAIN'					=> 'Admin index',
 	'ACP_MANAGE_EXTENSIONS'		=> 'Manage Extensions',
+	'ACP_MANAGE_RANKS'			=> 'Manage Ranks',
 	'ACP_MASS_EMAIL'			=> 'Mass Email',
 	'ACP_MESSAGES'				=> 'Messages',
 	'ACP_MESSAGE_SETTINGS'		=> 'Message Settings',
 	'ACP_MODULE_MANAGEMENT'		=> 'Module Management',
 	'ACP_MOD_LOGS'				=> 'Moderator Log',
 	'ACP_ORPHAN_ATTACHMENTS'	=> 'Orphan Attachments',
+	'ACP_PERMISSION_SETTINGS'	=> 'Permission Settings',
 	'ACP_PHP_INFO'				=> 'PHP Information',
+	'ACP_RANKS'					=> 'Ranks',
 	'ACP_SERVER_CONFIGURATION'	=> 'Server Configuration',
 	'ACP_SERVER_SETTINGS'		=> 'Server Settings',
 	'ACP_SMILIES'				=> 'Smilies',
+	'ACP_STYLE_MANAGEMENT'		=> 'Style Management',
+	'ACP_USER_SECURITY'			=> 'User Security',
 	'ACP_WORDS'					=> 'Word Censoring',

 	'ACTION'				=> 'Action',
@@ -123,6 +139,8 @@ $lang += array(

 	'NOTIFY'				=> 'Notification',
 	'NO_ADMIN'				=> 'You are not authorised to administer this board.',
+	'NO_EMAILS_DEFINED'		=> 'No valid email addresses found',
+	'NO_IPS_DEFINED'		=> 'No IPs or Hostnames defined',

 	'OFF'					=> 'OFF',
 	'ON'					=> 'ON',
@@ -215,6 +233,16 @@ $lang += array(
 	'LOG_ATTACH_FILEUPLOAD'		=> '<b>Orphan File uploaded to Post Number %1$d - %2$s</b>',
 	'LOG_ATTACH_ORPHAN_DEL'		=> '<b>Orphan Files deleted</b><br />&#187; %s',

+	'LOG_BAN_EXCLUDE_USER'	=> '<b>Excluded user from ban</b> for reason "<i>%s</i>"<br />&#187; %s ',
+	'LOG_BAN_EXCLUDE_IP'	=> '<b>Excluded ip from ban</b> for reason "<i>%s</i>"<br />&#187; %s ',
+	'LOG_BAN_EXCLUDE_EMAIL' => '<b>Excluded email from ban</b> for reason "<i>%s</i>"<br />&#187; %s ',
+	'LOG_BAN_USER'			=> '<b>Banned User</b> for reason "<i>%s</i>"<br />&#187; %s ',
+	'LOG_BAN_IP'			=> '<b>Banned ip</b> for reason "<i>%s</i>"<br />&#187; %s',
+	'LOG_BAN_EMAIL'			=> '<b>Banned email</b> for reason "<i>%s</i>"<br />&#187; %s',
+	'LOG_UNBAN_USER'		=> '<b>Unbanned user</b><br />&#187; %s',
+	'LOG_UNBAN_IP'			=> '<b>Unbanned ip</b><br />&#187; %s',
+	'LOG_UNBAN_EMAIL'		=> '<b>Unbanned email</b><br />&#187; %s',
+
 	'LOG_BBCODE_ADD'		=> '<b>Added new BBCode</b><br />&#187; %s',
 	'LOG_BBCODE_EDIT'		=> '<b>Edited BBCode</b><br />&#187; %s',
 	'LOG_BBCODE_DELETE'		=> '<b>Deleted BBCode</b><br />&#187; %s',
@@ -238,6 +266,9 @@ $lang += array(
 	'LOG_CONFIG_SERVER'		=> '<b>Altered server settings</b>',
 	'LOG_CONFIG_SETTINGS'	=> '<b>Altered board settings</b>',

+	'LOG_DISALLOW_ADD'		=> '<b>Added disallowed username</b><br />&#187; %s',
+	'LOG_DISALLOW_DELETE'	=> '<b>Deleted disallowed username</b>',
+
 	'LOG_DOWNLOAD_EXCLUDE_IP'	=> '<b>Exluded ip/hostname from download list</b><br />&#187; %s',
 	'LOG_DOWNLOAD_IP'			=> '<b>Added ip/hostname to download list</b><br />&#187; %s',
 	'LOG_DOWNLOAD_REMOVE_IP'	=> '<b>Removed ip/hostname from download list</b><br />&#187; %s',
--- a/phpBB/language/en/acp/posting.php
+++ b/phpBB/language/en/acp/posting.php
@@ -164,4 +164,40 @@ $lang += array(
 	'WORD_UPDATED'		=> 'The selected word censor has been successfully updated',
 );

+// Ranks
+$lang += array(
+	'ACP_RANKS_EXPLAIN'		=> 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility.',
+	'ADD_RANK'				=> 'Add new rank',
+
+	'MUST_SELECT_RANK'		=> 'You must select a rank.',
+	
+	'NO_ASSIGNED_RANK'		=> 'No special rank assigned.',
+	'NO_RANK_TITLE'			=> 'You haven\'t specified a title for the rank.',
+	'NO_UPDATE_RANKS'		=> 'The rank was successfully deleted. However user accounts using this rank were not updated.  You will need to manually reset the rank on these accounts.',
+
+	'RANK_ADDED'			=> 'The rank was successfully added.',
+	'RANK_IMAGE'			=> 'Rank Image',
+	'RANK_IMAGE_EXPLAIN'	=> 'Use this to define a small image associated with the rank. The path is relative to the root phpBB2 directory.',
+	'RANK_MINIMUM'			=> 'Minimum Posts',
+	'RANK_REMOVED'			=> 'The rank was successfully deleted.',
+	'RANK_SPECIAL'			=> 'Set as Special Rank',
+	'RANK_TITLE'			=> 'Rank Title',
+	'RANK_UPDATED'			=> 'The rank was successfully updated.',
+);
+
+// Disallow Usernames
+$lang += array(
+	'ACP_DISALLOW_EXPLAIN'	=> 'Here you can control usernames which will not be allowed to be used.  Disallowed usernames are allowed to contain a wildcard character of *.  Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it',
+	'ADD_DISALLOW_EXPLAIN'	=> 'You can disallow a username using the wildcard character * to match any character',
+	'ADD_DISALLOW_TITLE'	=> 'Add a disallowed username',
+
+	'DELETE_DISALLOW_EXPLAIN'	=> 'You can remove a disallowed username by selecting the username from this list and clicking submit',
+	'DELETE_DISALLOW_TITLE'		=> 'Remove a Disallowed Username',
+	'DISALLOWED_ALREADY'		=> 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.',
+	'DISALLOWED_DELETED'		=> 'The disallowed username has been successfully removed',
+	'DISALLOW_SUCCESSFUL'		=> 'The disallowed username has been successfully added',
+
+	'NO_DISALLOWED'		=> 'No Disallowed Usernames',
+);
+
 ?>
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -259,6 +259,7 @@ $lang += array(
 	'NO_TOPICS'			=> 'There are no topics or posts in this forum.',
 	'NO_UNREAD_PM'		=> '<b>0</b> unread messages',
 	'NO_USER'			=> 'The requested user does not exist.',
+	'NO_USERS'			=> 'The requested users do not exist',

 	'OCCUPATION'				=> 'Occupation',
 	'OFFLINE'					=> 'Offline',