diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-13 12:21:41 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-13 12:21:41 +0200 |
| commit | bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4 (patch) | |
| tree | 1cbcefbb98ebbe883b2fe95e21a5c37aa0059605 | |
| parent | ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5 (diff) | |
| parent | bec9b7c34e63c7485477fa1edc2f6330889cc699 (diff) | |
| download | forums-bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4.tar forums-bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4.tar.gz forums-bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4.tar.bz2 forums-bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4.tar.xz forums-bf1f0b80622a1cb4c07ca7dce9bc7a5b8fae15d4.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12519] Restore m_approve language description
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 5ea151f6ea..2082d7c89d 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -142,7 +142,7 @@ $lang = array_merge($lang, array( 'ACL_M_EDIT' => 'Can edit posts', 'ACL_M_DELETE' => 'Can permanently delete posts', 'ACL_M_SOFTDELETE' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', - 'ACL_M_APPROVE' => 'Can approve posts', + 'ACL_M_APPROVE' => 'Can approve and restore posts', 'ACL_M_REPORT' => 'Can close and delete reports', 'ACL_M_CHGPOSTER' => 'Can change post author', |