diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-26 13:53:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-26 13:53:07 +0000 |
| commit | 28521e556840c79f882ce48cfee499bd531e340f (patch) | |
| tree | c87f445d25ed1c161beba045caafbafbbce9edd5 /phpBB/language | |
| parent | 2ed2996ebf54c42ca53f11cac683b38263043ba3 (diff) | |
| download | forums-28521e556840c79f882ce48cfee499bd531e340f.tar forums-28521e556840c79f882ce48cfee499bd531e340f.tar.gz forums-28521e556840c79f882ce48cfee499bd531e340f.tar.bz2 forums-28521e556840c79f882ce48cfee499bd531e340f.tar.xz forums-28521e556840c79f882ce48cfee499bd531e340f.zip | |
fixing bugs within the updater...
git-svn-id: file:///svn/phpbb/trunk@7798 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rwxr-xr-x | phpBB/language/en/install.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 8f37b52c09..c81b5c9f7b 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -394,7 +394,7 @@ $lang = array_merge($lang, array( 'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed.', 'FILE_USED' => 'Information used from', // Single file 'FILES_CONFLICT' => 'Conflict files', - 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', + 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', 'FILES_MODIFIED' => 'Modified files', 'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.', 'FILES_NEW' => 'New files', |