Index: i18nblocks/i18nblocks.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18nblocks/i18nblocks.module,v
retrieving revision 1.7.2.12
diff -u -p -r1.7.2.12 i18nblocks.module
--- i18nblocks/i18nblocks.module	16 Nov 2008 13:37:11 -0000	1.7.2.12
+++ i18nblocks/i18nblocks.module	14 Jan 2009 14:13:00 -0000
@@ -96,6 +96,28 @@ function i18nblocks_locale($op = 'groups
 }
 
 /**
+ * Implementation of hook_form_FORM_ID_alter().
+ */
+function i18nblocks_form_block_box_delete_alter(&$form, $form_state) {
+  $delta = db_result(db_query('SELECT ibid FROM i18n_blocks WHERE delta = %d', arg(4)));
+  $form['delta'] = array(
+    '#type' => 'value',
+    '#value' => $delta,
+  );
+  $form['#submit'][] = 'i18nblocks_block_delete_submit';
+}
+
+/**
+ * Remove strings for deleted custom blocks.
+ */
+function i18nblocks_block_delete_submit(&$form, $form_state) {
+  $delta = $form_state['values']['delta'];
+  // Delete stored strings for the title and content fields.
+  i18nstrings_remove_string("blocks:block:$delta:title");
+  i18nstrings_remove_string("blocks:block:$delta:content");
+}
+
+/**
  * Implementation of block form_alter().
  *
  * Remove block title for multilingual blocks.
@@ -342,4 +364,4 @@ function _i18nblocks_list($langcode = ''
     }
   }
   return $list[$index];
-}
\ No newline at end of file
+}
Index: i18nstrings/i18nstrings.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18nstrings/i18nstrings.module,v
retrieving revision 1.8.2.28
diff -u -p -r1.8.2.28 i18nstrings.module
--- i18nstrings/i18nstrings.module	11 Jan 2009 17:12:26 -0000	1.8.2.28
+++ i18nstrings/i18nstrings.module	14 Jan 2009 14:13:01 -0000
@@ -440,6 +440,7 @@ function i18nstrings_get_string($context
  * Remove string for a given context.
  */
 function i18nstrings_remove_string($context, $string = NULL) {
+  $context = i18nstrings_context($context, $string);
   if ($source = i18nstrings_get_source($context, $string)) {
     db_query("DELETE FROM {locales_target} WHERE lid = %d", $source->lid);
     db_query("DELETE FROM {i18n_strings} WHERE lid = %d", $source->lid);