diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-03 23:37:35 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-03 23:37:35 +0100 |
| commit | 269330749f1e456caf5c2e787448820449586ed4 (patch) | |
| tree | a36e3c0d587e03dfe8fed6d89485095c1e71d21f /phpBB/language/en/acp/permissions_phpbb.php | |
| parent | 334265fc839f95d24cce44ec675ae8cef7b4bfaa (diff) | |
| download | forums-269330749f1e456caf5c2e787448820449586ed4.tar forums-269330749f1e456caf5c2e787448820449586ed4.tar.gz forums-269330749f1e456caf5c2e787448820449586ed4.tar.bz2 forums-269330749f1e456caf5c2e787448820449586ed4.tar.xz forums-269330749f1e456caf5c2e787448820449586ed4.zip | |
[feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)
PHPBB3-9567
Diffstat (limited to 'phpBB/language/en/acp/permissions_phpbb.php')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 0a089f9dc1..9a7d15d4cd 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -156,9 +156,9 @@ $lang = array_merge($lang, array( 'acl_f_flash' => array('lang' => 'Can use [flash] BBCode tag', 'cat' => 'content'), 'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'actions'), - 'acl_f_softdelete' => array('lang' => 'Can soft delete own posts', 'cat' => 'actions'), + 'acl_f_softdelete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'), 'acl_f_restore' => array('lang' => 'Can restore own posts', 'cat' => 'actions'), - 'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'), + 'acl_f_delete' => array('lang' => 'Can delete own posts permanently', 'cat' => 'actions'), 'acl_f_user_lock' => array('lang' => 'Can lock own topics', 'cat' => 'actions'), 'acl_f_bump' => array('lang' => 'Can bump topics', 'cat' => 'actions'), 'acl_f_report' => array('lang' => 'Can report posts', 'cat' => 'actions'), @@ -175,11 +175,11 @@ $lang = array_merge($lang, array( // Moderator Permissions $lang = array_merge($lang, array( 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'), - 'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'), + 'acl_m_delete' => array('lang' => 'Can delete posts permanently', 'cat' => 'post_actions'), 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'), 'acl_m_report' => array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'), 'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'), - 'acl_m_softdelete' => array('lang' => 'Can soft delete posts', 'cat' => 'post_actions'), + 'acl_m_softdelete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'), 'acl_m_restore' => array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'), 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'), @@ -187,7 +187,6 @@ $lang = array_merge($lang, array( 'acl_m_split' => array('lang' => 'Can split topics', 'cat' => 'topic_actions'), 'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'), - 'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'), 'acl_m_warn' => array('lang' => 'Can issue warnings<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local) 'acl_m_ban' => array('lang' => 'Can manage bans<br /><em>This setting is only assigned globally. It is not forum based.</em>', 'cat' => 'misc'), // This moderator setting is only global (and not local) |