Index: includes/locale.inc
===================================================================
--- includes/locale.inc	(revision 2957)
+++ includes/locale.inc	(working copy)
@@ -1338,8 +1338,11 @@
  *   The string ID of the existing string modified or the new string added.
  */
 function _locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = NULL, $plural = NULL) {
-  $lid = db_result(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup));
-
+  if ($textgroup=='default')
+    $lid = db_result(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup));
+  else
+    $lid = db_result(db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s' and location='%s'", $source, $textgroup, $location));
+  
   if (!empty($translation)) {
      // Skip this string unless it passes a check for dangerous code.
      // Text groups other than default still can contain HTML tags