--- C:/Documents and Settings/John/Bureau/l10n_client-6.x-1.7/l10n_client/l10n_client.js	Wed Apr 15 21:10:12 2009
+++ C:/Documents and Settings/John/Bureau/l10n_client.js	Sun Aug 16 12:09:21 2009
@@ -17,12 +17,12 @@
           if(userSelection.length > 0) {
             Drupal.l10nClient.filter(userSelection);
             Drupal.l10nClient.toggle(1);
-            $('#l10n-client #edit-search').focus();      
+            $('#l10n-client #l10n-edit-search').focus();      
           } else {
             if($('#l10n-client').is('.hidden')) {
               Drupal.l10nClient.toggle(1);
               if(!$.browser.safari) {
-                $('#l10n-client #edit-search').focus();
+                $('#l10n-client #l10n-edit-search').focus();
               }
             } else { 
               Drupal.l10nClient.toggle(0);
@@ -70,13 +70,13 @@
       if(search == false || search == '') {
         $('#l10n-client #search-filter-clear').focus();
         $('#l10n-client-string-select li').show();
-        $('#l10n-client #edit-search').val('');
-        $('#l10n-client #edit-search').focus();
+        $('#l10n-client #l10n-edit-search').val('');
+        $('#l10n-client #l10n-edit-search').focus();
       } else {
         if(search.length > 0) {
           $('#l10n-client-string-select li').hide();
           $('#l10n-client-string-select li:contains('+search+')').show();
-          $('#l10n-client #edit-search').val(search);
+          $('#l10n-client #l10n-edit-search').val(search);
         }
       }
     }
@@ -103,8 +103,9 @@
     var index = $('#l10n-client-string-select li').index(this);
 
     $('#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 #l10n-edit-target').val(Drupal.l10nClient.getString(index, 'target'));
 
+	$('#l10n-client-form #l10n-edit-textgroup').val(Drupal.l10nClient.getString(index, 'textgroup'));
     Drupal.l10nClient.selected = index;
   });
 
@@ -118,24 +119,24 @@
   });
 
   // Copy source text to translation field on button click.
-  $('#l10n-client-form #edit-copy').click(function() {
-    $('#l10n-client-form #edit-target').val($('#l10n-client-string-editor .source-text').text());
+  $('#l10n-client-form #l10n-edit-copy').click(function() {
+    $('#l10n-client-form #l10n-edit-target').val($('#l10n-client-string-editor .source-text').text());
   });
 
   // Clear translation field on button click.
-  $('#l10n-client-form #edit-clear').click(function() {
-    $('#l10n-client-form #edit-target').val('');
+  $('#l10n-client-form #l10n-edit-clear').click(function() {
+    $('#l10n-client-form #l10n-edit-target').val('');
   });
 
   // Register keybindings using jQuery hotkeys
   if($.hotkeys) {
     $.hotkeys.add(Drupal.l10nClient.keys['toggle'], function(){Drupal.l10nClient.key('toggle')});
-    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client #edit-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
+    $.hotkeys.add(Drupal.l10nClient.keys['clear'], {target:'#l10n-client #l10n-edit-search', type:'keyup'}, function(){Drupal.l10nClient.key('clear')});
   }
   
   // Custom listener for l10n_client livesearch
-  $('#l10n-client #edit-search').keyup(function(key) {
-    Drupal.l10nClient.filter($('#l10n-client #edit-search').val());
+  $('#l10n-client #l10n-edit-search').keyup(function(key) {
+    Drupal.l10nClient.filter($('#l10n-client #l10n-edit-search').val());
   });
 
   // Clear search
@@ -150,15 +151,16 @@
       url: $('#l10n-client-form').attr('action'),
       // Send source and target strings.
       data: 'source=' + Drupal.encodeURIComponent($('#l10n-client-string-editor .source-text').text()) +
-            '&target=' + Drupal.encodeURIComponent($('#l10n-client-form #edit-target').val()) +
+            '&target=' + Drupal.encodeURIComponent($('#l10n-client-form #l10n-edit-target').val()) +
+			'&textgroup=' + Drupal.encodeURIComponent($('#l10n-client-form #l10n-edit-textgroup').val()) +
             '&form_token=' + Drupal.encodeURIComponent($('#l10n-client-form #edit-l10n-client-form-form-token').val()),
       success: function (data) {
         // Store string in local js
-        Drupal.l10nClient.setString(Drupal.l10nClient.selected, $('#l10n-client-form #edit-target').val());
+        Drupal.l10nClient.setString(Drupal.l10nClient.selected, $('#l10n-client-form #l10n-edit-target').val());
 
         // Figure out the display of the new translation in the selection list.
         var newTranslationDisplay = '';
-        var newTranslation = $('#l10n-client-form #edit-target').val();
+        var newTranslation = $('#l10n-client-form #l10n-edit-target').val();
         var newTranslationStripped = newTranslation.replace(/<\/?[^<>]+>/gi, '')
                                                    .replace(/&quot;/g, '"')
                                                    .replace(/&lt;/g, "<")
@@ -181,7 +183,7 @@
 
         // Empty input fields.
         $('#l10n-client-string-editor .source-text').html('');
-        $('#l10n-client-form #edit-target').val('');
+        $('#l10n-client-form #l10n-edit-target').val('');
 
       },
       error: function (xmlhttp) {