diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:28:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-09-02 12:28:33 +0200 |
| commit | 5ab378f1ee34951c0683751d07cb8cca8a9a7bd1 (patch) | |
| tree | 309522ce90a89c6551a56082023df5017094e98b /phpBB/language/en | |
| parent | ba9d303d525e3b8a12748da02080e3cbc6644a3b (diff) | |
| parent | cd9711b7c9201fa58ce56e56f85aa2c196bcbdae (diff) | |
| download | forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.gz forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.bz2 forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.tar.xz forums-5ab378f1ee34951c0683751d07cb8cca8a9a7bd1.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3.0.12
* nickvergessen/ticket/11769:
[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
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/email/forum_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/newtopic_notify.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/email/topic_notify.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index 490780a0a6..6a2eb90190 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post 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 reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index eda1370938..2da7ee8766 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/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/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index fcfbcc2abd..f48eb5d40a 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} |