aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/email
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-21 18:33:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-21 18:33:45 +0000
commit576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a (patch)
tree044f9e15ce160c7b3ad7a3c6db4533de93367287 /phpBB/language/en/email
parent61d4209aafac6a58bc3cecffaab8f821c4149688 (diff)
downloadforums-576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a.tar
forums-576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a.tar.gz
forums-576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a.tar.bz2
forums-576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a.tar.xz
forums-576bb754e9f5b074c7c7c9bdc2debea4b5f65e1a.zip
fixing some bugs, most being submitted grammatical/spelling errors.
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/email')
-rw-r--r--phpBB/language/en/email/admin_welcome_inactive.txt2
-rw-r--r--phpBB/language/en/email/coppa_resend_inactive.txt2
-rw-r--r--phpBB/language/en/email/coppa_welcome_inactive.txt2
-rw-r--r--phpBB/language/en/email/email_notify.txt2
-rw-r--r--phpBB/language/en/email/user_activate_inactive.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 038d078230..29d5e7d818 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -9,7 +9,7 @@ Username: {USERNAME}
Password: {PASSWORD}
----------------------------
-Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occured.
+Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occurred.
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/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index 4219b20fe1..a69f9086b2 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -33,7 +33,7 @@ Date: _______________
------------------------------ CUT HERE ------------------------------
-Once the administrator has recived 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.
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index 1586c3bf68..1cb28f65bd 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -34,7 +34,7 @@ Date: _______________
------------------------------ CUT HERE ------------------------------
-Once the administrator has recived 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.
diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt
index 669a7e41cb..725b52f0cc 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_CONTACT}. 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 message headers when contacting this address.
----------
diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt
index eb4e761412..a90773d48c 100644
--- a/phpBB/language/en/email/user_activate_inactive.txt
+++ b/phpBB/language/en/email/user_activate_inactive.txt
@@ -2,6 +2,6 @@ Subject: Your account has been deactivated
Hello {USERNAME},
-Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occured.
+Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred.
{EMAIL_SIG} \ No newline at end of file