[ticket/11471] Unrelated text in e-mail templates

Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471

phpBB/language/en/email/post_approved.txt

@@ -10,5 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/post_disapproved.txt

@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/post_in_queue.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_TOPIC}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/report_closed.txt

@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" 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.
 
-
-{EMAIL_SIG}
+{EMAIL_SIG}

phpBB/language/en/email/report_deleted.txt

@@ -4,5 +4,4 @@ Hello {USERNAME},
 
 You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator.
 
-
-{EMAIL_SIG}
+{EMAIL_SIG}

phpBB/language/en/email/report_pm.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Private Message report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/report_post.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the report, click the following link:
 If you want to view the post, click the following link:
 {U_VIEW_POST}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/short/post_approved.txt

@@ -10,5 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/short/post_disapproved.txt

@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/short/post_in_queue.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the post, click the following link:
 If you want to view the topic, click the following link:
 {U_TOPIC}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/short/report_pm.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Private Message report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}"
 If you want to view the report, click the following link:
 {U_VIEW_REPORT}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/short/report_post.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Post report - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the report, click the following link:
 If you want to view the post, click the following link:
 {U_VIEW_POST}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/short/topic_approved.txt

@@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/short/topic_disapproved.txt

@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/short/topic_in_queue.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Topic moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the topic, click the following link:
 If you want to view the forum, click the following link:
 {U_FORUM}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/topic_approved.txt

@@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE
 If you want to view the topic, click the following link:
 {U_VIEW_TOPIC}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/topic_disapproved.txt

@@ -8,5 +8,4 @@ The following reason was given for the disapproval:
 
 {REASON}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/topic_in_queue.txt

@@ -1,4 +1,4 @@
-Subject: Topic reply notification - "{TOPIC_TITLE}"
+Subject: Topic moderation notification - "{TOPIC_TITLE}"
 
 Hello {USERNAME},
 
@@ -10,8 +10,4 @@ If you want to view the topic, click the following link:
 If you want to view the forum, click the following link:
 {U_FORUM}
 
-If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here:
-
-{U_NOTIFICATION_SETTINGS}
-
 {EMAIL_SIG}

phpBB/language/en/email/user_reactivate_account.txt

@@ -15,5 +15,4 @@ Please visit the following link to reactivate your account:
 
 {U_ACTIVATE}
 
-
 {EMAIL_SIG}

phpBB/language/en/email/user_resend_inactive.txt

@@ -14,7 +14,6 @@ Please visit the following link in order to activate your account:
 
 {U_ACTIVATE}
 
-
 Thank you for registering.
 
 {EMAIL_SIG}