mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 00:37:42 +02:00
Code Issues Releases Wiki Activity

automatic updater supporting batch-processing diff

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8152 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-10-06 11:45:30 +00:00
parent d282d0f8b7
commit 26cb825314
6 changed files with 482 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/language/en/install.php
View File

@@ -380,6 +380,7 @@ $lang = array_merge($lang, array(
'CHECK_UPDATE_DATABASE' => 'Continue update process',
'COLLECTED_INFORMATION' => 'File information',
'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
'COLLECTING_FILE_DIFFS' => 'Collecting file differences',
'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
'CONTINUE_UPDATE_NOW' => 'Continue the update process now',
'CURRENT_FILE' => 'Current original file',
@@ -446,6 +447,8 @@ $lang = array_merge($lang, array(
'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.',
'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.',
'NEW_FILE' => 'New updated file',
'NEW_USERNAME' => 'New username',
@@ -460,6 +463,7 @@ $lang = array_merge($lang, array(
'NO_VISIBLE_CHANGES' => 'No visible changes',
'NOTICE' => 'Notice',
'NUM_CONFLICTS' => 'Number of conflicts',
'NUMBER_OF_FILES_COLLECTED' => 'Currently having differences about %1$d from %2$d files collected.<br />Please wait until file collection finished.',
'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
@@ -495,6 +499,8 @@ $lang = array_merge($lang, array(
'STATUS_NOT_MODIFIED' => 'Not modified file',
'STATUS_UP_TO_DATE' => 'Already updated file',
'TOGGLE_DISPLAY' => 'View/Hide file list',
'UPDATE_COMPLETED' => 'Update completed',
'UPDATE_DATABASE' => 'Update database',
'UPDATE_DATABASE_EXPLAIN' => 'Within the next step the database will be updated.',