diff options
Diffstat (limited to 'phpBB/language/en/email')
7 files changed, 15 insertions, 9 deletions
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index 0d75f33c18..746d13da7a 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} @@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows ---------------------------- Username: {USERNAME} Password: {PASSWORD} + +Board URL: {U_BOARD} ---------------------------- Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred. diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index ab8363b350..9d43ca4f85 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} @@ -13,7 +13,7 @@ OR mail it to: {MAIL_INFO} ------------------------------ CUT HERE ------------------------------ -Permission to participate at "{SITENAME}" +Permission to participate at "{SITENAME}" - {U_BOARD} Username: {USERNAME} E-mail: {EMAIL_ADDRESS} diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index f34479a6fe..f079ddb838 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} @@ -13,7 +13,7 @@ OR mail it to: {MAIL_INFO} ------------------------------ CUT HERE ------------------------------ -Permission to participate at "{SITENAME}" +Permission to participate at "{SITENAME}" - {U_BOARD} Username: {USERNAME} Password: {PASSWORD} diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt index 260e69c380..b5639d0b7a 100644 --- a/phpBB/language/en/email/user_reactivate_account.txt +++ b/phpBB/language/en/email/user_reactivate_account.txt @@ -1,4 +1,4 @@ -Subject: Reactivate your account on "{SITENAME}" - {U_BOARD} +Subject: Reactivate your account on "{SITENAME}" A board administrator requested that your account be reactivated. Your account is currently inactive. Please follow the steps listed here to reactivate your account. diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt index f0a0034aa5..5635801b80 100644 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt index 52957082fb..6c3cee0b50 100644 --- a/phpBB/language/en/email/user_welcome.txt +++ b/phpBB/language/en/email/user_welcome.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} @@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows ---------------------------- Username: {USERNAME} Password: {PASSWORD} + +Board URL: {U_BOARD} ---------------------------- Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt index 3cd5e3c2ea..4b6d96ddd8 100644 --- a/phpBB/language/en/email/user_welcome_inactive.txt +++ b/phpBB/language/en/email/user_welcome_inactive.txt @@ -1,4 +1,4 @@ -Subject: Welcome to "{SITENAME}" - {U_BOARD} +Subject: Welcome to "{SITENAME}" {WELCOME_MSG} @@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows ---------------------------- Username: {USERNAME} Password: {PASSWORD} + +Board URL: {U_BOARD} ---------------------------- Your account is currently inactive. You cannot use it until you visit the following link: |