[Phpbb-checkins] r10152 - /branches/phpBB-3_0_0/phpBB/language/en/install.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Wed Sep 16 14:02:13 2009
New Revision: 10152

Log:
Bug #51385 - regression from r9252 - only spelling fix

Modified:
    branches/phpBB-3_0_0/phpBB/language/en/install.php

Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Wed Sep 16 14:02:13 2009
***************
*** 451,458 ****
  
  	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
  	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
! 	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (Loose new phpBB code within conflicting block)',
! 	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (Loose modified code within conflicting block)',
  	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
  	'MERGING_FILES'				=> 'Merging differences',
  	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',
--- 451,458 ----
  
  	'MERGE_NO_MERGE_NEW_OPTION'	=> 'Do not merge - use new file',
  	'MERGE_NO_MERGE_MOD_OPTION'	=> 'Do not merge - use currently installed file',
! 	'MERGE_MOD_FILE_OPTION'		=> 'Merge modifications (removes new phpBB code within conflicting block)',
! 	'MERGE_NEW_FILE_OPTION'		=> 'Merge modifications (removes modified code within conflicting block)',
  	'MERGE_SELECT_ERROR'		=> 'Conflicting file merge modes are not correctly selected.',
  	'MERGING_FILES'				=> 'Merging differences',
  	'MERGING_FILES_EXPLAIN'		=> 'Currently collecting final file changes.<br /><br />Please wait until phpBB has completed all operations on changed files.',