aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-01-10 14:55:46 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-01-10 14:55:46 +0000
commit2a02d24ffc3143cb222b3c86d0a3573e5984635f (patch)
tree2349dc7f5a147bf87378b34446a5963fb48365b1
parentf116dfc56c5ae6cbfb29eed9281b1459ab87c4c5 (diff)
downloadforums-2a02d24ffc3143cb222b3c86d0a3573e5984635f.tar
forums-2a02d24ffc3143cb222b3c86d0a3573e5984635f.tar.gz
forums-2a02d24ffc3143cb222b3c86d0a3573e5984635f.tar.bz2
forums-2a02d24ffc3143cb222b3c86d0a3573e5984635f.tar.xz
forums-2a02d24ffc3143cb222b3c86d0a3573e5984635f.zip
Related preset changes
git-svn-id: file:///svn/phpbb/trunk@3307 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/language/en/lang_admin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 18a4797370..9a9df6cb7b 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -203,6 +203,7 @@ $lang = array_merge($lang, array(
'All_Allow' => 'All Allow',
'All_Deny' => 'All Deny',
'All_Inherit' => 'All Inherit',
+ 'INHERIT_PARENT' => 'Inherit from parent',
'ACL_PRESET' => 'Preset',
'Inheritance' => 'Inheritance',
'Inheritance_explain' => 'Select the subforums you want to inherit these permissions',
@@ -279,7 +280,8 @@ $lang = array_merge($lang, array(
'acl_f_print' => 'Print topics',
'acl_f_ignoreflood' => 'Ignore flood limit',
'acl_f_ignorequeue' => 'Ignore mod queue',
- 'acl_f_viewonline' => 'View everyone online',
+
+ 'acl_u_viewonline' => 'View everyone online',
'Auth_updated' => 'Permissions have been updated',
'Prune_users' => 'Prune Users',