aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/email.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-26 16:09:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-26 16:09:51 +0000
commitddddda47fb414095371b80f0873dee3986d0d308 (patch)
treeb71ec4da186fc10801e47bbc38586216031b3b0c /phpBB/language/en/acp/email.php
parent920fc0156db872c6200e85da79bf67eb2f416d02 (diff)
downloadforums-ddddda47fb414095371b80f0873dee3986d0d308.tar
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.gz
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.bz2
forums-ddddda47fb414095371b80f0873dee3986d0d308.tar.xz
forums-ddddda47fb414095371b80f0873dee3986d0d308.zip
- fix some oddities (doubled spaces for example)
- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier. - Changed some permission namings based on suggestions by the community - Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time. - Disable submit buttons after clicking for installation and conversions. git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/email.php')
-rw-r--r--phpBB/language/en/acp/email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php
index 1fdd833f94..e57b2a8bea 100644
--- a/phpBB/language/en/acp/email.php
+++ b/phpBB/language/en/acp/email.php
@@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang))
// Email settings
$lang = array_merge($lang, array(
- 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
+ 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can email a message to either all of your users or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed',
'ALL_USERS' => 'All users',
'COMPOSE' => 'Compose',