aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/install.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-06-09 11:11:20 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-06-09 11:11:20 +0000
commit455536773fd34f72e371386b5b0d9a517e0fc1e7 (patch)
treeb92b8cb07045e0aac93749f4e419d9d3a1f1654d /phpBB/language/en/install.php
parentcbf7b00cb801bc7cbed5735452fc680c85cd9669 (diff)
downloadforums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar
forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.gz
forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.bz2
forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.xz
forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.zip
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/install.php')
-rwxr-xr-xphpBB/language/en/install.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index a457f1b6b7..881859b728 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -1,12 +1,12 @@
<?php
-/**
+/**
*
* install [English]
*
* @package language
* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
@@ -443,7 +443,7 @@ $lang = array_merge($lang, array(
'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.',
'PERFORM_DATABASE_UPDATE' => 'Perform database update',
- 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After you performed the database update just follow the link presented to continue the update process.',
+ 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update had been performed just follow the link presented to continue the update process.',
'PREVIOUS_VERSION' => 'Previous version',
'PROGRESS' => 'Progress',