diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-24 02:45:35 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-24 02:45:35 +0200 |
| commit | f0516b7d2a0ac0e1fbf6832cfcfde119ad508907 (patch) | |
| tree | 362bd27fad2e1fe08e6649b27b3ab4baa247fee6 /phpBB/language | |
| parent | 7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989 (diff) | |
| parent | bf04bfcced7934704e7f2682ee608f490cb3fc76 (diff) | |
| download | forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.gz forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.bz2 forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.xz forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11667' into develop
* EXreaction/ticket/11667:
[ticket/11667] Use @inheritdoc
[ticket/11734] Readd accidently removed language strings of forum permissions
[ticket/11667] Make functions abstract in includeasset
[ticket/11667] includeasset should be abstract
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index d0128db34a..5ea151f6ea 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -102,6 +102,17 @@ $lang = array_merge($lang, array( // Forum Permissions $lang = array_merge($lang, array( + 'ACL_F_LIST' => 'Can see forum', + 'ACL_F_READ' => 'Can read forum', + 'ACL_F_SEARCH' => 'Can search the forum', + 'ACL_F_SUBSCRIBE' => 'Can subscribe forum', + 'ACL_F_PRINT' => 'Can print topics', + 'ACL_F_EMAIL' => 'Can email topics', + 'ACL_F_BUMP' => 'Can bump topics', + 'ACL_F_USER_LOCK' => 'Can lock own topics', + 'ACL_F_DOWNLOAD' => 'Can download files', + 'ACL_F_REPORT' => 'Can report posts', + 'ACL_F_POST' => 'Can start new topics', 'ACL_F_STICKY' => 'Can post stickies', 'ACL_F_ANNOUNCE' => 'Can post announcements', |