mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- do not include if there are no files fetched with glob()

Browse Source 
- allow options for merged files on update (merge, new file, old file)


git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-07-09 11:33:14 +00:00
parent c923e4191a
commit 179c77ccdd
6 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,6 +421,9 @@ $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_MODIFICATIONS_OPTION' => 'Merge modifications',
'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',