[Phpbb-checkins] r10017 - in /branches/phpBB-3_0_0/phpBB: includes/acp/acp_permissions.php language/en/acp/permissions.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Tue Aug 18 15:37:49 2009
New Revision: 10017

Log:
Adjustment to r9887: Only use one language variable.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_permissions.php Tue Aug 18 15:37:49 2009
***************
*** 1209,1215 ****
  
  				$s_hidden_fields = build_hidden_fields($s_hidden_fields);
  
! 				confirm_box(false, $user->lang['CONFIRM_OPERATION'] . ' ' . $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
  			}
  		}
  
--- 1209,1215 ----
  
  				$s_hidden_fields = build_hidden_fields($s_hidden_fields);
  
! 				confirm_box(false, $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
  			}
  		}
  

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/permissions.php Tue Aug 18 15:37:49 2009
***************
*** 110,116 ****
  	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
  	'AUTH_UPDATED'				=> 'Permissions have been updated.',
  
! 	'COPY_PERMISSIONS_CONFIRM'				=> 'Please be aware that this will overwrite any existing permissions on the selected targets.',
  	'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN'	=> 'The source forum you want to copy permissions from.',
  	'COPY_PERMISSIONS_FORUM_TO_EXPLAIN'		=> 'The destination forums you want the copied permissions applied to.',
  	'COPY_PERMISSIONS_FROM'					=> 'Copy permissions from',
--- 110,116 ----
  	'APPLY_PERMISSIONS_EXPLAIN'	=> 'The permissions and role defined for this item will only be applied to this item and all checked items.',
  	'AUTH_UPDATED'				=> 'Permissions have been updated.',
  
! 	'COPY_PERMISSIONS_CONFIRM'				=> 'Are you sure you wish to carry out this operation? Please be aware that this will overwrite any existing permissions on the selected targets.',
  	'COPY_PERMISSIONS_FORUM_FROM_EXPLAIN'	=> 'The source forum you want to copy permissions from.',
  	'COPY_PERMISSIONS_FORUM_TO_EXPLAIN'		=> 'The destination forums you want the copied permissions applied to.',
  	'COPY_PERMISSIONS_FROM'					=> 'Copy permissions from',