Index: includes/install.core.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.core.inc,v
retrieving revision 1.28
diff -u -p -r1.28 install.core.inc
--- includes/install.core.inc	1 Sep 2010 01:24:05 -0000	1.28
+++ includes/install.core.inc	14 Sep 2010 15:29:36 -0000
@@ -292,7 +292,8 @@ function install_begin_request(&$install
     spl_autoload_register('db_autoload');
 
     // Verify the last completed task in the database, if there is one.
-    $task = install_verify_completed_task();
+    #$task = install_verify_completed_task();
+    $task = 'install_select_locale';
   }
   else {
     $task = NULL;
@@ -1203,16 +1204,29 @@ function install_select_locale(&$install
     // the user that the installer can be localized. Otherwise we assume the
     // user knows what he is doing.
     if (count($locales) == 1) {
-      if ($profilename == 'standard' && $install_state['interactive']) {
+      if ($install_state['interactive']) {
         drupal_set_title(st('Choose language'));
         if (!empty($install_state['parameters']['localize'])) {
-          $output = '<p>' . st('With the addition of an appropriate translation package, this installer is capable of proceeding in another language of your choice. To install and use Drupal in a language other than English:') . '</p>';
-          $output .= '<ul><li>' . st('Determine if <a href="@translations" target="_blank">a translation of this Drupal version</a> is available in your language of choice. A translation is provided via a translation package; each translation package enables the display of a specific version of Drupal in a specific language. Not all languages are available for every version of Drupal.', array('@translations' => 'http://drupal.org/project/translations')) . '</li>';
-          $output .= '<li>' . st('If an alternative translation package of your choice is available, download and extract its contents to your Drupal root directory.') . '</li>';
-          $output .= '<li>' . st('Return to choose language using the second link below and select your desired language from the displayed list. Reloading the page allows the list to automatically adjust to the presence of new translation packages.') . '</li>';
-          $output .= '</ul><p>' . st('Alternatively, to install and use Drupal in English, or to defer the selection of an alternative language until after installation, select the first link below.') . '</p>';
+          $output = '<p>' . st('Follow these steps to translate Drupal into your language:') . '</p>';
+          $output .= '<ol><li>' . st('Download a translation from the <a href="@localize" target="_blank">translation server</a>.', array(
+            '@localize' => 'http://localize.drupal.org/download',
+          )) . '</li>';
+          $output .= '<li>' . st('Rename the downloaded file to your language\'s <a href="@iso-url" target="_blank">ISO code</a> (e.g., <code>de.po</code> or <code>fr.po</code>) and place it into the following directory:
+<pre>
+@profile-path/
+</pre>
+For detailed instructions, visit the <a href="@handbook-url" target="_blank">drupal.org handbook page</a>.', array(
+            '@profile-path' => "/profiles/$profilename/translations",
+            '@iso-url' => 'http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements',
+            '@handbook-url' => 'http://drupal.org/localize',
+          )) . '</li>';
+          $output .= '<li>' . st('Reload the language selection page after adding translations.') . '</li>';
+          $output .= '</ol>';
           $output .= '<p>' . st('How should the installation continue?') . '</p>';
-          $output .= '<ul><li><a href="install.php?profile=' . $profilename . '&amp;locale=en">' . st('Continue installation in English') . '</a></li><li><a href="install.php?profile=' . $profilename . '">' . st('Return to choose a language') . '</a></li></ul>';
+          $output .= '<ul>';
+          $output .= '<li><a href="install.php?profile=' . $profilename . '">' . st('Reload the language selection page to choose a language') . '</a></li>';
+          $output .= '<li><a href="install.php?profile=' . $profilename . '&amp;locale=en">' . st('Continue installation in English and install additional languages later') . '</a></li>';
+          $output .= '</ul>';
         }
         else {
           include_once DRUPAL_ROOT . '/includes/form.inc';
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.69
diff -u -p -r1.69 style.css
--- themes/seven/style.css	13 Sep 2010 00:59:47 -0000	1.69
+++ themes/seven/style.css	14 Sep 2010 15:27:33 -0000
@@ -139,6 +139,10 @@ pre,
 kbd {
   font-size: 1.231em;
 }
+pre {
+  margin: 0.5em 0;
+  white-space: pre-wrap;
+}
 
 /**
  * Skip link.