aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-11-04 22:05:38 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-11-04 22:05:38 +0000
commitcd70db7976f43d01cd3cd41467c09f85298d447b (patch)
tree6f583aba6f9176a1e732652f10a928f0ae004c6c /phpBB/language
parent88f814a5c57246250a82ad53d43f8f90da5afb60 (diff)
downloadforums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.gz
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.bz2
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.xz
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.zip
new permissions, merged attachment tables (the intended purpose of two tables is no longer valid), attachment updates along the merging...
Note: please merge your attachment tables (develop dir). git-svn-id: file:///svn/phpbb/trunk@4637 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/lang_admin.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 4d6d5949c0..a008f8c5e6 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -425,7 +425,7 @@ $lang += array(
'acl_f_reply' => 'Can reply to posts',
'acl_f_quote' => 'Can quote posts',
'acl_f_edit' => 'Can edit own posts',
- 'acl_f_lock' => 'Can lock own topics',
+ 'acl_f_user_lock' => 'Can lock own topics',
'acl_f_delete' => 'Can delete own posts',
'acl_f_poll' => 'Can create polls',
'acl_f_vote' => 'Can vote in polls',
@@ -448,6 +448,8 @@ $lang += array(
'acl_f_ignoreflood' => 'Can ignore flood limit',
'acl_f_postcount' => 'Increment post counter',
'acl_f_moderate' => 'Posts are moderated',
+ 'acl_f_bump' => 'Can bump topics',
+ 'acl_f_subscribe' => 'Can subscribe forum',
'acl_u_hideonline' => 'Can hide online status',
'acl_u_viewonline' => 'Can view all online',
@@ -463,7 +465,9 @@ $lang += array(
'acl_u_chgpasswd' => 'Can change password',
'acl_u_chgcensors' => 'Can disable word censors',
'acl_u_search' => 'Can search board',
- 'acl_u_savedrafts' => 'Can save drafts'
+ 'acl_u_savedrafts' => 'Can save drafts',
+ 'acl_u_download' => 'Can download files',
+ 'acl_u_attach' => 'Can attach files'
);
// User pruning