aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-11-30 23:15:53 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-11-30 23:15:53 +0000
commit84a2b7dad47516315c4056306ef1042b90ac3349 (patch)
tree40f37b65da0c3b5cc0412464042b4fa528e158b8 /phpBB/language
parent153d4b548a020f187491cd3f00af4a76f8e7abfd (diff)
downloadforums-84a2b7dad47516315c4056306ef1042b90ac3349.tar
forums-84a2b7dad47516315c4056306ef1042b90ac3349.tar.gz
forums-84a2b7dad47516315c4056306ef1042b90ac3349.tar.bz2
forums-84a2b7dad47516315c4056306ef1042b90ac3349.tar.xz
forums-84a2b7dad47516315c4056306ef1042b90ac3349.zip
Updated for improved use with ODBC setups + introduced a re-install feature ... the schema updates _only_ remove foreign key and drop table clauses
git-svn-id: file:///svn/phpbb/trunk@1491 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/lang_english/lang_admin.php93
1 files changed, 52 insertions, 41 deletions
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index 8f31b4a8f7..6b6f276cd4 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -493,47 +493,6 @@ $lang['Click_return_massemail'] = "Click %sHere%s to return to the Mass Email fo
//
-// Install Process
-//
-$lang['Welcome_install'] = "Welcome to phpBB 2 Installation";
-$lang['Initial_config'] = "Basic Configuration";
-$lang['DB_config'] = "Database Configuration";
-$lang['Admin_config'] = "Admin Configuration";
-$lang['Installer_Error'] = "An error has occurred during installation";
-$lang['Previous_Install'] = "A previous installation has been detected";
-$lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist";
-$lang['Start_Install'] = "Start Install";
-$lang['Default_lang'] = "Default board language";
-$lang['DB_Host'] = "Database Server Hostname";
-$lang['DB_Name'] = "Your Database Name";
-$lang['Database'] = "Your Database";
-$lang['Install_lang'] = "Choose Language for Installation";
-$lang['dbms'] = "Database Type";
-$lang['Inst_Step_1'] = "Your database tables have been created and filled with some basic default data. Please enter your chosen phpBB Admin Username and Password.";
-$lang['Create_User'] = "Create User";
-$lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
-$lang['Finish_Install'] = "Finish Installation";
-$lang['Install_db_error'] = "An error occurred trying to update the database";
-$lang['ODBC_Instructs'] = "To complete your installation of this database you need to create a System Data Source Name, or System DSN pointing towards the relevant data source. You should refer to the ODBC section of your database server installation manual for assistance. If you are hosting this board on a host to which you do not have control you should request your provider to install or run the necessary files and create an appropriate DSN.";
-$lang['Table_Prefix'] = "Prefix for tables in database";
-$lang['Unwriteable_config'] = "Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
-$lang['Download_config'] = "Download Config";
-$lang['ftp_choose'] = "Choose Download Method";
-$lang['Attempt_ftp'] = "Attempt to ftp config file into place";
-$lang['Send_file'] = "Just send the file to me and I'll ftp it manually";
-$lang['ftp_option'] = "<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.";
-$lang['ftp_instructs'] = "You have chosen to ftp the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.";
-$lang['ftp_path'] = "FTP path to phpBB2";
-$lang['ftp_username'] = "Your FTP Username";
-$lang['ftp_password'] = "Your FTP Password";
-$lang['Transfer_config'] = "Start Transfer";
-$lang['ftp_info'] = "Enter Your FTP Information";
-$lang['Install'] = "Install";
-$lang['Upgrade'] = "Upgrade";
-$lang['Install_Method'] = "Choose your installation method";
-
-
-//
// Ranks admin
//
$lang['Ranks_title'] = "Rank Administration";
@@ -665,6 +624,58 @@ $lang['span_class3'] = "Span Class 3";
$lang['img_poll_size'] = "Polling Image Size [px]";
$lang['img_pm_size'] = "Private Message Status size [px]";
+
+//
+// Install Process
+//
+$lang['Welcome_install'] = "Welcome to phpBB 2 Installation";
+$lang['Initial_config'] = "Basic Configuration";
+$lang['DB_config'] = "Database Configuration";
+$lang['Admin_config'] = "Admin Configuration";
+
+$lang['Installer_Error'] = "An error has occurred during installation";
+$lang['Previous_Install'] = "A previous installation has been detected";
+$lang['Install_db_error'] = "An error occurred trying to update the database";
+
+$lang['Re_install'] = "Your previous installation is still active. <br /><br />If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data, no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation, no other settings will be retained. <br /><br />Think carefully before pressing Yes!";
+
+$lang['Inst_Step_0'] = "Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.";
+
+$lang['Start_Install'] = "Start Install";
+$lang['Finish_Install'] = "Finish Installation";
+
+$lang['Default_lang'] = "Default board language";
+$lang['DB_Host'] = "Database Server Hostname / DSN";
+$lang['DB_Name'] = "Your Database Name";
+$lang['Database'] = "Your Database";
+$lang['Install_lang'] = "Choose Language for Installation";
+$lang['dbms'] = "Database Type";
+$lang['Table_Prefix'] = "Prefix for tables in database";
+$lang['Admin_Username'] = "Administrator Username";
+$lang['Admin_Password'] = "Administrator Password";
+$lang['Admin_Password_confirm'] = "Administrator Password [ Confirm ]";
+
+$lang['Inst_Step_2'] = "Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.";
+
+$lang['Unwriteable_config'] = "Your config file is un-writeable at present. A copy of the config file will be downloaded to your when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control centre (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.";
+$lang['Download_config'] = "Download Config";
+
+$lang['ftp_choose'] = "Choose Download Method";
+$lang['ftp_option'] = "<br />Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically ftp the config file into place.";
+$lang['ftp_instructs'] = "You have chosen to ftp the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via ftp to your phpBB2 installation as if you were ftping to it using any normal client.";
+$lang['ftp_info'] = "Enter Your FTP Information";
+$lang['Attempt_ftp'] = "Attempt to ftp config file into place";
+$lang['Send_file'] = "Just send the file to me and I'll ftp it manually";
+$lang['ftp_path'] = "FTP path to phpBB 2";
+$lang['ftp_username'] = "Your FTP Username";
+$lang['ftp_password'] = "Your FTP Password";
+$lang['Transfer_config'] = "Start Transfer";
+
+$lang['Install'] = "Install";
+$lang['Upgrade'] = "Upgrade";
+
+$lang['Install_Method'] = "Choose your installation method";
+
//
// That's all Folks!
// -------------------------------------------------