aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-11-19 15:28:37 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-11-19 15:28:37 +0100
commit46994e8dfbb3a50aeeb5b02cf850f8a7630b9e95 (patch)
tree659784daab35d334d7d2f5d1399ac56cacc5f935 /phpBB/language/en/email
parentMerge branch 'prep-release-3.1.0-a2' into develop (diff)
parentMerge remote-tracking branch 'prototech/ticket/11814' into develop-olympus (diff)
downloadphpbb-46994e8dfbb3a50aeeb5b02cf850f8a7630b9e95.tar.gz
phpbb-46994e8dfbb3a50aeeb5b02cf850f8a7630b9e95.tar.bz2
phpbb-46994e8dfbb3a50aeeb5b02cf850f8a7630b9e95.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11814] Remove redundant text from the topic reply email notification.
Diffstat (limited to 'phpBB/language/en/email')
-rw-r--r--phpBB/language/en/email/topic_notify.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt
index 529478eae2..d5272d7416 100644
--- a/phpBB/language/en/email/topic_notify.txt
+++ b/phpBB/language/en/email/topic_notify.txt
@@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}"
Hello {USERNAME},
-You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> 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.
+You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic.
If you want to view the newest post made since your last visit, click the following link:
{U_NEWEST_POST}
@@ -14,7 +14,6 @@ If you want to view the forum, click the following link:
{U_FORUM}
If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link:
-
{U_STOP_WATCHING_TOPIC}
{EMAIL_SIG}