From 9b97e57deb6760699fb4d6859957859bf2dbcbea Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 7 Jan 2003 18:41:05 +0000 Subject: [PATCH] Oops, forgot lang updates git-svn-id: file:///svn/phpbb/trunk@3268 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/lang_admin.php | 21 ++++++++++++++------- phpBB/language/en/lang_main.php | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index eebdd1926a..e6396a1916 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -81,6 +81,9 @@ $lang = array_merge($lang, array( 'log_disallow_delete' => 'Deleted disallowed username', 'log_prune' => 'Pruned forum => %s', 'log_admin_clear' => 'Cleared admin log', + 'LOG_BAN_EXCLUDE_user' => 'Excluded user from ban [ %s ] => %s ', + 'LOG_BAN_EXCLUDE_ip' => 'Excluded ip from ban [ %s ] => %s ', + 'LOG_BAN_EXCLUDE_email' => 'Excluded email from ban [ %s ] => %s ', 'log_ban_user' => 'Banned User [ %s ] => %s ', 'log_ban_ip' => 'Banned ip [ %s ] => %s', 'log_ban_email' => 'Banned email [ %s ] => %s', @@ -287,19 +290,23 @@ $lang = array_merge($lang, array( '30_Mins' => '30 Minutes', '1_Hour' => '1 Hour', '6_Hours' => '6 Hours', - 'Other' => 'Until ->', + 'Other' => 'Until ->', + 'BAN_EXCLUDE' => 'Exclude from banning', + 'BAN_USER_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.', + 'BAN_EMAIL_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered email address from all current bans.', + 'BAN_IP_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', 'Ban_reason' => 'Reason for ban', 'Ban_username_explain' => 'You can ban multiple users in one go by entering each name on a new line. Use the Find a Username facility to look up and add one or more users automatically.', - 'Unban_username' => 'Un-ban usernames', - 'Unban_username_explain' => 'You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser', + 'Unban_username' => 'Un-ban or Un-exclude usernames', + 'Unban_username_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. Un-excluded users are listed in Red.', 'IP_hostname' => 'IP addresses or hostnames', 'Ban_IP_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 *', - 'Unban_IP' => 'Un-ban IPs', - 'Unban_IP_explain' => 'You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser', + 'Unban_IP' => 'Un-ban or Un-exclude IPs', + 'Unban_IP_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. Un-excluded IP\'s are listed in Red.', 'Ban_email' => 'Ban one or more email addresses', 'Ban_email_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.', - 'Unban_email' => 'Un-ban Emails', - 'Unban_email_explain' => 'You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser', + 'Unban_email' => 'Un-ban or Un-exclude Emails', + 'Unban_email_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. Un-excluded email addresses are listed in Red.', 'No_banned_users' => 'No banned usernames', 'No_banned_ip' => 'No banned IP addresses', 'No_banned_email' => 'No banned email addresses', diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 091233c269..4277929192 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -65,8 +65,8 @@ $lang = array_merge($lang, array( 'Confirm' => 'Confirm', 'Delete' => 'Delete', 'SPELLCHECK' => 'Spellcheck', - 'Yes' => 'Yes', - 'No' => 'No', + 'YES' => 'Yes', + 'NO' => 'No', 'Enabled' => 'Enabled', 'Disabled' => 'Disabled', 'Error' => 'Error',