diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 16:49:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 16:49:04 +0000 |
| commit | 8b1555c15bbfe153570600f95259fb286db4cdee (patch) | |
| tree | 82d2d4b326be82368f5535b74aeb706bc5f5da01 /phpBB/language/en/acp/permissions.php | |
| parent | 725b21f2d206efb4b34eb95ec3329bc81f66b805 (diff) | |
| download | forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.gz forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.bz2 forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.xz forums-8b1555c15bbfe153570600f95259fb286db4cdee.zip | |
change ACL_NO to ACL_NEVER and ACL_UNSET to ACL_NO to let our users get what is meant on the first look.
the downside is that the information is no more accurate (permissions are still unset, defaulting to no) - someone might to overlook all explanations. :)
git-svn-id: file:///svn/phpbb/trunk@6115 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/permissions.php')
| -rw-r--r-- | phpBB/language/en/acp/permissions.php | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index d41fbbea58..c0d5058427 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -49,9 +49,9 @@ $lang = array_merge($lang, array( <p>For further information on setting up and managing permissions on your phpBB3 forum, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p> ', - 'ACL_NO' => 'No', + 'ACL_NEVER' => 'Never', 'ACL_SET' => 'Setting Permissions', - 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NO for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select UNSET. If values are assigned for this option elsewhere they will be used in preference, else NO is assumed. All objects marked (with the checkbox in front of them) will inherit the permission set you defined.', + 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NEVER for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select NO. If values are assigned for this option elsewhere they will be used in preference, else NEVER is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.', 'ACL_SETTING' => 'Setting', 'ACL_TYPE_A_' => 'Administrative Permissions', @@ -65,7 +65,7 @@ $lang = array_merge($lang, array( 'ACL_TYPE_LOCAL_M_' => 'Forum Moderator Permissions', 'ACL_TYPE_LOCAL_F_' => 'Forum Permissions', - 'ACL_UNSET' => 'Unset', + 'ACL_NO' => 'No', 'ACL_VIEW' => 'Viewing Permissions', 'ACL_VIEW_EXPLAIN' => 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.', 'ACL_YES' => 'Yes', @@ -92,8 +92,8 @@ $lang = array_merge($lang, array( 'ADD_PERMISSIONS' => 'Add Permissions', 'ADD_USERS' => 'Add Users', 'ALL_GROUPS' => 'Select all groups', + 'ALL_NEVER' => 'All Never', 'ALL_NO' => 'All No', - 'ALL_UNSET' => 'All Unset', 'ALL_USERS' => 'Select all users', 'ALL_YES' => 'All Yes', 'APPLY_ALL_PERMISSIONS' => 'Apply all Permissions', @@ -124,7 +124,7 @@ $lang = array_merge($lang, array( 'NO_AUTH_SETTING_FOUND' => 'Permission settings not defined.', 'NO_ROLE_ASSIGNED' => 'No role assigned...', - 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the "All Unset" link.', + 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the "All No" link.', 'NO_ROLE_AVAILABLE' => 'No role available', 'NO_ROLE_NAME_SPECIFIED' => 'Please give the role a name.', 'NO_ROLE_SELECTED' => 'Role could not be found.', @@ -182,30 +182,30 @@ $lang = array_merge($lang, array( 'SET_USERS_PERMISSIONS' => 'Set users permissions', 'SET_USERS_FORUM_PERMISSIONS' => 'Set users forum permissions', - 'TRACE_DEFAULT' => 'By default every permission is UNSET. So the permission can be overwritten by other settings.', + 'TRACE_DEFAULT' => 'By default every permission is NO (unset). So the permission can be overwritten by other settings.', 'TRACE_FOR' => 'Trace for', 'TRACE_GLOBAL_SETTING' => '%s (global)', - 'TRACE_GROUP_NO_TOTAL_NO' => 'This group\'s permission is set to NO like the total result so the old result is kept.', - 'TRACE_GROUP_NO_TOTAL_UNSET' => 'This group\'s permission is set to NO which becomes the new total value because it wasn\'t set yet.', - 'TRACE_GROUP_NO_TOTAL_YES' => 'This group\'s permission is set to NO which overwrites the total YES to a NO for this user.', - 'TRACE_GROUP_UNSET' => 'The permission is UNSET for this group so the old total value is kept.', - 'TRACE_GROUP_YES_TOTAL_NO' => 'This group\'s permission is set to YES but the total NO cannot be overwritten.', - 'TRACE_GROUP_YES_TOTAL_UNSET' => 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet.', + 'TRACE_GROUP_NEVER_TOTAL_NEVER' => 'This group\'s permission is set to NEVER like the total result so the old result is kept.', + 'TRACE_GROUP_NEVER_TOTAL_NO' => 'This group\'s permission is set to NEVER which becomes the new total value because it wasn\'t set yet (set to NO).', + 'TRACE_GROUP_NEVER_TOTAL_YES' => 'This group\'s permission is set to NEVER which overwrites the total YES to a NEVER for this user.', + 'TRACE_GROUP_NO' => 'The permission is NO for this group so the old total value is kept.', + 'TRACE_GROUP_YES_TOTAL_NEVER' => 'This group\'s permission is set to YES but the total NEVER cannot be overwritten.', + 'TRACE_GROUP_YES_TOTAL_NO' => 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet (set to NO).', 'TRACE_GROUP_YES_TOTAL_YES' => 'This group\'s permission is set to YES and the total permission is already set to YES, so the total result is kept.', 'TRACE_PERMISSION' => 'Trace permission - %s', 'TRACE_SETTING' => 'Trace setting', - 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_YES_TOTAL_NO' => 'The forum independent user permission evaluates to YES which overwrites the current local result NO. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_NO_TOTAL_KEPT' => 'The forum independent user permission evaluates to NO which doesn\'t influence the local permission. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn\'t influence the local permission. %sTrace global permission%s', 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', - 'TRACE_USER_KEPT' => 'The user permission is UNSET so the old total value is kept.', - 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is set to NO and the total value is set to NO, so nothing is changed.', - 'TRACE_USER_NO_TOTAL_UNSET' => 'The user permission is set to NO which becomes the total value because it wasn\'t set yet.', - 'TRACE_USER_NO_TOTAL_YES' => 'The user permission is set to NO and overwrites the previous YES.', - 'TRACE_USER_UNSET_TOTAL_UNSET' => 'The user permission is UNSET and the total value wasn\'t set yet so it defaults to NO.', - 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to YES but the total NO cannot be overwritten.', - 'TRACE_USER_YES_TOTAL_UNSET' => 'The user permission is set to YES which becomes the total value because it wasn\'t set yet.', + 'TRACE_USER_KEPT' => 'The user permission is NO so the old total value is kept.', + 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user permission is set to NEVER and the total value is set to NEVER, so nothing is changed.', + 'TRACE_USER_NEVER_TOTAL_NO' => 'The user permission is set to NEVER which becomes the total value because it was set to NO.', + 'TRACE_USER_NEVER_TOTAL_YES' => 'The user permission is set to NEVER and overwrites the previous YES.', + 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is NO and the total value was set to NO so it defaults to NEVER.', + 'TRACE_USER_YES_TOTAL_NEVER' => 'The user permission is set to YES but the total NEVER cannot be overwritten.', + 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to YES which becomes the total value because it was set to NO.', 'TRACE_USER_YES_TOTAL_YES' => 'The user permission is set to YES and the total value is set to YES, so nothing is changed.', 'TRACE_WHO' => 'Who', 'TRACE_TOTAL' => 'Total', |