diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:53:03 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:53:03 +0100 |
| commit | 76d22f3e535c703c9222c80d6f6021c5ac8eefb5 (patch) | |
| tree | 08717fe769b113fd5b7a87d3578ab87f74dfbe10 /phpBB/language | |
| parent | 275d6bec6aa97dbe402a6f5d9791c04ffbd24152 (diff) | |
| parent | 835ee2ba63a99cd4351e7fd8363cf86c1008e7a0 (diff) | |
| download | forums-76d22f3e535c703c9222c80d6f6021c5ac8eefb5.tar forums-76d22f3e535c703c9222c80d6f6021c5ac8eefb5.tar.gz forums-76d22f3e535c703c9222c80d6f6021c5ac8eefb5.tar.bz2 forums-76d22f3e535c703c9222c80d6f6021c5ac8eefb5.tar.xz forums-76d22f3e535c703c9222c80d6f6021c5ac8eefb5.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/email/short/newtopic_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/short/topic_notify.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index bf6799e5be..5089e7dcb8 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index 472375fb22..529478eae2 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/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. You can use the following link to view the replies made, 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} |