From fbabed373a908d2def316edad6e9d173b25589a8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 30 Nov 2008 12:12:24 +0000 Subject: [PATCH] typo? git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9135 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/language/en/install.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1684814d6b..618dd9d883 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -622,7 +622,7 @@
  • [Fix] Use our global expression for checking email syntax in memberlist (Bug #12827)
  • [Fix] Correctly retrieve/refresh templates stored in database if using subdirectories within template directory (Bug #12839)
  • [Fix] Correctly translate special group names in ucp_groups.php (Bug #12597)
    • -
  • [Fix] Search boxes not loosing session id (changing method from get to post) (Bug #12643)
    • +
  • [Fix] Search boxes not losing session id (changing method from get to post) (Bug #12643)
  • [Fix] Make sure the automatic update is also working for those having fsockopen disabled
  • [Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed
  • [Feature] Allow dropping in custom "info_[module class]_*.php" files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements
    • diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index e6555f5a41..0549495b47 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -408,7 +408,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 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 losing 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',