--- locale.inc Sat Jul 25 03:33:56 2009 -0500
+++ locale.inc Mon Aug 24 15:51:53 2009 -0500
@@ -2011,8 +2011,10 @@
       case "en":
         $sql = $join ." WHERE s.source LIKE '%%%s%%' $grouplimit ORDER BY s.source";
         $arguments = array($query['string']); // $where is not used, discard its arguments
+        $limit_language = 'en'; // arhak 2009.08.24
         if (!empty($grouplimit)) {
           $arguments[] = $query['group'];
+          if ($query['group'] == 'default') $limit_language = FALSE; // arhak 2009.08.24
         }
         break;
       // Search in all languages
@@ -2246,7 +2248,7 @@
   drupal_add_css(drupal_get_path('module', 'locale') .'/locale.css', 'module', 'all', FALSE);
 
   $languages = language_list();
-  unset($languages['en']);
+  if (!$limit_language || language_default('language') == 'en') unset($languages['en']); // arhak 2009.08.24
   $output = '';
   foreach ($languages as $langcode => $language) {
     if (!$limit_language || $limit_language == $langcode) {