diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 3cbbd82..70a5fc3 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -2412,12 +2412,10 @@ function install_check_requirements($install_state) {
     $conf_path = './' . conf_path(FALSE, TRUE);
     $settings_file = $conf_path . '/settings.php';
     $default_settings_file = './sites/default/default.settings.php';
-    $file = $conf_path;
     $exists = FALSE;
     // Verify that the directory exists.
     if (drupal_verify_install_file($conf_path, FILE_EXIST, 'dir')) {
       // Check if a settings.php file already exists.
-      $file = $settings_file;
       if (drupal_verify_install_file($settings_file, FILE_EXIST)) {
         // If it does, make sure it is writable.
         $readable = drupal_verify_install_file($settings_file, FILE_READABLE);
@@ -2425,6 +2423,13 @@ function install_check_requirements($install_state) {
         $exists = TRUE;
       }
     }
+    $t_args = array(
+      '@drupal' => drupal_install_profile_distribution_name(),
+      '!default-file' => '<code>' . check_plain($default_settings_file) . '</code>',
+      '!settings-file' => '<code>' . check_plain($settings_file) . '</code>',
+      '@install-txt-url' => base_path() . 'core/INSTALL.txt',
+      '@handbook-url' => 'http://drupal.org/server-permissions',
+    );
 
     // If default.settings.php does not exist, or is not readable, throw an
     // error.
@@ -2433,7 +2438,7 @@ function install_check_requirements($install_state) {
         'title'       => t('Default settings file'),
         'value'       => t('The default settings file does not exist.'),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('The @drupal installer requires that the %default-file file not be modified in any way from the original download.', array('@drupal' => drupal_install_profile_distribution_name(), '%default-file' => $default_settings_file)),
+        'description' => t('The !default-file file must not be modified in any way from the original download.', $t_args),
       );
     }
     // Otherwise, if settings.php does not exist yet, we can try to copy
@@ -2488,13 +2493,13 @@ function install_check_requirements($install_state) {
         'title'       => t('Settings file'),
         'value'       => t('The settings file does not exist.'),
         'severity'    => REQUIREMENT_ERROR,
-        'description' => t('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_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt')),
+        'description' => t('Copy the !default-file file to !settings-file. More details about installing @drupal are available in <a href="@install-txt-url">INSTALL.txt</a>.', $t_args),
       );
     }
     else {
       $requirements['settings file exists'] = array(
         'title'       => t('Settings file'),
-        'value'       => t('The %file file exists.', array('%file' => $file)),
+        'value'       => t('The !settings-file file exists.', $t_args),
       );
       // If settings.php is not readable, throw an error.
       if (!$readable) {
@@ -2502,7 +2507,7 @@ function install_check_requirements($install_state) {
           'title'       => t('Settings file'),
           'value'       => t('The settings file is not readable.'),
           'severity'    => REQUIREMENT_ERROR,
-          'description' => t('@drupal requires read permissions to %file at all times. If you are unsure how to grant file permissions, consult the <a href="@handbook_url">online handbook</a>.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')),
+          'description' => t('Read permissions to !settings-file are required at all times. If you are unsure how to grant file permissions, consult the <a href="@handbook-url">online handbook</a>.', $t_args),
         );
       }
       // If settings.php is not writable, throw an error.
@@ -2511,7 +2516,7 @@ function install_check_requirements($install_state) {
           'title'       => t('Settings file'),
           'value'       => t('The settings file is not writable.'),
           'severity'    => REQUIREMENT_ERROR,
-          'description' => t('The @drupal installer requires write permissions to %file during the installation process. If you are unsure how to grant file permissions, consult the <a href="@handbook_url">online handbook</a>.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')),
+          'description' => t('Write permissions to !settings-file are required during the installation process. If you are unsure how to grant file permissions, consult the <a href="@handbook-url">online handbook</a>.', $t_args),
         );
       }
       else {
@@ -2525,7 +2530,7 @@ function install_check_requirements($install_state) {
           'title'       => t('Settings file'),
           'value'       => t('The settings file is owned by the web server.'),
           'severity'    => REQUIREMENT_ERROR,
-          'description' => t('The @drupal installer failed to create a settings file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in <a href="@install_txt">INSTALL.txt</a>. If you have problems with the file permissions on your server, consult the <a href="@handbook_url">online handbook</a>.', array('@drupal' => drupal_install_profile_distribution_name(), '%file' => $file, '%default_file' => $default_settings_file, '@install_txt' => base_path() . 'core/INSTALL.txt', '@handbook_url' => 'http://drupal.org/server-permissions')),
+          'description' => t('Failed to create a settings file with proper file ownership. Log on to your web server, remove the existing !settings-file file, and copy the !default-file file to !settings-file. More details about installing @drupal are available in <a href="@install-txt-url">INSTALL.txt</a>. If you have problems with the file permissions on your server, consult the <a href="@handbook-url">online handbook</a>.', $t_args),
         );
       }
     }