Updated and fixed various issues, see post in developers forum for info

git-svn-id: file:///svn/phpbb/trunk@1083 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/email/admin_activate_english.tpl

@@ -0,0 +1,7 @@
+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:
+
+{U_ACTIVATE}
+
+{EMAIL_SIG}

phpBB/language/email/admin_welcome_activated_english.tpl

@@ -0,0 +1,5 @@
+Hello {USERNAME},
+
+Your account has now been activated, you may login using the username and password you received in a previous email.
+
+{EMAIL_SIG}

phpBB/language/email/admin_welcome_inactive_english.tpl

@@ -0,0 +1,16 @@
+{WELCOME_MSG}
+
+Please keep this email for your records. Your account information is as follows:
+
+----------------------------
+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.
+
+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.
+
+Thank you for registering.
+
+{EMAIL_SIG}

phpBB/language/email/topic_notify_english.tpl

@@ -2,10 +2,10 @@ 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.
 
-{TOPIC_URL}
+{U_TOPIC}
 
 If you no longer wish to watch this topic you can either click the "Stop watching this topic link" found at the bottom of the topic above, or by clicking the following link:
 
-{UN_WATCH_URL}
+{U_STOP_WATCHING_TOPIC}
 
 {EMAIL_SIG}

phpBB/language/email/user_activate_english.tpl

@@ -0,0 +1,7 @@
+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:
+
+{U_ACTIVATE}
+
+{EMAIL_SIG}

phpBB/language/email/user_welcome_english.tpl

@@ -0,0 +1,14 @@
+{WELCOME_MSG}
+
+Please keep this email for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+Password: {PASSWORD}
+----------------------------
+
+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.
+
+Thank you for registering.
+
+{EMAIL_SIG}

phpBB/language/email/user_welcome_inactive_english.tpl

@@ -0,0 +1,18 @@
+{WELCOME_MSG}
+
+Please keep this email for your records. Your account information is as follows:
+
+----------------------------
+Username: {USERNAME}
+Password: {PASSWORD}
+----------------------------
+
+Your account is currently inactive. You cannot use it until you visit the following link:
+
+{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.
+
+Thank you for registering.
+
+{EMAIL_SIG}