? installer_requirements_02.patch
? installer_settings_text.patch
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.177
diff -u -p -r1.177 install.php
--- install.php	6 Jun 2009 16:05:26 -0000	1.177
+++ install.php	7 Jun 2009 22:47:48 -0000
@@ -135,7 +135,7 @@ function install_main() {
       install_task_list('requirements');
       drupal_set_title(st('Requirements problem'));
       $status_report = theme('status_report', $requirements);
-      $status_report .= st('Please check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri()));
+      $status_report .= st('Please fix the problems listed above and <a href="!url">proceed with the installation</a>.', array('!url' => request_uri(), '@drupal' => drupal_install_profile_name()));
       print theme('install_page', $status_report);
       exit;
     }
@@ -916,9 +916,9 @@ function install_check_requirements($pro
     if (!$exists) {
       $requirements['settings file exists'] = array(
         'title'       => st('Settings file'),
-        'value'       => st('The settings file does not exist.'),
+        'value'       => st('The file settings.php does not exist.'),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => st('The @drupal installer requires that you create a settings file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href="@install_txt">INSTALL.txt</a>.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $conf_path . '/default.settings.php', '@install_txt' => base_path() . 'INSTALL.txt')),
+        'description' => st('You must create a settings file before proceeding with the installation of @drupal. Copy the template settings file %default_file to %file. Additional information is available in the file INSTALL.txt.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $conf_path . '/default.settings.php')),
       );
     }
     else {
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.339
diff -u -p -r1.339 system.install
--- modules/system/system.install	6 Jun 2009 16:05:27 -0000	1.339
+++ modules/system/system.install	7 Jun 2009 22:47:50 -0000
@@ -205,7 +205,7 @@ function system_requirements($phase) {
     elseif ($phase == 'install') {
       // For the installer UI, we need different wording. 'value' will
       // be treated as version, so provide none there.
-      $description = $error . ' ' . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. For more information, please see INSTALL.txt or the <a href="@handbook_url">online handbook</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions'));
+      $description = $error . ' ' . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. Additional information is available in the file INSTALL.txt and in the <a href="@handbook_url">online handbook page relating to Server permissions issues</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions'));
       $requirements['file system']['value'] = '';
     }
     if (!empty($description)) {