diff options
| author | Yuriy Rusko <marshalrusty@phpbb.com> | 2009-08-06 09:12:21 +0000 |
|---|---|---|
| committer | Yuriy Rusko <marshalrusty@phpbb.com> | 2009-08-06 09:12:21 +0000 |
| commit | 380b11fe2249f48352d63297119465b6081b1268 (patch) | |
| tree | ccd41f5acbc28340e2d24c243e0a68259868e740 /phpBB/language/en/email | |
| parent | a7509b226a2561b77297b54a1c9391f9fd68d61c (diff) | |
| download | forums-380b11fe2249f48352d63297119465b6081b1268.tar forums-380b11fe2249f48352d63297119465b6081b1268.tar.gz forums-380b11fe2249f48352d63297119465b6081b1268.tar.bz2 forums-380b11fe2249f48352d63297119465b6081b1268.tar.xz forums-380b11fe2249f48352d63297119465b6081b1268.zip | |
More language changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9933 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/email')
| -rw-r--r-- | phpBB/language/en/email/admin_welcome_inactive.txt | 4 | ||||
| -rw-r--r-- | phpBB/language/en/email/coppa_resend_inactive.txt | 8 | ||||
| -rw-r--r-- | phpBB/language/en/email/coppa_welcome_inactive.txt | 8 | ||||
| -rw-r--r-- | phpBB/language/en/email/installed.txt | 6 | ||||
| -rw-r--r-- | phpBB/language/en/email/pm_report_closed.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/pm_report_deleted.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_reactivate_account.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_remind_inactive.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_resend_inactive.txt | 4 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_welcome.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/user_welcome_inactive.txt | 4 |
11 files changed, 22 insertions, 22 deletions
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index f962b8a99c..af3ac9ca87 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -10,9 +10,9 @@ Username: {USERNAME} 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. +Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this had occured. -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. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Thank you for registering. diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt index 9d43ca4f85..c3e4af576d 100644 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ b/phpBB/language/en/email/coppa_resend_inactive.txt @@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}" {WELCOME_MSG} -In compliance with the COPPA your account is currently inactive. +In compliance with the COPPA, your account is currently inactive. -Please print this message out and have your parent or guardian sign and date it. Then fax it to: +Please print this message and have your parent or guardian sign and date it. Then fax it to: {FAX_INFO} @@ -33,9 +33,9 @@ Date: _______________ ------------------------------ CUT HERE ------------------------------ -Once the administrator has received the above form via fax or regular mail your account will be activated. +Once the administrator has received the above form via fax or regular mail, your account will be activated. -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. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Thank you for registering. diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt index 9d43ca4f85..c3e4af576d 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/en/email/coppa_welcome_inactive.txt @@ -2,9 +2,9 @@ Subject: Welcome to "{SITENAME}" {WELCOME_MSG} -In compliance with the COPPA your account is currently inactive. +In compliance with the COPPA, your account is currently inactive. -Please print this message out and have your parent or guardian sign and date it. Then fax it to: +Please print this message and have your parent or guardian sign and date it. Then fax it to: {FAX_INFO} @@ -33,9 +33,9 @@ Date: _______________ ------------------------------ CUT HERE ------------------------------ -Once the administrator has received the above form via fax or regular mail your account will be activated. +Once the administrator has received the above form via fax or regular mail, your account will be activated. -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. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Thank you for registering. diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt index 72b3d8edeb..2aa03a7f33 100644 --- a/phpBB/language/en/email/installed.txt +++ b/phpBB/language/en/email/installed.txt @@ -4,7 +4,7 @@ Congratulations, You have successfully installed phpBB on your server. -This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one. +This e-mail contains important information regarding your installation and should be kept for reference. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. ---------------------------- Username: {USERNAME} @@ -12,8 +12,8 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/ +Useful information regarding the phpBB software can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/ -In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL. +In order to keep your board safe and secure, we highly recommended keeping current with software releases. For your convenience, a mailing list is available at the page referenced above. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt index 752a640867..1b9f4a6658 100644 --- a/phpBB/language/en/email/pm_report_closed.txt +++ b/phpBB/language/en/email/pm_report_closed.txt @@ -2,7 +2,7 @@ Subject: Report closed - "{PM_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the private message "{PM_SUBJECT}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. +You are receiving this notification because the report you filed regarding the private message "{PM_SUBJECT}" at "{SITENAME}" has been tended to by a moderator or administrator. The report is now closed. If you have further questions, please contact {CLOSER_NAME} by private message. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt index 04e4bd1404..8cb7fdd6fa 100644 --- a/phpBB/language/en/email/pm_report_deleted.txt +++ b/phpBB/language/en/email/pm_report_deleted.txt @@ -2,7 +2,7 @@ Subject: Report deleted - "{PM_SUBJECT}" Hello {USERNAME}, -You are receiving this notification because the report you filed on the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or by an administrator. +You are receiving this notification because the report you filed regarding the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or administrator. {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt index b5639d0b7a..4ef7dd899a 100644 --- a/phpBB/language/en/email/user_reactivate_account.txt +++ b/phpBB/language/en/email/user_reactivate_account.txt @@ -9,7 +9,7 @@ Please keep this e-mail for your records. Your account information is as follows Username: {USERNAME} ---------------------------- -Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Please visit the following link to reactivate your account: diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt index 49dea02044..1ba28329f6 100644 --- a/phpBB/language/en/email/user_remind_inactive.txt +++ b/phpBB/language/en/email/user_remind_inactive.txt @@ -2,7 +2,7 @@ Subject: Inactive account reminder Hello {USERNAME}, -On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below. +This notification is a reminder that your account at "{SITENAME}", created on {REGISTER_DATE}, remains inactive. If you would like to activate this account, please visit the following link: {U_ACTIVATE} diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt index 5635801b80..4638d6df63 100644 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -8,9 +8,9 @@ Please keep this e-mail for your records. Your account information is as follows Username: {USERNAME} ---------------------------- -Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. -Your account is currently inactive. You cannot use it until you visit the following link: +Please visit the following link in order to activate your account: {U_ACTIVATE} diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt index ebe42d8f91..2648769dfd 100644 --- a/phpBB/language/en/email/user_welcome.txt +++ b/phpBB/language/en/email/user_welcome.txt @@ -10,7 +10,7 @@ Username: {USERNAME} 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. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Thank you for registering. diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt index 80ad1b8abd..1b72b1c5a8 100644 --- a/phpBB/language/en/email/user_welcome_inactive.txt +++ b/phpBB/language/en/email/user_welcome_inactive.txt @@ -10,11 +10,11 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -Your account is currently inactive. You cannot use it until you visit the following link: +Please visit the following link in order to activate your account: {U_ACTIVATE} -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. +Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. Thank you for registering. |