Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.623
diff -u -p -r1.623 theme.inc
--- includes/theme.inc	20 Nov 2010 04:03:51 -0000	1.623
+++ includes/theme.inc	21 Nov 2010 23:44:18 -0000
@@ -1256,15 +1256,8 @@ function theme_enable($theme_list) {
   menu_rebuild();
   drupal_theme_rebuild();
 
-  // Notify locale module about new themes being enabled, so translations can
-  // be imported. This might start a batch, and only return to the redirect
-  // path after that.
-  module_invoke('locale', 'system_update', $theme_list);
-
-  // Invoke hook_themes_enabled after the themes have been enabled.
+  // Invoke hook_themes_enabled() after the themes have been enabled.
   module_invoke_all('themes_enabled', $theme_list);
-
-  return;
 }
 
 /**
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.307
diff -u -p -r1.307 locale.module
--- modules/locale/locale.module	21 Nov 2010 07:02:46 -0000	1.307
+++ modules/locale/locale.module	21 Nov 2010 23:44:18 -0000
@@ -773,7 +773,24 @@ function locale_language_list($field = '
 }
 
 /**
- * Imports translations when new modules or themes are installed or enabled.
+ * Implements hook_modules_installed().
+ */
+function locale_modules_installed($modules) {
+  locale_system_update($modules);
+}
+
+/**
+ * Implements hook_themes_enabled().
+ *
+ * @todo This is technically wrong. We must not import upon enabling, but upon
+ *   initial installation.
+ */
+function locale_themes_enabled($themes) {
+  locale_system_update($themes);
+}
+
+/**
+ * Imports translations when new modules or themes are installed.
  *
  * This function will either import translation for the component change
  * right away, or start a batch if more files need to be imported.
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.325
diff -u -p -r1.325 system.admin.inc
--- modules/system/system.admin.inc	20 Nov 2010 03:34:30 -0000	1.325
+++ modules/system/system.admin.inc	21 Nov 2010 23:45:50 -0000
@@ -1182,11 +1182,6 @@ function system_modules_submit($form, &$
   }
 
   $form_state['redirect'] = 'admin/modules';
-
-  // Notify locale module about module changes, so translations can be
-  // imported. This might start a batch, and only return to the redirect
-  // path after that.
-  module_invoke('locale', 'system_update', $actions['install']);
 }
 
 /**