diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-31 16:56:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-31 16:56:15 +0000 |
| commit | 46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0 (patch) | |
| tree | 2f8fd4b59b67fa390f3d29ab2a78142d34888ec8 /phpBB/language/en/email | |
| parent | 54f79e200fdba8e6eee74a0a8aed68a2ca71ec5e (diff) | |
| download | forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.gz forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.bz2 forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.xz forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.zip | |
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)
- fixes for bugs #6694, #6664 and #6662
git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/email')
| -rw-r--r-- | phpBB/language/en/email/email_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/profile_send_email.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/profile_send_im.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt index e8d4e3ae1d..a513bbc8b8 100644 --- a/phpBB/language/en/email/email_notify.txt +++ b/phpBB/language/en/email/email_notify.txt @@ -10,7 +10,7 @@ You can find it at: {U_TOPIC} -A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_EMAIL}. Please quote the the message headers when contacting this address. +A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this email please contact the board administrator at {BOARD_CONTACT}. Please quote the the message headers when contacting this address. ---------- diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt index b9e03734e4..cf858767ec 100644 --- a/phpBB/language/en/email/profile_send_email.txt +++ b/phpBB/language/en/email/profile_send_email.txt @@ -3,7 +3,7 @@ Hello {TO_USERNAME}, The following is an email sent to you by {FROM_USERNAME} via your account on “{SITENAME}”. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: -{BOARD_EMAIL} +{BOARD_CONTACT} Include this full email (particularly the headers). Please note that the reply address to this email has been set to that of {FROM_USERNAME}. diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt index 59e06d4fd0..244b712ee2 100644 --- a/phpBB/language/en/email/profile_send_im.txt +++ b/phpBB/language/en/email/profile_send_im.txt @@ -3,7 +3,7 @@ Hello {TO_USERNAME}, The following is a message sent to you by {FROM_USERNAME} via your account on “{SITENAME}”. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: -{BOARD_EMAIL} +{BOARD_CONTACT} Include this full message. Please note that the sender address has been set to the boards IM account. |