From a0f8e1323a0fb50e6a4b7449f93b493377eddd2c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 17 Apr 2006 13:09:50 +0000 Subject: - clean up marklist calls (global function) - added new feature: test out others permissions (admin permissions will not be copied) - changed attachment processing by directly using the template engine - fixed some attachment related bugs - additional tiny fixes git-svn-id: file:///svn/phpbb/trunk@5790 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/common.php | 2 ++ phpBB/language/en/acp/permissions_phpbb.php | 1 + phpBB/language/en/common.php | 2 ++ phpBB/language/en/memberlist.php | 1 + phpBB/language/en/ucp.php | 2 ++ 5 files changed, 8 insertions(+) (limited to 'phpBB/language') diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index d92d78c4d6..16139b60ac 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -345,6 +345,8 @@ $lang = array_merge($lang, array( 'LOG_ACL_DEL_MOD_LOCAL_M_' => 'Removed Moderators from %s
» %s', 'LOG_ACL_DEL_FORUM_LOCAL_F_' => 'Removed User/Group Forum Permissions from %s
» %s', + 'LOG_ACL_TRANSFER_PERMISSIONS' => 'Permissions transfered from
» %s', + 'LOG_ACL_RESTORE_PERMISSIONS' => 'Own permissions restored after using permissions from
» %s', 'LOG_ATTACH_EXT_ADD' => 'Added or edited attachment extension
» %s', 'LOG_ATTACH_EXT_DEL' => 'Removed attachment extension
» %s', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index ff2f916355..25744bc0d5 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -204,6 +204,7 @@ $lang = array_merge($lang, array( 'acl_a_authgroups' => array('lang' => 'Can alter permissions for groups', 'cat' => 'permissions'), 'acl_a_authusers' => array('lang' => 'Can alter permissions for users', 'cat' => 'permissions'), 'acl_a_roles' => array('lang' => 'Can manage roles', 'cat' => 'permissions'), + 'acl_a_switchperm' => array('lang' => 'Can use others permissions', 'cat' => 'permissions'), 'acl_a_styles' => array('lang' => 'Can manage styles', 'cat' => 'misc'), 'acl_a_viewlogs' => array('lang' => 'Can view logs', 'cat' => 'misc'), diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 72907c97cb..e2a2722a9f 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -286,6 +286,7 @@ $lang = array_merge($lang, array( 'NOT_AUTHORIZED' => 'You are not authorized to access this area.', 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', + 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.', 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', 'NO_AUTH_OPERATION' => 'You do not have the neccessary permissions to complete this operation.', @@ -482,6 +483,7 @@ $lang = array_merge($lang, array( 'USER_POST' => '%d Post', 'USER_POSTS' => '%d Posts', 'USERS' => 'Users', + 'USE_PERMISSIONS' => 'Test out users permissions', 'VIEWED' => 'Viewed', 'VIEWING_FAQ' => 'Viewing FAQ', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 13eb24ff38..204fb91adf 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -112,6 +112,7 @@ $lang = array_merge($lang, array( 'SORT_POST_COUNT' => 'Post count', 'USERNAME_BEGINS_WITH' => 'Username begins with', + 'USER_ADMIN' => 'Administrate User', 'USER_FORUM' => 'User statistics', 'USER_ONLINE' => 'Online', 'USER_PRESENCE' => 'Forum presence', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index eb1ad6d45b..2c6e335f4a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -279,6 +279,8 @@ $lang = array_merge($lang, array( 'PASSWORD_ACTIVATED' => 'Your new password has been activated', 'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original email address.', + 'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.', + 'PERMISSIONS_TRANSFERED' => 'Successfully transfered permissions from %s, you are now able to browse the forum with the users permissions.
Please note that admin permissions were not transfered. You are able to revert to your permission set at any time.', 'PM_DISABLED' => 'Private messaging has been disabled on this board', 'PM_FROM' => 'From', 'PM_ICON' => 'PM Icon', -- cgit v1.2.1