Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/11666] Rewording POST_DELETED and
  [ticket/11666] Removing MESSAGE_DELETED..
This commit is contained in:
Joas Schilling 2014-03-28 17:43:13 +01:00
commit c2214705a6

View file

@ -194,9 +194,9 @@ $lang = array_merge($lang, array(
'POST_APPROVAL_NOTIFY' => 'You will be notified when your post has been approved.', 'POST_APPROVAL_NOTIFY' => 'You will be notified when your post has been approved.',
'POST_CONFIRMATION' => 'Confirmation of post', '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.', '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.',
'POST_DELETED' => 'This message has been deleted successfully.', 'POST_DELETED' => 'This post has been deleted successfully.',
'POST_EDITED' => 'This message has been edited successfully.', 'POST_EDITED' => 'This post has been edited successfully.',
'POST_EDITED_MOD' => 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.', 'POST_EDITED_MOD' => 'This post has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.',
'POST_GLOBAL' => 'Global', 'POST_GLOBAL' => 'Global',
'POST_ICON' => 'Post icon', 'POST_ICON' => 'Post icon',
'POST_NORMAL' => 'Normal', 'POST_NORMAL' => 'Normal',