aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/email/installed.txt21
-rwxr-xr-xphpBB/language/en/install.php6
2 files changed, 27 insertions, 0 deletions
diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt
new file mode 100644
index 0000000000..b69e9189ae
--- /dev/null
+++ b/phpBB/language/en/email/installed.txt
@@ -0,0 +1,21 @@
+Subject: phpBB Installed
+Charset: iso-8859-1
+
+Congratulations,
+
+You have successfully installed phpBB on your server.
+
+This email contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one
+
+----------------------------
+Username: {USERNAME}
+Password: {PASSWORD}
+
+Board URL: {U_BOARD}
+----------------------------
+
+Useful information on your phpBB installation can be found in the docs folder of your installation and on our website - http://www.phpbb.com/support/
+
+We recommend that in order to stay current with software releases you subscribe to our mailing list, located at the above URL.
+
+{EMAIL_SIG} \ No newline at end of file
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index e49e126904..336819d020 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
'CAT_CONVERT' => 'Convert',
'CAT_INSTALL' => 'Install',
'CAT_OVERVIEW' => 'Overview',
+ 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written, you may now proceed to the next step of the installation',
'CONFIG_RETRY' => 'Retry',
'CONTACT_EMAIL' => 'Contact email address',
'CONTACT_EMAIL_CONFIRM' => 'Confirm contact email',
@@ -118,6 +119,7 @@ $lang = array_merge($lang, array(
'INSTALL_TEST' => 'Test Again',
'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below',
'INST_ERR_DB_NO_ERROR' => 'No error message given',
+ 'INST_ERR_EMAIL_INVALID' => 'The email address you entered is invalid',
'INST_ERR_EMAIL_MISMATCH' => 'The emails you entered did not match.',
'INST_ERR_FATAL' => 'Fatal installation error',
'INST_ERR_FATAL_DB' => 'A fatal and unrecoverable database error has occured. This may be because the specified user does not have appropriate rights to CREATE TABLES or INSERT data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.',
@@ -158,7 +160,11 @@ $lang = array_merge($lang, array(
'SERVER_PORT' => 'Server port',
'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different',
'STAGE_ADMINISTRATOR' => 'Administrator Details',
+ 'STAGE_ADVANCED' => 'Advanced Settings',
+ 'STAGE_ADVANCED_EXPLAIN' => 'The settings on this page are only necessary to set if you know that you require something different from the default. If unsure, just proceed to the next page, this can be altered from the Administration Panel later.',
+ 'STAGE_CONFIG_FILE' => 'Configuration File',
'STAGE_DATABASE' => 'Database Settings',
+ 'STAGE_FINAL' => 'Final Stage',
'STAGE_INTRO' => 'Introduction',
'STAGE_REQUIREMENTS' => 'Requirements',
'SUB_INTRO' => 'Introduction',