diff --git a/l10n_update.admin.inc b/l10n_update.admin.inc
index 623adf5..3f851bb 100644
--- a/l10n_update.admin.inc
+++ b/l10n_update.admin.inc
@@ -245,29 +245,23 @@ function theme_l10n_update_project_status($projects, $languages, $history, $avai
   $output = '';
   //$header = array(t('Project'), t('Current version'), t('Available update'), '');
   $header = $rows = array();
-
   foreach ($projects as $name => $project) {
     $row = '<div class="version-status">';
-    if (isset($history[$name])) {
-      if (isset($updates[$name])) {
-        $project_status = 'updatable';
-        $project_class = 'warning';
-      }
-      else {
-        $project_status = 'uptodate';
-        $project_class = 'ok';
-      }
+    if (empty($available[$name])) {
+      // Remote information not checked
+      $status = 'unknown';
+      $class = 'unknown';
     }
-    elseif (isset($available[$name])) {
-      $project_status = 'available';
-      $project_class = 'warning';
+    elseif (empty($updates[$name])) {
+      // No updates available
+      $status = 'ok';
+      $class = 'ok';
     }
     else {
-      // Remote information not checked
-      $project_status = 'unknown';
-      $project_class = 'unknown';
+      // Update available
+      $status = 'update';
+      $class = 'warning';
     }
-
     $row = theme('l10n_update_version_status', $status);
 
     $row .= "<div class=\"project $class\">";
@@ -282,34 +276,27 @@ function theme_l10n_update_project_status($projects, $languages, $history, $avai
     $row .= "<div class=\"versions\">\n";
     $versions = array();
     foreach ($languages as $lang => $language) {
-      $installed = isset($history[$name][$lang]) ? $history[$name][$lang] : NULL;
+      $current = isset($history[$name][$lang]) ? $history[$name][$lang] : NULL;
+      //$installed = isset($history[$name][$lang]) ? $history[$name][$lang] : NULL;
       $update = isset($updates[$name][$lang]) ? $updates[$name][$lang] : NULL;
-      $available = isset($available[$name]->$lang) ? $available[$name]->$lang : NULL;
-      if ($installed) {
-        if ($update) {
-          $status = 'updatable';
-          $class = 'messages warning';
-        }
-        else {
-          $status = 'uptodate';
-          $class = 'ok';
-        }
+
+      if ($update) {
+        $status = 'update';
+        $class = 'warning';
+      }
+      elseif ($current) {
+        $status = $class = 'ok';
       }
-      elseif ($available) {
-        $status = 'available';
-          $class = 'warning';
-        }
       else {
-        $status = 'unknown';
-        $class = 'unknown';
+        $status = $class ='unknown';
       }
       $version = array(
         array('data' => $language, 'class' => 'version-title'),
-        $installed ? theme('l10n_update_release', $installed) : '',
+        $current ? theme('l10n_update_release', $current) : '',
         $update ? theme('l10n_update_release', $update) : '',
         theme('l10n_update_version_status', $status, $update ? $update->type : NULL),
       );
-      $versions[] = array('data' => $version, 'class' => $class);
+    $versions[] = array('data' => $version, 'class' => $class);
     }
     $row .= theme('table', array(), $versions);
     $row .= "</div>\n";
@@ -349,7 +336,7 @@ function theme_l10n_update_release($release) {
  * Format version status with icon.
  *
  * @param string $status
- *   Version status: 'uptodate', 'updatable', 'available', 'unknown'.
+ *   Version status: 'ok', 'update', 'unknown'.
  * @param string $type
  *   Update type: 'download', 'localfile'.
  *
@@ -357,22 +344,18 @@ function theme_l10n_update_release($release) {
  *   HTML output.
  */
 function theme_l10n_update_version_status($status, $type = NULL) {
+  $msg = $icon = '';
   $output = '<div class="version-status">';
   switch ($status) {
-    case 'uptodate':
+    case 'ok':
       $icon = theme('image', 'misc/watchdog-ok.png', t('ok'), t('ok'));
       $msg = '<span class="current">'. t('Up to date') .'</span>';
       break;
-    case 'updatable':
+    case 'update':
       $icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
       $txt = ($type == 'download') ? t('Remote update available') : t('Local update available');
       $msg = '<span class="not-current">'. $txt .'</span>';
       break;
-    case 'available':
-      $icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
-      $txt = t('Uninstalled translation available');
-      $msg = '<span class="not-current">'. $txt .'</span>';
-      break;
     case 'unknown':
       $icon = theme('image', 'misc/watchdog-warning.png', t('warning'), t('warning'));
       $msg = '<span class="not-supported">'. t('No information') .'</span>';