diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-02 18:13:26 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-02 18:13:26 +0000 |
| commit | ab39e5eb79ccd153bb427e19ca52a57b1547e0ff (patch) | |
| tree | 2e06a4eeebf00b136f0c2f349c331b8406847f9f /phpBB/language/lang_english | |
| parent | 6172b1c51eace2e7eaf2157aaf06aec081ad5564 (diff) | |
| download | forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.gz forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.bz2 forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.tar.xz forums-ab39e5eb79ccd153bb427e19ca52a57b1547e0ff.zip | |
Changed way subject is sent to email ... handled by templates where necessary ... all translators please note these changes!
git-svn-id: file:///svn/phpbb/trunk@2248 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/lang_english')
13 files changed, 26 insertions, 0 deletions
diff --git a/phpBB/language/lang_english/email/admin_activate.tpl b/phpBB/language/lang_english/email/admin_activate.tpl index ece89ca1b0..04c8275491 100644 --- a/phpBB/language/lang_english/email/admin_activate.tpl +++ b/phpBB/language/lang_english/email/admin_activate.tpl @@ -1,3 +1,5 @@ +Subject: New user account + Hello, The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link: diff --git a/phpBB/language/lang_english/email/admin_welcome_activated.tpl b/phpBB/language/lang_english/email/admin_welcome_activated.tpl index f467754474..abd1391df8 100644 --- a/phpBB/language/lang_english/email/admin_welcome_activated.tpl +++ b/phpBB/language/lang_english/email/admin_welcome_activated.tpl @@ -1,3 +1,5 @@ +Subject: Account Activated + Hello {USERNAME}, Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email. diff --git a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl index 44b66bf63e..a9cd4e5db0 100644 --- a/phpBB/language/lang_english/email/admin_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl @@ -1,3 +1,5 @@ +Subject: Welcome to {SITENAME} Forums + {WELCOME_MSG} Please keep this email for your records. Your account information is as follows: diff --git a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl index 42a56886c1..a77c7feb02 100644 --- a/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl @@ -1,3 +1,5 @@ +Subject: Welcome to {SITENAME} Forums + {WELCOME_MSG} In compliance with the COPPA act your account is currently inactive. diff --git a/phpBB/language/lang_english/email/group_added.tpl b/phpBB/language/lang_english/email/group_added.tpl index e6f0e0bba1..81e87dbfb3 100644 --- a/phpBB/language/lang_english/email/group_added.tpl +++ b/phpBB/language/lang_english/email/group_added.tpl @@ -1,3 +1,5 @@ +Subject: You have been added to this usergroup + Congratulations, You have been added to the "{GROUP_NAME}" group on {SITENAME}. diff --git a/phpBB/language/lang_english/email/group_approved.tpl b/phpBB/language/lang_english/email/group_approved.tpl index 0e5c226fa1..60def16635 100644 --- a/phpBB/language/lang_english/email/group_approved.tpl +++ b/phpBB/language/lang_english/email/group_approved.tpl @@ -1,3 +1,5 @@ +Subject: Your request has been approved + Congratulations, Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved. diff --git a/phpBB/language/lang_english/email/group_request.tpl b/phpBB/language/lang_english/email/group_request.tpl index 36338b21ee..7b2811a764 100644 --- a/phpBB/language/lang_english/email/group_request.tpl +++ b/phpBB/language/lang_english/email/group_request.tpl @@ -1,3 +1,5 @@ +Subject: A request to join your group has been made + Dear {GROUP_MODERATOR}, A user has requested to join a group you moderator on {SITENAME}. diff --git a/phpBB/language/lang_english/email/privmsg_notify.tpl b/phpBB/language/lang_english/email/privmsg_notify.tpl index 4a07aacb82..ef426d58c4 100644 --- a/phpBB/language/lang_english/email/privmsg_notify.tpl +++ b/phpBB/language/lang_english/email/privmsg_notify.tpl @@ -1,3 +1,5 @@ +Subject: New Private Message has arrived + Hello {USERNAME}, You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link: diff --git a/phpBB/language/lang_english/email/topic_notify.tpl b/phpBB/language/lang_english/email/topic_notify.tpl index 0ca46072b8..b34b2d980a 100644 --- a/phpBB/language/lang_english/email/topic_notify.tpl +++ b/phpBB/language/lang_english/email/topic_notify.tpl @@ -1,3 +1,5 @@ +Subject: Topic Reply Notification - {TOPIC_TITLE} + Hello {USERNAME}, You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. diff --git a/phpBB/language/lang_english/email/user_activate.tpl b/phpBB/language/lang_english/email/user_activate.tpl index cf8057bc4e..7d7960c4c5 100644 --- a/phpBB/language/lang_english/email/user_activate.tpl +++ b/phpBB/language/lang_english/email/user_activate.tpl @@ -1,3 +1,5 @@ +Subject: Reactivate your account + Hello {USERNAME}, Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. In order to reactivate your account you must click on the link below: diff --git a/phpBB/language/lang_english/email/user_activate_passwd.tpl b/phpBB/language/lang_english/email/user_activate_passwd.tpl index ac17294829..eb60e9af4c 100644 --- a/phpBB/language/lang_english/email/user_activate_passwd.tpl +++ b/phpBB/language/lang_english/email/user_activate_passwd.tpl @@ -1,3 +1,5 @@ +Subject: New password activation + Hello {USERNAME} You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator. diff --git a/phpBB/language/lang_english/email/user_welcome.tpl b/phpBB/language/lang_english/email/user_welcome.tpl index cd56a43ca9..963be09048 100644 --- a/phpBB/language/lang_english/email/user_welcome.tpl +++ b/phpBB/language/lang_english/email/user_welcome.tpl @@ -1,3 +1,5 @@ +Subject: Welcome to {SITENAME} Forums + {WELCOME_MSG} Please keep this email for your records. Your account information is as follows: diff --git a/phpBB/language/lang_english/email/user_welcome_inactive.tpl b/phpBB/language/lang_english/email/user_welcome_inactive.tpl index 81e4d41c12..726abf4d60 100644 --- a/phpBB/language/lang_english/email/user_welcome_inactive.tpl +++ b/phpBB/language/lang_english/email/user_welcome_inactive.tpl @@ -1,3 +1,5 @@ +Subject: Welcome to {SITENAME} Forums + {WELCOME_MSG} Please keep this email for your records. Your account information is as follows: |