From 4a8d38aab13099fdb4fb7e2a7b72cff1c05fda9c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 27 Oct 2012 17:12:34 +0200
Subject: [feature/soft-delete] Allow soft deleting/restoring topics via
 quickmoderation

PHPBB3-9567
---
 phpBB/language/en/acp/common.php | 5 ++++-
 phpBB/language/en/posting.php    | 2 ++
 phpBB/language/en/viewtopic.php  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/language')

diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 91a35311bc..a2fe426415 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -554,9 +554,12 @@ $lang = array_merge($lang, array(
 	'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',
-	'LOG_POST_RESTORED'         => '<strong>Restored post</strong><br />» %s',
+	'LOG_POST_RESTORED'			=> '<strong>Restored post</strong><br />» %s',
 	'LOG_REPORT_CLOSED'			=> '<strong>Closed report</strong><br />» %s',
 	'LOG_REPORT_DELETED'		=> '<strong>Deleted report</strong><br />» %s',
+	'LOG_RESTORE_TOPIC'			=> '<strong>Restored topic “%1$s” written by</strong><br />» %2$s',
+	'LOG_SOFTDELETE_POST'		=> '<strong>Soft deleted post “%1$s” written by</strong><br />» %2$s',
+	'LOG_SOFTDELETE_TOPIC'		=> '<strong>Soft deleted topic “%1$s” written by</strong><br />» %2$s',
 	'LOG_SPLIT_DESTINATION'		=> '<strong>Moved split posts</strong><br />» to %s',
 	'LOG_SPLIT_SOURCE'			=> '<strong>Split posts</strong><br />» from %s',
 
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index a57a907423..10e1d48d38 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -82,6 +82,8 @@ $lang = array_merge($lang, array(
 	'DELETE_POST_SOFT_EXP'		=> 'Soft deleted posts can be recovered by a moderator',
 	'DELETE_POST_REASON'		=> 'Soft delete reason',
 	'DELETE_POST_WARN'			=> 'Once deleted the post cannot be recovered',
+	'DELETE_TOPIC_SOFT'			=> 'Soft delete topic',
+	'DELETE_TOPIC_SOFT_EXP'		=> 'Soft deleted topics can be recovered by a moderator',
 	'DISABLE_BBCODE'			=> 'Disable BBCode',
 	'DISABLE_MAGIC_URL'			=> 'Do not automatically parse URLs',
 	'DISABLE_SMILIES'			=> 'Disable smilies',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index a5739a6586..4e78bcfde3 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -98,7 +98,8 @@ $lang = array_merge($lang, array(
 	'QUOTE'					=> 'Quote',
 
 	'REPLY_TO_TOPIC'		=> 'Reply to topic',
-	'RESTORE'               => 'Restore',
+	'RESTORE'				=> 'Restore',
+	'RESTORE_TOPIC'			=> 'Restore topic',
 	'RETURN_POST'			=> '%sReturn to the post%s',
 
 	'SUBMIT_VOTE'			=> 'Submit vote',
-- 
cgit v1.2.1