[geeklog-cvs] Geeklog-1.x/public_html/admin/install/language english.php, 1.1, 1.2

[Aaron Blankstein]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language
In directory qs1489.pair.com:/tmp/cvs-serv525/Geeklog-1.x/public_html/admin/install/language

Modified Files:
	english.php 
Log Message:
Added config class and admin UI. Also added modified install script for 
the new configuration class. 



Index: english.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/language/english.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** english.php	28 Jul 2007 17:19:13 -0000	1.1
--- english.php	29 Aug 2007 02:11:35 -0000	1.2
***************
*** 58,68 ****
      13 => 'Currently',
      14 => 'Change directory to',
!     15 => 'Export of Geeklog headlines is switched off. <b>backend</b> directory was not tested',
!     17 => 'User photos are disabled - <b>userphotos</b> directory was not tested',
!     18 => 'Images in articles are disabled - <b>articles</b> directory was not tested',
      19 => 'Geeklog requires certain files and directories to be writeable by the web server. Below is a list of which files and directories need to be changed.',
      20 => 'Warning!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Please make the necessary changes before you continue.',
!     22 => 'If you have shell access you can run the <code>set-permissions.sh</code> script that will set all the permissions automatically.',
      23 => 'Choose your installation method:',
      24 => 'New Install',
--- 58,68 ----
      13 => 'Currently',
      14 => 'Change directory to',
!     15 => 'Export of Geeklog headlines is switched off. The <code>backend</code> directory was not tested',
!     17 => 'User photos are disabled. The <code>userphotos</code> directory was not tested',
!     18 => 'Images in articles are disabled. The <code>articles</code> directory was not tested',
      19 => 'Geeklog requires certain files and directories to be writeable by the web server. Below is a list of which files and directories need to be changed.',
      20 => 'Warning!',
      21 => 'Your Geeklog and site will not work properly until the errors listed above are corrected. Please make the necessary changes before you continue.',
!     22 => 'unkown',
      23 => 'Choose your installation method:',
      24 => 'New Install',
***************
*** 70,74 ****
      26 => 'Unable to modify',
      27 => '. Did you make sure the file is write-able by the web server?',
!     28 => 'lib-common.php. Did you make sure the file is write-able by the web server?',
      29 => 'Geeklog Site',
      30 => 'Another Nifty Geeklog Site',
--- 70,74 ----
      26 => 'Unable to modify',
      27 => '. Did you make sure the file is write-able by the web server?',
!     28 => 'siteconfig.php. Did you make sure the file is write-able by the web server?',
      29 => 'Geeklog Site',
      30 => 'Another Nifty Geeklog Site',
***************
*** 107,114 ****
      63 => 'An installed Geeklog database already exists. The installer will not allow you to run a fresh install on an existing Geeklog database. To continue you must do one of the following:',
      64 => 'Delete the tables from the existing database. Or simply drop the database and recreate it. Then click "Retry" below.',
!     65 => 'Perform an upgrade on your database (for a new Geeklog version) by selecting the "Upgrade" option below.',
      66 => 'Retry',
!     67 => 'Error Setting up the Geeklog Database',
!     68 => 'The install script encountered and error while attempting to setup the Geeklog database.',
      69 => 'Upgrading Geeklog',
      70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
--- 107,114 ----
      63 => 'An installed Geeklog database already exists. The installer will not allow you to run a fresh install on an existing Geeklog database. To continue you must do one of the following:',
      64 => 'Delete the tables from the existing database. Or simply drop the database and recreate it. Then click "Retry" below.',
!     65 => 'Perform an upgrade on your database (to a newer Geeklog version) by selecting the "Upgrade" option below.',
      66 => 'Retry',
!     67 => 'Error Setting up the Geeklog Database', 
!     68 => 'The database is not empty. Please drop all tables in the database and start again.',
      69 => 'Upgrading Geeklog',
      70 => 'Before we get started it is important that you back up your database current Geeklog files. This installation script will alter your Geeklog database so if something goes wrong and you need to restart the upgrade process, you will need a backup of your original database. YOU HAVE BEEN WARNED!',
***************
*** 135,139 ****
      91 => 'Don\'t forget to do',
      92 => 'things',
!     93 => 'Remove the install directory,',
      94 => 'Change the',
      95 => 'account password.',
--- 135,139 ----
      91 => 'Don\'t forget to do',
      92 => 'things',
!     93 => 'Remove or rename the install directory,',
      94 => 'Change the',
      95 => 'account password.',
***************
*** 142,146 ****
      98 => 'back to',
      99 => '<strong>Note:</strong> Because the security model has been changed, we have created a new account with the rights you need to administer your new site.  The username for this new account is <b>NewAdmin</b> and the password is <b>password</b>',
!     100 => 'Change'
  );
  
--- 142,151 ----
      98 => 'back to',
      99 => '<strong>Note:</strong> Because the security model has been changed, we have created a new account with the rights you need to administer your new site.  The username for this new account is <b>NewAdmin</b> and the password is <b>password</b>',
!     100 => 'Change',
!     101 => 'Stop!',
!     102 => 'It is critical that you change permissions on the files listed below. Geeklog will not be able to be installed until you do so.',
!     103 => 'Installation Error',
!     104 => 'The path "',
!     105 => '" does not appear to be correct. Please go back and try again.'
  );