diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-16 13:02:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-16 13:02:13 +0000 |
| commit | c32d295d97f7f472d3d521e27b9be5ebe7adc32c (patch) | |
| tree | 6ba5609223a9ddc45ebf610b319fa63614fd1eb1 | |
| parent | 198989dcfdf921e8dbd281d874cfa4ba45d7fb6a (diff) | |
| download | forums-c32d295d97f7f472d3d521e27b9be5ebe7adc32c.tar forums-c32d295d97f7f472d3d521e27b9be5ebe7adc32c.tar.gz forums-c32d295d97f7f472d3d521e27b9be5ebe7adc32c.tar.bz2 forums-c32d295d97f7f472d3d521e27b9be5ebe7adc32c.tar.xz forums-c32d295d97f7f472d3d521e27b9be5ebe7adc32c.zip | |
Bug #51385 - regression from r9252 - only spelling fix
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10152 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/language/en/install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index b653d54318..9543c712da 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -451,8 +451,8 @@ $lang = array_merge($lang, array( '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_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.', |