makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

A few miscelaneous tweaks

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6166 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-07-10 19:16:47 +00:00
parent 4f7c52e9e3
commit eb9548f465
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/install/index.php
View file

@ -480,8 +480,6 @@ class module
/** /**
* Output an error message * Output an error message
* If skip is true, return and continue execution, else exit * 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) function error($error, $line, $file, $skip = false)
{ {
@ -491,7 +489,7 @@ class module
{ {
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(
'S_LEGEND' => true, 'S_LEGEND' => true,
'LEGEND' => $lang['INST_ERR_FATAL'], 'LEGEND' => $lang['INST_ERR'],
)); ));
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(

1
phpBB/language/en/acp/common.php
View file

@ -478,6 +478,7 @@ $lang = array_merge($lang, array(
'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />&#187; %s', 'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />&#187; %s',
'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />&#187; %s', 'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />&#187; %s',
'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />&#187; %s', 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />&#187; %s',
'LOG_INSTALL_CONVERTED' => '<b>Converted from %s to phpBB %s</b>',
'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>', 'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>',
'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />&#187;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>".', 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />&#187;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>".',

2
phpBB/language/en/install.php
View file

@ -59,6 +59,7 @@ $lang = array_merge($lang, array(
'CONTINUE_LAST' => 'Continue last statements', 'CONTINUE_LAST' => 'Continue last statements',
'CONVERT' => 'Convert', 'CONVERT' => 'Convert',
'CONVERT_COMPLETE' => 'Conversion completed', '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' => '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_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', '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_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_START' => 'Start Install',
'INSTALL_TEST' => 'Test Again', '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_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_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', 'INST_ERR_DB_NO_ERROR' => 'No error message given',