diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
| commit | daeef71d813b68524e0630e2aadbf0870bb06800 (patch) | |
| tree | a2412ef750f51184f94e5e3c2cedf2cfcad732ba /phpBB/language/en/install.php | |
| parent | cb505ce4b08d3ec1de1184474a673886dfdb212b (diff) | |
| download | forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.gz forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.bz2 forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.xz forums-daeef71d813b68524e0630e2aadbf0870bb06800.zip | |
some updater changes as well as tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@6714 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/install.php')
| -rwxr-xr-x | phpBB/language/en/install.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index e5b2325d24..08c07cdeb8 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -368,8 +368,10 @@ $lang = array_merge($lang, array( 'LOGIN_UPDATE_EXPLAIN' => 'In order to update your installation you need to login first.', 'MAPPING_FILE_STRUCTURE' => 'To ease the upload here are the file locations which map your phpBB installation.', - 'MERGE_MOD_FILE_OPTION' => 'Use modified file code on final merge', - 'MERGE_NEW_FILE_OPTION' => 'Use new file code on final merge', + '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 differences and use modified code within conflicting block', + 'MERGE_NEW_FILE_OPTION' => 'Merge differences and use new file code within conflicting block', 'MERGE_SELECT_ERROR' => 'Conflicting file merge modes are not correctly selected.', 'NEW_FILE' => 'New updated file', @@ -400,6 +402,7 @@ $lang = array_merge($lang, array( 'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format', 'SELECT_FTP_SETTINGS' => 'Select FTP Settings', 'SHOW_DIFF_CONFLICT' => 'Show differences/conflicts', + 'SHOW_DIFF_FINAL' => 'Show resulting file', 'SHOW_DIFF_MODIFIED' => 'Show merged differences', 'SHOW_DIFF_NEW' => 'Show file contents', 'SHOW_DIFF_NEW_CONFLICT' => 'Show differences', |