diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
| commit | 179c77ccddcd8bd4df2f29d05b460c6365396d49 (patch) | |
| tree | 872b58682c59b2e3400fe841e541b5a8c9455db7 /phpBB/language | |
| parent | c923e4191a28026a21c0ebb0dd2120c258d96229 (diff) | |
| download | forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.gz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.bz2 forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.xz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.zip | |
- do not include if there are no files fetched with glob()
- 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
Diffstat (limited to 'phpBB/language')
| -rwxr-xr-x | phpBB/language/en/install.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 180157d5e0..8fd95bc0ae 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -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', |