From 76e1a4651228ca7421f4eb7a84462bf97b6cd0e6 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Thu, 18 Feb 2021 20:53:02 +0100 Subject: [PATCH] [ticket/16589] Replace personal message with private message PHPBB3-16589 --- phpBB/language/en/email/report_closed.txt | 2 +- phpBB/language/en/email/report_pm_closed.txt | 2 +- phpBB/language/en/ucp.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt index 71db29f65f..df55fe33b2 100644 --- a/phpBB/language/en/email/report_closed.txt +++ b/phpBB/language/en/email/report_closed.txt @@ -2,7 +2,7 @@ Subject: Report closed - "{POST_SUBJECT}" Hello {USERNAME}, -The report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" 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. +The report you filed on the post "{POST_SUBJECT}" by "{AUTHOR_NAME}" 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 private message. You can view your reported post by clicking on the following link: diff --git a/phpBB/language/en/email/report_pm_closed.txt b/phpBB/language/en/email/report_pm_closed.txt index 66ba17fb1b..9ae9710f54 100644 --- a/phpBB/language/en/email/report_pm_closed.txt +++ b/phpBB/language/en/email/report_pm_closed.txt @@ -2,7 +2,7 @@ Subject: Private message report closed - "{SUBJECT}" Hello {USERNAME}, -The report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" 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. +The report you filed on the private message "{SUBJECT}" by "{AUTHOR_NAME}" 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 private message. You can view your reported private message by clicking on the following link: diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 8d91f00c5a..dda28678c2 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -225,7 +225,7 @@ $lang = array_merge($lang, array( 'FIELD_INVALID_VALUE' => 'The field “%s” has an invalid value.', 'FOE_MESSAGE' => 'Message from foe', - 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', + 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Private messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', 'FOES_UPDATED' => 'Your foes list has been updated successfully.', 'FOLDER_ADDED' => 'Folder successfully added.', 'FOLDER_MESSAGE_STATUS' => array(