aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/adm/style/acp_permissions.html12
-rw-r--r--phpBB/language/en/acp/permissions.php3
2 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index a991b3f2fc..dfb5a5cbec 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -142,8 +142,8 @@
<fieldset class="quick">
{S_HIDDEN_FIELDS}
- <input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" /> &nbsp;
- <input class="button1" type="submit" name="submit_edit_options" value="{L_SET_PERMISSIONS}" />
+ <input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" /> &nbsp;
+ <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" />
</fieldset>
</form>
@@ -162,7 +162,7 @@
<fieldset class="quick">
{S_HIDDEN_FIELDS}
<input class="button2" type="submit" name="find_username" value="{L_FIND_USERNAME}" onclick="window.open('{U_FIND_USERNAME}', '_phpbbsearch', 'height=500, resizable=yes, scrollbars=yes, width=740'); return false;" /> &nbsp;
- <input class="button1" type="submit" name="submit_add_options" value="{L_SET_PERMISSIONS}" />
+ <input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
</fieldset>
</form>
@@ -189,8 +189,8 @@
<fieldset class="quick">
{S_HIDDEN_FIELDS}
- <input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
- <input class="button1" type="submit" name="submit_edit_options" value="{L_SET_PERMISSIONS}" />
+ <input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" />&nbsp;
+ <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" />
</fieldset>
</form>
@@ -206,7 +206,7 @@
<fieldset class="quick">
{S_HIDDEN_FIELDS}
- <input type="submit" class="button1" name="submit_add_options" value="{L_SET_PERMISSIONS}" />
+ <input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" />
</fieldset>
</form>
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index be8d3f1cba..13c406bd04 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -69,6 +69,7 @@ $lang = array_merge($lang, array(
'ACP_VIEW_USER_PERMISSIONS_EXPLAIN' => 'Here you can view the effective user permissions assigned to the selected users/groups',
'ADD_GROUPS' => 'Add Groups',
+ 'ADD_PERMISSIONS' => 'Add Permissions',
'ADD_USERS' => 'Add Users',
'ALL_GROUPS' => 'Select all groups',
'ALL_NO' => 'All No',
@@ -89,6 +90,7 @@ $lang = array_merge($lang, array(
'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will <strong>not</strong> loosing their permission settings.',
'DISPLAY_ROLE_ITEMS' => 'View Items using this role',
+ 'EDIT_PERMISSIONS' => 'Edit Permissions',
'EDIT_ROLE' => 'Edit Role',
'GROUPS_NOT_ASSIGNED' => 'No group assigned to this role',
@@ -112,6 +114,7 @@ $lang = array_merge($lang, array(
'PERMISSION_APPLIED_TO_ALL' => 'Permissions and Role will also be applied to all checked objects',
'PLUS_SUBFORUMS' => '+Subforums',
+ 'REMOVE_PERMISSIONS' => 'Remove Permissions',
'REMOVE_ROLE' => 'Remove Role',
'ROLE' => 'Role',
'ROLE_ADD_SUCCESS' => 'Role successfully added.',