5 files changed, 51 insertions, 6 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index bebc9e3435..1005b2ef5b 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -70,6 +70,8 @@ $lang = array_merge($lang, array(
 	'ALLOW_NO_CENSORS'			=> 'Allow disabling of word censoring',
 	'ALLOW_NO_CENSORS_EXPLAIN'	=> 'Users can choose to disable the automatic word censoring of posts and private messages.',
 	'ALLOW_PM_ATTACHMENTS'		=> 'Allow attachments in private messages',
+	'ALLOW_PM_REPORT'			=> 'Allow users to report private messages',
+	'ALLOW_PM_REPORT_EXPLAIN'	=> 'If this setting is enabled, users have the option of reporting a private message they have received or sent to the board’s moderators. These private messages will then be visible in the Moderator Control Panel.',
 	'ALLOW_QUICK_REPLY'			=> 'Allow quick reply',
 	'ALLOW_QUICK_REPLY_EXPLAIN'	=> 'This setting defines if quick reply is enabled or not. If this setting is enabled, forums need to have their quick reply option enabled too.',
 	'ALLOW_SIG'					=> 'Allow signatures',
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9a7fda5951..ac8a14a21c 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -409,6 +409,7 @@ $lang = array_merge($lang, array(
 	'HIDE_STATISTICS'			=> 'Hide details',
 	'SEND_STATISTICS'			=> 'Send statistical information',
 	'SHOW_STATISTICS'			=> 'Show details',
+	'THANKS_SEND_STATISTICS'	=> 'Thank you for submitting your information.',
 ));
 
 // Log Entries
@@ -505,6 +506,8 @@ $lang = array_merge($lang, array(
 	'LOG_LOCK_POST'				=> '<strong>Locked post</strong><br />» %s',
 	'LOG_MERGE'					=> '<strong>Merged posts</strong> into topic<br />» %s',
 	'LOG_MOVE'					=> '<strong>Moved topic</strong><br />» from %1$s to %2$s',
+	'LOG_PM_REPORT_CLOSED'		=> '<strong>Closed PM report</strong><br />» %s',
+	'LOG_PM_REPORT_DELETED'		=> '<strong>Deleted PM report</strong><br />» %s',
 	'LOG_POST_APPROVED'			=> '<strong>Approved post</strong><br />» %s',
 	'LOG_POST_DISAPPROVED'		=> '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
 	'LOG_POST_EDITED'			=> '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
diff --git a/phpBB/language/en/email/pm_report_closed.txt b/phpBB/language/en/email/pm_report_closed.txt
new file mode 100644
index 0000000000..752a640867
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_closed.txt
@@ -0,0 +1,8 @@
+Subject: Report closed - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed on the private message "{PM_SUBJECT}" 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
diff --git a/phpBB/language/en/email/pm_report_deleted.txt b/phpBB/language/en/email/pm_report_deleted.txt
new file mode 100644
index 0000000000..04e4bd1404
--- /dev/null
+++ b/phpBB/language/en/email/pm_report_deleted.txt
@@ -0,0 +1,8 @@
+Subject: Report deleted - "{PM_SUBJECT}"
+
+Hello {USERNAME},
+
+You are receiving this notification because the report you filed on the post "{PM_SUBJECT}" at "{SITENAME}" was deleted by a moderator or by an administrator.
+
+
+{EMAIL_SIG}
+\ No newline at end of file
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 93b694be77..18195fd0f8 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -46,6 +46,7 @@ $lang = array_merge($lang, array(
 	'ALL_NOTES_DELETED'		=> 'Successfully removed all user notes.',
 	'ALL_REPORTS'			=> 'All reports',
 	'ALREADY_REPORTED'		=> 'This post has already been reported.',
+	'ALREADY_REPORTED_PM'	=> 'This private message has already been reported.',
 	'ALREADY_WARNED'		=> 'A warning has already been issued for this post.',
 	'APPROVE'				=> 'Approve',
 	'APPROVE_POST'			=> 'Approve post',
@@ -58,11 +59,19 @@ $lang = array_merge($lang, array(
 	'CANNOT_WARN_SELF'		=> 'You cannot warn yourself.',
 	'CAN_LEAVE_BLANK'		=> 'This can be left blank.',
 	'CHANGE_POSTER'			=> 'Change poster',
+	'CLOSE_PM_REPORT'		=> 'Close PM report',
+	'CLOSE_PM_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected PM report?',
+	'CLOSE_PM_REPORTS'		=> 'Close PM reports',
+	'CLOSE_PM_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected PM reports?',
 	'CLOSE_REPORT'			=> 'Close report',
 	'CLOSE_REPORT_CONFIRM'	=> 'Are you sure you want to close the selected report?',
 	'CLOSE_REPORTS'			=> 'Close reports',
 	'CLOSE_REPORTS_CONFIRM'	=> 'Are you sure you want to close the selected reports?',
 
+	'DELETE_PM_REPORT'			=> 'Delete PM report',
+	'DELETE_PM_REPORT_CONFIRM'	=> 'Are you sure you want to delete the selected PM report?',
+	'DELETE_PM_REPORTS'			=> 'Delete PM reports',
+	'DELETE_PM_REPORTS_CONFIRM'	=> 'Are you sure you want to delete the selected PM reports?',
 	'DELETE_POSTS'				=> 'Delete posts',
 	'DELETE_POSTS_CONFIRM'		=> 'Are you sure you want to delete these posts?',
 	'DELETE_POST_CONFIRM'		=> 'Are you sure you want to delete this post?',
@@ -106,6 +115,7 @@ $lang = array_merge($lang, array(
 
 	'LATEST_LOGS'				=> 'Latest 5 logged actions',
 	'LATEST_REPORTED'			=> 'Latest 5 reports',
+	'LATEST_REPORTED_PMS'		=> 'Latest 5 PM reports',
 	'LATEST_UNAPPROVED'			=> 'Latest 5 posts awaiting approval',
 	'LATEST_WARNING_TIME'		=> 'Latest warning issued',
 	'LATEST_WARNINGS'			=> 'Latest 5 warnings',
@@ -170,7 +180,14 @@ $lang = array_merge($lang, array(
 
 	'MCP_POST_REPORTS'				=> 'Reports issued on this post',
 
-	'MCP_REPORTS'					=> 'Reported posts',
+	'MCP_PM_REPORTS'				=> 'Reported PMs',
+	'MCP_PM_REPORT_DETAILS'			=> 'PM Report details',
+	'MCP_PM_REPORTS_CLOSED'			=> 'Closed PM reports',
+	'MCP_PM_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about private messages which have previously been resolved.',
+	'MCP_PM_REPORTS_OPEN'			=> 'Open PM reports',
+	'MCP_PM_REPORTS_OPEN_EXPLAIN'	=> 'This is a list of all reported private messages which are still to be handled.',
+
+	'MCP_REPORTS'					=> 'Reported messages',
 	'MCP_REPORT_DETAILS'			=> 'Report details',
 	'MCP_REPORTS_CLOSED'			=> 'Closed reports',
 	'MCP_REPORTS_CLOSED_EXPLAIN'	=> 'This is a list of all reports about posts which have previously been resolved.',
@@ -232,6 +249,11 @@ $lang = array_merge($lang, array(
 	'ONLY_TOPIC'			=> 'Only topic “%s”',
 	'OTHER_USERS'			=> 'Other users posting from this IP',
 
+	'PM_REPORT_CLOSED_SUCCESS'	=> 'The selected PM report has been closed successfully.',
+	'PM_REPORT_DELETED_SUCCESS'	=> 'The selected PM report has been deleted successfully.',
+	'PM_REPORTED_SUCCESS'		=> 'This private message has been successfully reported.',
+	'PM_REPORTS_TOTAL'			=> 'In total there are <strong>%d</strong> PM reports to review.',
+	'PM_REPORTS_ZERO_TOTAL'		=> 'There are no PM reports to review.',
 	'POSTER'					=> 'Poster',
 	'POSTS_APPROVED_SUCCESS'	=> 'The selected posts have been approved.',
 	'POSTS_DELETED_SUCCESS'		=> 'The selected posts have been successfully removed from the database.',
@@ -264,7 +286,7 @@ $lang = array_merge($lang, array(
 	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
 	'REPORT_DETAILS'			=> 'Report details',
 	'REPORT_MESSAGE'			=> 'Report this message',
-	'REPORT_MESSAGE_EXPLAIN'	=> 'Use this form to report the selected message. Reporting should generally be used only if the message breaks forum rules.',
+	'REPORT_MESSAGE_EXPLAIN'	=> 'Use this form to report the selected private message. Reporting should generally be used only if the message breaks forum rules. <strong>Reporting a private message will make its contents visible to all moderators</strong>',
 	'REPORT_NOTIFY'				=> 'Notify me',
 	'REPORT_NOTIFY_EXPLAIN'		=> 'Informs you when your report is dealt with.',
 	'REPORT_POST_EXPLAIN'		=> 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
@@ -275,6 +297,7 @@ $lang = array_merge($lang, array(
 	'RETURN_MESSAGE'			=> '%sReturn to the message%s',
 	'RETURN_NEW_FORUM'			=> '%sGo to the new forum%s',
 	'RETURN_NEW_TOPIC'			=> '%sGo to the new topic%s',
+	'RETURN_PM'					=> '%sReturn to the private message%s',
 	'RETURN_POST'				=> '%sReturn to the post%s',
 	'RETURN_QUEUE'				=> '%sReturn to the queue%s',
 	'RETURN_REPORTS'			=> '%sReturn to the reports%s',
@@ -346,6 +369,7 @@ $lang = array_merge($lang, array(
 	'USER_WARNING_ADDED'			=> 'User warned successfully.',
 
 	'VIEW_DETAILS'			=> 'View details',
+	'VIEW_PM'				=> 'View private message',
 	'VIEW_POST'				=> 'View post',
 
 	'WARNED_USERS'			=> 'Warned users',
@@ -365,10 +389,10 @@ $lang = array_merge($lang, array(
 			'OTHER'		=> 'Other',
 		),
 		'DESCRIPTION' => array(
-			'WAREZ'		=> 'The post contains links to illegal or pirated software.',
-			'SPAM'		=> 'The reported post has the only purpose to advertise for a website or another product.',
-			'OFF_TOPIC'	=> 'The reported post is off topic.',
-			'OTHER'		=> 'The reported post does not fit into any other category, please use the further information field.',
+			'WAREZ'		=> 'The message contains links to illegal or pirated software.',
+			'SPAM'		=> 'The reported message has the only purpose to advertise for a website or another product.',
+			'OFF_TOPIC'	=> 'The reported message is off topic.',
+			'OTHER'		=> 'The reported message does not fit into any other category, please use the further information field.',
 		)
 	),
 ));