diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-04-25 06:09:08 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-04-25 06:09:08 -0700 |
| commit | 2bf01098d2c3e45824448642dde9f1469ec6e588 (patch) | |
| tree | c3af288f4f7625e1b463c793d1f799c6494479ed /phpBB/language | |
| parent | ba05c9dd6b01fc1e78bc874aaa79d73eccf2ab6d (diff) | |
| parent | 1f6f2435d0d4c18bd0b7586a32534f030710c929 (diff) | |
| download | forums-2bf01098d2c3e45824448642dde9f1469ec6e588.tar forums-2bf01098d2c3e45824448642dde9f1469ec6e588.tar.gz forums-2bf01098d2c3e45824448642dde9f1469ec6e588.tar.bz2 forums-2bf01098d2c3e45824448642dde9f1469ec6e588.tar.xz forums-2bf01098d2c3e45824448642dde9f1469ec6e588.zip | |
Merge pull request #1361 from MGaetan89/ticket/11471
[ticket/11471] Unrelated text in e-mail templates
Diffstat (limited to 'phpBB/language')
20 files changed, 10 insertions, 54 deletions
diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt index e715b54026..a02dba142a 100644 --- a/phpBB/language/en/email/post_approved.txt +++ b/phpBB/language/en/email/post_approved.txt @@ -10,5 +10,4 @@ If you want to view the post, click the following link: If you want to view the topic, click the following link: {U_VIEW_TOPIC} - {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt index 2f8a8381cb..9b2ee643ff 100644 --- a/phpBB/language/en/email/post_disapproved.txt +++ b/phpBB/language/en/email/post_disapproved.txt @@ -8,5 +8,4 @@ The following reason was given for the disapproval: {REASON} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/post_in_queue.txt b/phpBB/language/en/email/post_in_queue.txt index 8d56ce6c4d..941f070d37 100644 --- a/phpBB/language/en/email/post_in_queue.txt +++ b/phpBB/language/en/email/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Post moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the post, click the following link: If you want to view the topic, click the following link: {U_TOPIC} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt index eb7ef22b5e..f248018f9a 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -4,5 +4,4 @@ Hello {USERNAME}, You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. - -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt index 4292ca2239..9a30ea2ddd 100644 --- a/phpBB/language/en/email/report_deleted.txt +++ b/phpBB/language/en/email/report_deleted.txt @@ -4,5 +4,4 @@ Hello {USERNAME}, You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. - -{EMAIL_SIG}
\ No newline at end of file +{EMAIL_SIG} diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt index 66ae82d074..a101a014ff 100644 --- a/phpBB/language/en/email/report_pm.txt +++ b/phpBB/language/en/email/report_pm.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Private Message report - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}" If you want to view the report, click the following link: {U_VIEW_REPORT} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/report_post.txt b/phpBB/language/en/email/report_post.txt index 46983be1ed..8eb24ec6af 100644 --- a/phpBB/language/en/email/report_post.txt +++ b/phpBB/language/en/email/report_post.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Post report - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the report, click the following link: If you want to view the post, click the following link: {U_VIEW_POST} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt index e715b54026..a02dba142a 100644 --- a/phpBB/language/en/email/short/post_approved.txt +++ b/phpBB/language/en/email/short/post_approved.txt @@ -10,5 +10,4 @@ If you want to view the post, click the following link: If you want to view the topic, click the following link: {U_VIEW_TOPIC} - {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt index 2f8a8381cb..9b2ee643ff 100644 --- a/phpBB/language/en/email/short/post_disapproved.txt +++ b/phpBB/language/en/email/short/post_disapproved.txt @@ -8,5 +8,4 @@ The following reason was given for the disapproval: {REASON} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt index 8d56ce6c4d..941f070d37 100644 --- a/phpBB/language/en/email/short/post_in_queue.txt +++ b/phpBB/language/en/email/short/post_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Post moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the post, click the following link: If you want to view the topic, click the following link: {U_TOPIC} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt index 66ae82d074..a101a014ff 100644 --- a/phpBB/language/en/email/short/report_pm.txt +++ b/phpBB/language/en/email/short/report_pm.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Private Message report - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -7,8 +7,4 @@ You are receiving this notification because a Private Message titled "{SUBJECT}" If you want to view the report, click the following link: {U_VIEW_REPORT} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt index 46983be1ed..8eb24ec6af 100644 --- a/phpBB/language/en/email/short/report_post.txt +++ b/phpBB/language/en/email/short/report_post.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Post report - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the report, click the following link: If you want to view the post, click the following link: {U_VIEW_POST} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt index 0b09918b89..60c7ef4c09 100644 --- a/phpBB/language/en/email/short/topic_approved.txt +++ b/phpBB/language/en/email/short/topic_approved.txt @@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE If you want to view the topic, click the following link: {U_VIEW_TOPIC} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt index a4bd9c151e..9c821e2bba 100644 --- a/phpBB/language/en/email/short/topic_disapproved.txt +++ b/phpBB/language/en/email/short/topic_disapproved.txt @@ -8,5 +8,4 @@ The following reason was given for the disapproval: {REASON} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt index ae8f9e2484..706dddf64f 100644 --- a/phpBB/language/en/email/short/topic_in_queue.txt +++ b/phpBB/language/en/email/short/topic_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Topic moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the topic, click the following link: If you want to view the forum, click the following link: {U_FORUM} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt index 0b09918b89..60c7ef4c09 100644 --- a/phpBB/language/en/email/topic_approved.txt +++ b/phpBB/language/en/email/topic_approved.txt @@ -7,5 +7,4 @@ You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITE If you want to view the topic, click the following link: {U_VIEW_TOPIC} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt index a4bd9c151e..9c821e2bba 100644 --- a/phpBB/language/en/email/topic_disapproved.txt +++ b/phpBB/language/en/email/topic_disapproved.txt @@ -8,5 +8,4 @@ The following reason was given for the disapproval: {REASON} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/topic_in_queue.txt b/phpBB/language/en/email/topic_in_queue.txt index ae8f9e2484..706dddf64f 100644 --- a/phpBB/language/en/email/topic_in_queue.txt +++ b/phpBB/language/en/email/topic_in_queue.txt @@ -1,4 +1,4 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" +Subject: Topic moderation notification - "{TOPIC_TITLE}" Hello {USERNAME}, @@ -10,8 +10,4 @@ If you want to view the topic, click the following link: If you want to view the forum, click the following link: {U_FORUM} -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: - -{U_NOTIFICATION_SETTINGS} - {EMAIL_SIG} diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt index 7e25018f4d..385c09f4c5 100644 --- a/phpBB/language/en/email/user_reactivate_account.txt +++ b/phpBB/language/en/email/user_reactivate_account.txt @@ -15,5 +15,4 @@ Please visit the following link to reactivate your account: {U_ACTIVATE} - {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt index 7879b914b9..b9b95ce9e5 100644 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -14,7 +14,6 @@ Please visit the following link in order to activate your account: {U_ACTIVATE} - Thank you for registering. {EMAIL_SIG}
\ No newline at end of file |