Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to plugins like groups and wire)

git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 5 deletions

diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index 97b86d242..8fb1b6f5a 100644
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -18,15 +18,14 @@
 			'item:object:reported_content' => 'Reported items',
 			'reportedcontent' => 'Reported content',
 			'reportedcontent:this' => 'Report this',
-			'reportedcontent:this:title' => 'Report this page to the site administrator for review',
-			'reportedcontent:none' => 'There is no reported content at this time.',
+			'reportedcontent:none' => 'There is no reported content',
 			'reportedcontent:report' => 'Report to admin',
 			'reportedcontent:title' => 'Page title',
 			'reportedcontent:deleted' => 'The reported content has been deleted',
 			'reportedcontent:notdeleted' => 'We were not able to delete that report',
-			'reportedcontent:delete' => 'Delete',
+			'reportedcontent:delete' => 'Delete report',
 			'reportedcontent:areyousure' => 'Are you sure you want to delete?',
-			'reportedcontent:archive' => 'Archive',
+			'reportedcontent:archive' => 'Archive report',
 			'reportedcontent:archived' => 'The report has been archived',
 			'reportedcontent:visit' => 'Visit reported item',
 			'reportedcontent:by' => 'Report by',
@@ -39,7 +38,7 @@
 			'reportedcontent:failing' => 'Your report could not be sent',
 			'reportedcontent:report' => 'Report this', 
 			'reportedcontent:moreinfo' => 'More info',
-			'reportedcontent:warning' => 'Please don\'t abuse the reporting service.',
+	
 			'reportedcontent:failed' => 'Sorry, the attempt to report this content has failed.',
 			'reportedcontent:notarchived' => 'We were not able to archive that report',
 	);