From 8e599e23a04d5d03881b61104627adb1258d9fd3 Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Sat, 6 Feb 2021 17:53:40 +0100
Subject: [PATCH] [ticket/16589] Remove "or click unsubscribe ... link"
 sentence

PHPBB3-16589
---
 phpBB/language/en/email/forum_notify.txt          | 3 +--
 phpBB/language/en/email/newtopic_notify.txt       | 1 -
 phpBB/language/en/email/short/newtopic_notify.txt | 1 -
 phpBB/language/en/email/short/privmsg_notify.txt  | 2 +-
 phpBB/language/en/email/short/topic_notify.txt    | 1 -
 phpBB/language/en/email/topic_notify.txt          | 1 -
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt
index 7b9c19809d..f0a260130b 100644
--- a/phpBB/language/en/email/forum_notify.txt
+++ b/phpBB/language/en/email/forum_notify.txt
@@ -3,7 +3,7 @@ List-Unsubscribe: <{U_STOP_WATCHING_FORUM}>
 
 Hello {USERNAME},
 
-The "{FORUM_NAME}" received a new reply to the topic"{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic.
+The "{FORUM_NAME}" received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic.
 {U_NEWEST_POST}
 
 If you want to view the topic, click the following link:
@@ -14,6 +14,5 @@ If you want to view the forum, click the following link:
 
 If you no longer wish to watch this forum click the following link:
 {U_STOP_WATCHING_FORUM}
-Or click the "Unsubscribe forum" link found at the bottom of the forum above.
 
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt
index b8d6300a59..fd946100e1 100644
--- a/phpBB/language/en/email/newtopic_notify.txt
+++ b/phpBB/language/en/email/newtopic_notify.txt
@@ -11,6 +11,5 @@ If you want to view the new topic, click the following link:
 
 If you no longer wish to watch this forum click the following link:
 {U_STOP_WATCHING_FORUM}
-Or click the "Unsubscribe forum" link found at the bottom of the forum above.
 
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt
index 8cd97b5cd6..e8f8c25b9e 100644
--- a/phpBB/language/en/email/short/newtopic_notify.txt
+++ b/phpBB/language/en/email/short/newtopic_notify.txt
@@ -7,6 +7,5 @@ The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME
 
 If you no longer wish to watch this forum click the following link:
 {U_STOP_WATCHING_FORUM}
-Or click the "Unsubscribe forum" link found at the bottom of the forum above.
 
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt
index da4acfb373..0c579fa51c 100644
--- a/phpBB/language/en/email/short/privmsg_notify.txt
+++ b/phpBB/language/en/email/short/privmsg_notify.txt
@@ -1,4 +1,4 @@
-Subject: New private message has arrived
+Subject: New private message
 
 Hello {USERNAME},
 
diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt
index 5cce11c461..d92b342f33 100644
--- a/phpBB/language/en/email/short/topic_notify.txt
+++ b/phpBB/language/en/email/short/topic_notify.txt
@@ -9,6 +9,5 @@ If you want to view the newest post made since your last visit, click the follow
 
 If you no longer wish to watch this topic click the following link:
 {U_STOP_WATCHING_TOPIC}
-Or click the "Unsubscribe topic" link found at the bottom of the topic above.
 
 {EMAIL_SIG}
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 08d4d99607..ccef09fcbb 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -16,6 +16,5 @@ If you want to view the forum, click the following link:
 
 If you no longer wish to watch this topic click the following link:
 {U_STOP_WATCHING_TOPIC}
-Or click the "Unsubscribe topic" link found at the bottom of the topic above.
 
 {EMAIL_SIG}