Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

[ticket/10129] Remove apostrophes and plurals in ACP user management -> ... #657

Merged
merged 1 commit into from about 2 years ago

4 participants

harderthanfire Igor Wiedler David King Callum Macrae
harderthanfire

...permissions language file as per ticket.

PHPBB3-10129

harderthanfire [ticket/10129] Remove apostrophes and plurals in ACP user management …
…-> permissions language file as per ticket.

PHPBB3-10129
2768db4
Igor Wiedler
igorw commented March 24, 2012

:+1:

David King
Collaborator

Looks good to me.

Callum Macrae

All looks good.

David King imkingdavid merged commit 2768db4 into from March 29, 2012
David King imkingdavid closed this March 29, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Mar 24, 2012
harderthanfire [ticket/10129] Remove apostrophes and plurals in ACP user management …
…-> permissions language file as per ticket.

PHPBB3-10129
2768db4
This page is out of date. Refresh to see the latest.
8  phpBB/language/en/acp/common.php
@@ -96,10 +96,10 @@
96 96
 	'ACP_GLOBAL_MODERATORS'			=> 'Global moderators',
97 97
 	'ACP_GLOBAL_PERMISSIONS'		=> 'Global permissions',
98 98
 	'ACP_GROUPS'					=> 'Groups',
99  
-	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Groups’ forum permissions',
  99
+	'ACP_GROUPS_FORUM_PERMISSIONS'	=> 'Group forum permissions',
100 100
 	'ACP_GROUPS_MANAGE'				=> 'Manage groups',
101 101
 	'ACP_GROUPS_MANAGEMENT'			=> 'Group management',
102  
-	'ACP_GROUPS_PERMISSIONS'		=> 'Groups’ permissions',
  102
+	'ACP_GROUPS_PERMISSIONS'		=> 'Group permissions',
103 103
 
104 104
 	'ACP_ICONS'					=> 'Topic icons',
105 105
 	'ACP_ICONS_SMILIES'			=> 'Topic icons/smilies',
@@ -172,9 +172,9 @@
172 172
 	'ACP_THEMES'				=> 'Themes',
173 173
 
174 174
 	'ACP_UPDATE'					=> 'Updating',
175  
-	'ACP_USERS_FORUM_PERMISSIONS'	=> 'Users’ forum permissions',
  175
+	'ACP_USERS_FORUM_PERMISSIONS'	=> 'User forum permissions',
176 176
 	'ACP_USERS_LOGS'				=> 'User logs',
177  
-	'ACP_USERS_PERMISSIONS'			=> 'Users’ permissions',
  177
+	'ACP_USERS_PERMISSIONS'			=> 'User permissions',
178 178
 	'ACP_USER_ATTACH'				=> 'Attachments',
179 179
 	'ACP_USER_AVATAR'				=> 'Avatar',
180 180
 	'ACP_USER_FEEDBACK'				=> 'Feedback',
12  phpBB/language/en/acp/permissions.php
@@ -40,10 +40,10 @@
40 40
 		<p>Permissions are highly granular and grouped into four major sections, which are:</p>
41 41
 
42 42
 		<h2>Global Permissions</h2>
43  
-		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.</p>
  43
+		<p>These are used to control access on a global level and apply to the entire bulletin board. They are further divided into User Permissions, Group Permissions, Administrators and Global Moderators.</p>
44 44
 
45 45
 		<h2>Forum Based Permissions</h2>
46  
-		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.</p>
  46
+		<p>These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, User Forum Permissions and Group Forum Permissions.</p>
47 47
 
48 48
 		<h2>Permission Roles</h2>
49 49
 		<p>These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.</p>
@@ -83,13 +83,13 @@
83 83
 	'ACP_FORUM_PERMISSIONS_COPY_EXPLAIN'		=> 'Here you can copy forum permissions from one forum to one or more other forums.',
84 84
 	'ACP_GLOBAL_MODERATORS_EXPLAIN'				=> 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.',
85 85
 	'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to groups.',
86  
-	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
  86
+	'ACP_GROUPS_PERMISSIONS_EXPLAIN'			=> 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual user permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group permissions.',
87 87
 	'ACP_ADMIN_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
88 88
 	'ACP_FORUM_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
89 89
 	'ACP_MOD_ROLES_EXPLAIN'						=> 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
90 90
 	'ACP_USER_ROLES_EXPLAIN'					=> 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change its permissions too.',
91 91
 	'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can assign forum permissions to users.',
92  
-	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.',
  92
+	'ACP_USERS_PERMISSIONS_EXPLAIN'				=> 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group permissions.',
93 93
 	'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN'		=> 'Here you can view the effective administrative permissions assigned to the selected users/groups.',
94 94
 	'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN'	=> 'Here you can view the global moderative permissions assigned to the selected users/groups.',
95 95
 	'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN'		=> 'Here you can view the forum permissions assigned to the selected users/groups and forums.',
@@ -225,8 +225,8 @@
225 225
 	'SELECT_TYPE'					=> 'Select type',
226 226
 	'SET_PERMISSIONS'				=> 'Set permissions',
227 227
 	'SET_ROLE_PERMISSIONS'			=> 'Set role permissions',
228  
-	'SET_USERS_PERMISSIONS'			=> 'Set users permissions',
229  
-	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set users forum permissions',
  228
+	'SET_USERS_PERMISSIONS'			=> 'Set user permissions',
  229
+	'SET_USERS_FORUM_PERMISSIONS'	=> 'Set user forum permissions',
230 230
 
231 231
 	'TRACE_DEFAULT'					=> 'By default every permission is <samp>NO</samp> (unset). So the permission can be overwritten by other settings.',
232 232
 	'TRACE_FOR'						=> 'Trace for',
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.