diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-01 22:23:35 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-01 22:23:35 +0100 |
| commit | bed82bf2bd13ca04cc1572d454eee5ef3a9053a6 (patch) | |
| tree | 1c280b81838bb1e1b4d16c94d55fa7f769507501 /phpBB/language | |
| parent | 8d05dad63471ffbc58feecd1f44cfa5703f0d5f1 (diff) | |
| download | forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.gz forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.bz2 forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.tar.xz forums-bed82bf2bd13ca04cc1572d454eee5ef3a9053a6.zip | |
[feature/soft-delete] Invert the logic on confirm box
Permanent delete is now the checkbox rather then softdelete.
PHPBB3-9567
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/mcp.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index f6616d1a69..22ee2a54e2 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -72,16 +72,12 @@ $lang = array_merge($lang, array( '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?', 'DELETE_REPORT' => 'Delete report', 'DELETE_REPORT_CONFIRM' => 'Are you sure you want to delete the selected report?', 'DELETE_REPORTS' => 'Delete reports', 'DELETE_REPORTS_CONFIRM' => 'Are you sure you want to delete the selected reports?', 'DELETE_SHADOW_TOPIC' => 'Delete shadow topic', 'DELETE_TOPICS' => 'Delete selected topics', - 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?', - 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?', 'DISAPPROVE' => 'Disapprove', 'DISAPPROVE_REASON' => 'Reason for disapproval', 'DISAPPROVE_POST' => 'Disapprove post', diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 16d3e9a37a..5418069d08 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -77,13 +77,20 @@ $lang = array_merge($lang, array( 'DELETE_MESSAGE' => 'Delete message', 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this message?', 'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts.', + 'DELETE_PERMANENTLY' => 'Delete permanently', 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?', - 'DELETE_POST_SOFT' => 'Soft delete post', - 'DELETE_POST_SOFT_EXP' => 'Soft deleted posts can be recovered by a moderator', - 'DELETE_POST_REASON' => 'Soft delete reason', + 'DELETE_POST_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete this post?', + 'DELETE_POST_PERMANENTLY' => 'Permanently delete this post so it can not be recovered', + 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?', + 'DELETE_POSTS_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete these posts?', + 'DELETE_REASON' => 'Delete reason', + 'DELETE_REASON_EXPLAIN' => 'The reason is only used when the post is not deleted permanently.', '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', + 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?', + 'DELETE_TOPIC_PERMANENTLY' => 'Permanently delete this topic so it can not be recovered', + 'DELETE_TOPIC_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete this topic?', + 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?', + 'DELETE_TOPICS_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete these topics?', 'DISABLE_BBCODE' => 'Disable BBCode', 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs', 'DISABLE_SMILIES' => 'Disable smilies', @@ -184,7 +191,6 @@ $lang = array_merge($lang, array( 'POLL_VOTE_CHANGE' => 'Allow re-voting', 'POLL_VOTE_CHANGE_EXPLAIN' => 'If enabled users are able to change their vote.', 'POSTED_ATTACHMENTS' => 'Posted attachments', - 'POST_ALREADY_SOFTDELETED' => 'The post is already soft deleted, you can only hard delete it.', 'POST_APPROVAL_NOTIFY' => 'You will be notified when your post has been approved.', 'POST_CONFIRMATION' => 'Confirmation of post', 'POST_CONFIRM_EXPLAIN' => 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', @@ -241,7 +247,6 @@ $lang = array_merge($lang, array( 'TOO_MANY_URLS' => 'Your message contains too many URLs. The maximum number of URLs allowed is %d.', 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.', 'TOPIC_BUMPED' => 'Topic has been bumped successfully.', - 'TOPIC_ALREADY_SOFTDELETED' => 'The topic is already soft deleted, you can only hard delete it.', 'UNAUTHORISED_BBCODE' => 'You cannot use certain BBCodes: %s.', 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.', |