diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:31:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:31:27 +0200 |
| commit | 5ddb0ba629e4b31ada931240c661d3f4c43d8676 (patch) | |
| tree | 647d6a6d642a96f991667dd3208cff479bb30ae4 /phpBB/language/en/email/topic_notify.txt | |
| parent | da373ea8a09c39e14fbb619963e7c15d50a11ae4 (diff) | |
| parent | 68555d2d513a6a8721777382a8cc8e4633e18cd3 (diff) | |
| download | forums-5ddb0ba629e4b31ada931240c661d3f4c43d8676.tar forums-5ddb0ba629e4b31ada931240c661d3f4c43d8676.tar.gz forums-5ddb0ba629e4b31ada931240c661d3f4c43d8676.tar.bz2 forums-5ddb0ba629e4b31ada931240c661d3f4c43d8676.tar.xz forums-5ddb0ba629e4b31ada931240c661d3f4c43d8676.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11769] Allow using 0 as poster name
[ticket/11769] Allow '0' as username
[ticket/11769] Allow '0' as username in notification mails
[ticket/11769] Fix language issues in the doc blocks
[ticket/11769] Correctly supply the post author's username in posting.php
Conflicts:
phpBB/includes/functions_posting.php
Diffstat (limited to 'phpBB/language/en/email/topic_notify.txt')
| -rw-r--r-- | phpBB/language/en/email/topic_notify.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 472375fb22..529478eae2 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. 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} |