diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-10 19:16:47 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-10 19:16:47 +0000 |
| commit | eb9548f465752323af2579c4b17cc2587244349c (patch) | |
| tree | 10a1053fc98f513dfce460f6fa4f9c27e47153b5 /phpBB | |
| parent | 4f7c52e9e385041320179dcb7d27a9217a353c71 (diff) | |
| download | forums-eb9548f465752323af2579c4b17cc2587244349c.tar forums-eb9548f465752323af2579c4b17cc2587244349c.tar.gz forums-eb9548f465752323af2579c4b17cc2587244349c.tar.bz2 forums-eb9548f465752323af2579c4b17cc2587244349c.tar.xz forums-eb9548f465752323af2579c4b17cc2587244349c.zip | |
A few miscelaneous tweaks
git-svn-id: file:///svn/phpbb/trunk@6166 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/install/index.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index d22545a56a..86baa63d59 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -480,8 +480,6 @@ class module /** * Output an error message * If skip is true, return and continue execution, else exit - * @todo Really should change the caption based on $skip and calling code at some point - * @todo This needs testing with a large dataset that generates multiple errors */ function error($error, $line, $file, $skip = false) { @@ -491,7 +489,7 @@ class module { $template->assign_block_vars('checks', array( 'S_LEGEND' => true, - 'LEGEND' => $lang['INST_ERR_FATAL'], + 'LEGEND' => $lang['INST_ERR'], )); $template->assign_block_vars('checks', array( diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 917d0d8e70..ca8e7ff652 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -478,6 +478,7 @@ $lang = array_merge($lang, array( 'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />» %s', 'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />» %s', 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />» %s', + 'LOG_INSTALL_CONVERTED' => '<b>Converted from %s to phpBB %s</b>', 'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>', 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 9e1bb17c3d..62e258fd7b 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -59,6 +59,7 @@ $lang = array_merge($lang, array( 'CONTINUE_LAST' => 'Continue last statements', 'CONVERT' => 'Convert', 'CONVERT_COMPLETE' => 'Conversion completed', + 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your forum </a>. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Userguide</a> and the <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">Beta support forum</a>', 'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework', 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) forum systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the forum software you wish to convert from, please check our website where further conversion modules may be available for download.', 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist', @@ -148,6 +149,7 @@ $lang = array_merge($lang, array( 'INSTALL_SEND_CONFIG' => 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writeable. A number of options will be listed below enabling you to complete installation of config.php.', 'INSTALL_START' => 'Start Install', 'INSTALL_TEST' => 'Test Again', + 'INST_ERR' => 'Installation error', 'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below', 'INST_ERR_DB_FORUM_PATH' => 'The database file specified is within your forum directory tree. You should put this file in a non web-accessible location', 'INST_ERR_DB_NO_ERROR' => 'No error message given', |