Index: l10n_client.module
===================================================================
--- l10n_client.module	2010-01-17 13:36:46.000000000 +0100
+++ l10n_client.module	2010-01-17 13:41:39.000000000 +0100
@@ -163,13 +163,13 @@ function l10n_client_translate_page($dis
     if ($display_translated) {
       $table[] = array(check_plain($data->source), check_plain($data->translation));
       if ($allow_translation) {
-        l10_client_add_string_to_page($data->source, $data->translation);
+        l10_client_add_string_to_page($data->source, $data->translation, $textgroup);
       }
     }
     else {
       $table[] = array(check_plain($data->source));
       if ($allow_translation) {
-        l10_client_add_string_to_page($data->source, TRUE);
+        l10_client_add_string_to_page($data->source, TRUE, $textgroup);
       }
     }
   }
@@ -196,8 +196,10 @@ function l10n_client_footer() {
   if (user_access('use on-page translation') && ($page_strings = _l10n_client_page_strings())) {
     // If we have strings for the page language, restructure the data.
     $l10n_strings = array();
-    foreach ($page_strings as $string => $translation) {
-      $l10n_strings[] = array($string, $translation);
+    foreach ($page_strings as $textgroup => $group_strings) {
+      foreach ($group_strings as $string => $translation) {
+        $l10n_strings[] = array($string, $translation, $textgroup);
+      }
     }
     array_multisort($l10n_strings);
     // Include string selector on page.
@@ -251,12 +253,14 @@ function l10n_client_footer() {
  *   Source string or NULL if geting the list of strings specified.
  * @param $translation
  *   Translation string. TRUE if untranslated.
+ * @param $textgroup
+ *   Text group the string belongs to
  */
-function l10_client_add_string_to_page($source = NULL, $translation = NULL) {
+function l10_client_add_string_to_page($source = NULL, $translation = NULL, $textgroup = 'default') {
   static $strings = array();
   
   if (isset($source)) {
-    $strings[$source] = $translation;
+    $strings[$textgroup][$source] = $translation;
   }
   else {
     return $strings;
@@ -273,23 +277,22 @@ function l10_client_add_string_to_page($
 function _l10n_client_page_strings() {
   global $language;
 
-  // Get the page strins stored by this or other modules.
+  // Get the page strings stored by this or other modules.
   $strings = l10_client_add_string_to_page();
   
   // If this is not the module's translation page, merge all strings used on the page.
   if (arg(0) != 'locale' && is_array($locale = locale()) && isset($locale[$language->language])) {
-    
-    $strings = array_merge($strings, $locale[$language->language]);
-    
+    $strings += array('default' => array());
+    $strings['default'] = array_merge($strings['default'], $locale[$language->language]);
     // Also select and add other strings for this path. Other users may have run
     // into these strings for the same page. This might be useful in some cases
     // but will not work reliably in all cases, since strings might have been
     // found on completely different paths first, or on a slightly different
     // path.
-    $result = db_query("SELECT s.source, t.translation FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = '%s' WHERE s.location = '%s'", $language->language, request_uri());
+    $result = db_query("SELECT s.source, t.translation, s.textgroup FROM {locales_source} s LEFT JOIN {locales_target} t ON s.lid = t.lid AND t.language = '%s' WHERE s.location = '%s'", $language->language, request_uri());
     while ($data = db_fetch_object($result)) {
-      if (!array_key_exists($data->source, $strings)) {
-        $strings[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
+      if (!array_key_exists($data->source, $strings['default'])) {
+        $strings[$data->textgroup][$data->source] = (empty($data->translation) ? TRUE : $data->translation);
       }
     }
   }
@@ -305,7 +308,9 @@ function _l10n_client_dom_strings($strin
   foreach ($strings as $values) {
     $source = $values[0] === TRUE ? '' : htmlspecialchars($values[0], ENT_NOQUOTES, 'UTF-8');
     $target = $values[1] === TRUE ? '' : htmlspecialchars($values[1], ENT_NOQUOTES, 'UTF-8');
-    $output .= "<div><span class='source'>$source</span><span class='target'>$target</span></div>";
+    $textgroup = $values[2];
+    $output .= "<div><span class='source'>$source</span><span class='target'>$target</span><span class='textgroup'>$textgroup</span></div>";
+
   }
   return "<div id='l10n-client-data'>$output</div>";
 }
@@ -373,6 +378,8 @@ function l10n_client_form($form_id, $str
     '#value' => t('Save translation'),
     '#type' => 'submit',
   );
+  // Hidden field for textgroup
+  $form['textgroup'] = array('#type' => 'hidden', '#value' => 'default');
   $form['copy'] = array(
     '#value' => "<input id='edit-copy' class='form-submit' type='button' value='". t('Copy Source') ."'/>",
   );
@@ -406,10 +413,10 @@ function l10n_client_save_string() {
   global $user, $language;
   
   if (user_access('use on-page translation')) {
-    if (isset($_POST['source']) && isset($_POST['target']) && !empty($_POST['form_token']) && drupal_valid_token($_POST['form_token'], 'l10n_client_form')) {
+    if (isset($_POST['source']) && isset($_POST['target']) && isset($_POST['textgroup']) && !empty($_POST['form_token']) && drupal_valid_token($_POST['form_token'], 'l10n_client_form')) {
       include_once 'includes/locale.inc';
       $report = array(0, 0, 0);
-      _locale_import_one_string_db($report, $language->language, $_POST['source'], $_POST['target'], 'default', NULL, LOCALE_IMPORT_OVERWRITE);
+      _locale_import_one_string_db($report, $language->language, $_POST['source'], $_POST['target'], $_POST['textgroup'], NULL, LOCALE_IMPORT_OVERWRITE);
       cache_clear_all('locale:', 'cache', TRUE);
       _locale_invalidate_js($language->language);
       
@@ -436,7 +443,7 @@ function l10n_client_import_package_form
 
   if (!count($names)) {
     // This only works if there is any foreign language set up.
-    drupal_set_message(t('No languages set up to reimport packages into.', 'warning'));
+    drupal_set_message(t('No languages set up to reimport packages into.'), 'warning');
     return array();
   }
   
Index: l10n_client.js
===================================================================
--- l10n_client.js	2009-07-14 20:02:54.000000000 +0200
+++ l10n_client.js	2010-01-17 12:55:05.000000000 +0100
@@ -104,7 +104,7 @@ Drupal.behaviors.l10nClient = function (
 
     $('#l10n-client-string-editor .source-text').text(Drupal.l10nClient.getString(index, 'source'));
     $('#l10n-client-form #edit-target').val(Drupal.l10nClient.getString(index, 'target'));
-
+    $('#l10n-client-form #edit-textgroup').val(Drupal.l10nClient.getString(index, 'textgroup'));
     Drupal.l10nClient.selected = index;
   });
 
@@ -152,6 +152,7 @@ Drupal.behaviors.l10nClient = function (
       data: {
         source: $('#l10n-client-string-editor .source-text').text(),
         target: $('#l10n-client-form #edit-target').val(),
+        textgroup: $('#l10n-client-form #edit-textgroup').val(),
         'form_token': $('#l10n-client-form #edit-l10n-client-form-form-token').val()
       },
       success: function (data) {