diff options
| author | Senky <jakubsenko@gmail.com> | 2012-04-15 20:10:51 +0200 |
|---|---|---|
| committer | Senky <jakubsenko@gmail.com> | 2012-04-15 20:10:51 +0200 |
| commit | 3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a (patch) | |
| tree | bd765cbb1938d1e58ca62e431a73565531a7d9b3 /phpBB/language/en/acp/email.php | |
| parent | de7a166a5990a3b59ffff145f7acb7b9e1dcb3c5 (diff) | |
| download | forums-3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a.tar forums-3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a.tar.gz forums-3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a.tar.bz2 forums-3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a.tar.xz forums-3741e99aab94fc903db82c1c4d3d6b1f7b1e2a1a.zip | |
[ticket/10161] all "e-mail" strings in language files changed to "email"
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future
PHPBB3-10161
Diffstat (limited to 'phpBB/language/en/acp/email.php')
| -rw-r--r-- | phpBB/language/en/acp/email.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php index c39b8743e7..aacb35b9bb 100644 --- a/phpBB/language/en/acp/email.php +++ b/phpBB/language/en/acp/email.php @@ -36,12 +36,12 @@ if (empty($lang) || !is_array($lang)) // Email settings $lang = array_merge($lang, array( - 'ACP_MASS_EMAIL_EXPLAIN' => 'Here you can e-mail a message to either all of your users or all users of a specific group <strong>having the option to receive mass e-mails enabled</strong>. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. 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 <strong>having the option to receive mass emails enabled</strong>. To achieve this an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an email, for more recipients more emails will be sent. 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', - 'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.', + 'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the email. Please check the %sError log%s for detailed error messages.', 'EMAIL_SENT' => 'This message has been sent.', 'EMAIL_SENT_QUEUE' => 'This message has been queued for sending.', @@ -53,7 +53,7 @@ $lang = array_merge($lang, array( 'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.', 'MAIL_BANNED' => 'Mail banned users', - 'MAIL_BANNED_EXPLAIN' => 'When sending a mass e-mail to a group you can select here whether banned users will also receive the e-mail.', + 'MAIL_BANNED_EXPLAIN' => 'When sending a mass email to a group you can select here whether banned users will also receive the email.', 'MAIL_HIGH_PRIORITY' => 'High', 'MAIL_LOW_PRIORITY' => 'Low', 'MAIL_NORMAL_PRIORITY' => 'Normal', |