aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-22 15:14:03 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-22 15:14:03 +0000
commit725b21f2d206efb4b34eb95ec3329bc81f66b805 (patch)
tree7de41ee058c21e1884bc5d2292f5e7014a587890 /phpBB/language/en/acp
parentdaa0435614af7bed95e71f3b11aa2c372df3958d (diff)
downloadforums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar
forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.gz
forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.bz2
forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.tar.xz
forums-725b21f2d206efb4b34eb95ec3329bc81f66b805.zip
time to squash some bugs
git-svn-id: file:///svn/phpbb/trunk@6114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/ban.php6
-rw-r--r--phpBB/language/en/acp/modules.php2
-rw-r--r--phpBB/language/en/acp/users.php3
3 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 683baf03c1..51df843158 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -47,7 +47,7 @@ $lang = array_merge($lang, array(
'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.',
+ '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 marked background.',
'IP_BAN' => 'Ban one or more ips',
'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.',
@@ -55,7 +55,7 @@ $lang = array_merge($lang, array(
'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.',
+ '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 marked background.',
'PERMANENT' => 'Permanent',
@@ -65,7 +65,7 @@ $lang = array_merge($lang, array(
'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.',
+ '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 marked background.',
));
?> \ No newline at end of file
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index 0dd8fe62d3..b5055570c1 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -55,7 +55,7 @@ $lang = array_merge($lang, array(
'MODULE_ADDED' => 'Module successfully added',
'MODULE_DELETED' => 'Module successfully removed',
'MODULE_DISPLAYED' => 'Module displayed',
- 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not whish to display this module, but want to use it, set this to no.',
+ 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.',
'MODULE_EDITED' => 'Module successfully edited',
'MODULE_ENABLED' => 'Module enabled',
'MODULE_LANGNAME' => 'Module Language Name',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 5c326810f7..52bff60476 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -30,7 +30,8 @@ if (empty($lang) || !is_array($lang))
$lang = array_merge($lang, array(
'ADMIN_SIG_PREVIEW' => 'Signature preview',
-
+ 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status promote another user to be a founder first.',
+
'BAN_SUCCESSFUL' => 'Ban entered successfully',
'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.',