diff --git a/update.php b/update.php
index a777920..df8b6f7 100644
--- a/update.php
+++ b/update.php
@@ -28,7 +28,7 @@ define('DRUPAL_ROOT', getcwd());
 define('MAINTENANCE_MODE', 'update');
 
 function update_selection_page() {
-  drupal_set_title('Drupal database update');
+  drupal_set_title(t('Drupal database update'));
   $elements = drupal_get_form('update_script_selection_form');
   $output = drupal_render($elements);
 
@@ -89,7 +89,7 @@ function update_script_selection_form($form, &$form_state) {
       $incompatible_count++;
       $module_update_key = $data['module'] . '_updates';
       if (isset($form['start'][$module_update_key]['#items'][$data['number']])) {
-        $text = $data['missing_dependencies'] ? 'This update will been skipped due to the following missing dependencies: <em>' . implode(', ', $data['missing_dependencies']) . '</em>' : "This update will be skipped due to an error in the module's code.";
+        $text = $data['missing_dependencies'] ? t('This update will been skipped due to the following missing dependencies: <em>') . implode(', ', $data['missing_dependencies']) . '</em>' : t("This update will be skipped due to an error in the module's code.");
         $form['start'][$module_update_key]['#items'][$data['number']] .= '<div class="warning">' . $text . '</div>';
       }
       // Move the module containing this update to the top of the list.
@@ -99,7 +99,7 @@ function update_script_selection_form($form, &$form_state) {
 
   // Warn the user if any updates were incompatible.
   if ($incompatible_updates_exist) {
-    drupal_set_message('Some of the pending updates cannot be applied because their dependencies were not met.', 'warning');
+    drupal_set_message(t('Some of the pending updates cannot be applied because their dependencies were not met.'), 'warning');
   }
 
   if (empty($count)) {
@@ -111,7 +111,7 @@ function update_script_selection_form($form, &$form_state) {
   }
   else {
     $form['help'] = array(
-      '#markup' => '<p>The version of Drupal you are updating from has been automatically detected.</p>',
+      '#markup' => t('<p>The version of Drupal you are updating from has been automatically detected.</p>'),
       '#weight' => -5,
     );
     if ($incompatible_count) {
@@ -132,7 +132,7 @@ function update_script_selection_form($form, &$form_state) {
     $form['actions'] = array('#type' => 'actions');
     $form['actions']['submit'] = array(
       '#type' => 'submit',
-      '#value' => 'Apply pending updates',
+      '#value' => t('Apply pending updates'),
     );
   }
   return $form;
@@ -141,38 +141,38 @@ function update_script_selection_form($form, &$form_state) {
 function update_helpful_links() {
   // NOTE: we can't use l() here because the URL would point to
   // 'update.php?q=admin'.
-  $links[] = '<a href="' . base_path() . '">Front page</a>';
-  $links[] = '<a href="' . base_path() . '?q=admin">Administration pages</a>';
+  $links[] = '<a href="' . base_path() . '">' . t('Front page') . '</a>';
+  $links[] = '<a href="' . base_path() . '?q=admin">' . t('Administration pages') . '</a>';
   return $links;
 }
 
 function update_results_page() {
-  drupal_set_title('Drupal database update');
+  drupal_set_title(t('Drupal database update'));
   $links = update_helpful_links();
 
   update_task_list();
   // Report end result.
   if (module_exists('dblog')) {
-    $log_message = ' All errors have been <a href="' . base_path() . '?q=admin/reports/dblog">logged</a>.';
+    $log_message = t('All errors have been <a href="!link?q=admin/reports/dblog">logged</a>.', array ('!link' => base_path());
   }
   else {
-    $log_message = ' All errors have been logged.';
+    $log_message = t(' All errors have been logged.');
   }
 
   if ($_SESSION['update_success']) {
-    $output = '<p>Updates were attempted. If you see no failures below, you may proceed happily to the <a href="' . base_path() . '?q=admin">administration pages</a>. Otherwise, you may need to update your database manually.' . $log_message . '</p>';
+    $output = t('<p>Updates were attempted. If you see no failures below, you may proceed happily to the <a href="!link?q=admin">Administration pages</a>. Otherwise, you may need to update your database manually. !log_message</p>', array('!link' => base_path(), '!log_message' => $log_message));
   }
   else {
     list($module, $version) = array_pop(reset($_SESSION['updates_remaining']));
-    $output = '<p class="error">The update process was aborted prematurely while running <strong>update #' . $version . ' in ' . $module . '.module</strong>.' . $log_message;
+    $output = t('<p class="error">The update process was aborted prematurely while running <strong>update #!version  in !module module</strong>. !log_message', array('!version' =>  $version , '!module' => $module, '!log_message' => $log_message));
     if (module_exists('dblog')) {
-      $output .= ' You may need to check the <code>watchdog</code> database table manually.';
+      $output .= t(' You may need to check the <code>watchdog</code> database table manually.');
     }
     $output .= '</p>';
   }
 
   if (!empty($GLOBALS['update_free_access'])) {
-    $output .= "<p><strong>Reminder: don't forget to set the <code>\$update_free_access</code> value in your <code>settings.php</code> file back to <code>FALSE</code>.</strong></p>";
+    $output .= t("<p><strong>Reminder: Set the <code>\$update_free_access</code> value in your <code>settings.php</code> file back to <code>FALSE</code>.</strong></p>");
   }
 
   $output .= theme('item_list', array('items' => $links));
@@ -196,13 +196,13 @@ function update_results_page() {
               $messages[] = '<li class="success">' . $query['query'] . '</li>';
             }
             else {
-              $messages[] = '<li class="failure"><strong>Failed:</strong> ' . $query['query'] . '</li>';
+              $messages[] = t('<li class="failure"><strong>Failed:</strong> ') . $query['query'] . '</li>';
             }
           }
 
           if ($messages) {
             $module_has_message = TRUE;
-            $query_messages .= '<h4>Update #' . $number . "</h4>\n";
+            $query_messages .= t("<h4>Update #!number </h4>\n", array ('!number' => $number));
             $query_messages .= '<ul>' . implode("\n", $messages) . "</ul>\n";
           }
         }
@@ -210,12 +210,12 @@ function update_results_page() {
         // If there were any messages in the queries then prefix them with the
         // module name and add it to the global message list.
         if ($module_has_message) {
-          $all_messages .= '<h3>' . $module . " module</h3>\n" . $query_messages;
+          $all_messages .= t("<h3>!module module</h3>\n", array('!module' => $module)) . $query_messages;
         }
       }
     }
     if ($all_messages) {
-      $output .= '<div id="update-results"><h2>The following updates returned messages</h2>';
+      $output .= t('<div id="update-results"><h2>The following updates returned messages</h2>');
       $output .= $all_messages;
       $output .= '</div>';
     }
@@ -235,17 +235,17 @@ function update_info_page() {
   }
 
   update_task_list('info');
-  drupal_set_title('Drupal database update');
+  drupal_set_title(t('Drupal database update'));
   $token = drupal_get_token('update');
-  $output = '<p>Use this utility to update your database whenever a new release of Drupal or a module is installed.</p><p>For more detailed information, see the <a href="http://drupal.org/upgrade">upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>';
+  $output = t('<p>Use this utility to update your database whenever a new release of Drupal or a module is installed.</p><p>For more detailed information, see the <a href="http://drupal.org/upgrade">upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.</p>');
   $output .= "<ol>\n";
-  $output .= "<li><strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.</li>\n";
-  $output .= "<li><strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.</li>\n";
-  $output .= '<li>Put your site into <a href="' . base_path() . '?q=admin/config/development/maintenance">maintenance mode</a>.</li>' . "\n";
-  $output .= "<li>Install your new files in the appropriate location, as described in the handbook.</li>\n";
+  $output .= t("<li><strong>Back up your database</strong>. This process will change your database values and in case of emergency you may need to revert to a backup.</li>\n");
+  $output .= t("<li><strong>Back up your code</strong>. Hint: when backing up module code, do not leave that backup in the 'modules' or 'sites/*/modules' directories as this may confuse Drupal's auto-discovery mechanism.</li>\n");
+  $output .= t("<li>Put your site into <a href=\"!link?q=admin/config/development/maintenance\">maintenance mode</a>.</li>\n", array ('!link' => base_path()));
+  $output .= t("<li>Install your new files in the appropriate location, as described in the handbook.</li>\n");
   $output .= "</ol>\n";
-  $output .= "<p>When you have performed the steps above, you may proceed.</p>\n";
-  $output .= '<form method="post" action="update.php?op=selection&amp;token=' . $token . '"><p><input type="submit" value="Continue" class="form-submit" /></p></form>';
+  $output .= t("<p>When you have performed the steps above, you may proceed.</p>\n");
+  $output .= '<form method="post" action="update.php?op=selection&amp;token=' . $token . '"><p><input type="submit" value=' .t("Continue") .' class="form-submit" /></p></form>';
   $output .= "\n";
   return $output;
 }
@@ -254,13 +254,13 @@ function update_access_denied_page() {
   drupal_add_http_header('Status', '403 Forbidden');
   watchdog('access denied', 'update.php', NULL, LOG_WARNING);
   drupal_set_title('Access denied');
-  return '<p>Access denied. You are not authorized to access this page. Log in using either an account with the <em>administer software updates</em> permission or the site maintenance account (the account you created during installation). If you cannot log in, you will have to edit <code>settings.php</code> to bypass this access check. To do this:</p>
+  return t('<p>Access denied. You are not authorized to access this page. Log in using either an account with the <em>administer software updates</em> permission or the site maintenance account (the account you created during installation). If you cannot log in, you will have to edit <code>settings.php</code> to bypass this access check. To do this:</p>
 <ol>
  <li>With a text editor find the settings.php file on your system. From the main Drupal directory that you installed all the files into, go to <code>sites/your_site_name</code> if such directory exists, or else to <code>sites/default</code> which applies otherwise.</li>
  <li>There is a line inside your settings.php file that says <code>$update_free_access = FALSE;</code>. Change it to <code>$update_free_access = TRUE;</code>.</li>
  <li>As soon as the update.php script is done, you must change the settings.php file back to its original form with <code>$update_free_access = FALSE;</code>.</li>
  <li>To avoid having this problem in the future, remember to log in to your website using either an account with the <em>administer software updates</em> permission or the site maintenance account (the account you created during installation) before you backup your database at the beginning of the update process.</li>
-</ol>';
+</ol>');
 }
 
 /**
@@ -293,11 +293,11 @@ function update_access_allowed() {
 function update_task_list($active = NULL) {
   // Default list of tasks.
   $tasks = array(
-    'requirements' => 'Verify requirements',
-    'info' => 'Overview',
-    'select' => 'Review updates',
-    'run' => 'Run updates',
-    'finished' => 'Review log',
+    'requirements' => t('Verify requirements'),
+    'info' => t('Overview'),
+    'select' => t('Review updates'),
+    'run' => t('Run updates'),
+    'finished' => t('Review log'),
   );
 
   drupal_add_region_content('sidebar_first', theme('task_list', array('items' => $tasks, 'active' => $active)));
@@ -327,9 +327,9 @@ function update_check_requirements() {
   // If there are issues, report them.
   if ($severity == REQUIREMENT_ERROR) {
     update_task_list('requirements');
-    drupal_set_title('Requirements problem');
+    drupal_set_title(t('Requirements problem'));
     $status_report = theme('status_report', array('requirements' => $requirements));
-    $status_report .= 'Check the error messages and <a href="' . check_url(request_uri()) . '">try again</a>.';
+    $status_report .= t('Check the error messages and <a href="check_url(request_uri())">try again</a>.', array (!check_url => check_url(request_uri())));
     print theme('update_page', array('content' => $status_report));
     exit();
   }
