Index: core_translation.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/core_translation/core_translation.inc,v
retrieving revision 1.1
diff -u -r1.1 core_translation.inc
--- core_translation.inc	3 Nov 2008 01:01:59 -0000	1.1
+++ core_translation.inc	10 Jun 2009 13:55:53 -0000
@@ -209,7 +209,7 @@
  * files and be able to import in smaller chunks.
  */
 function _core_translation_scan_directory($files, $langcode, $component) {
-  return array_merge($files, file_scan_directory(_core_translation_get_directory($component->type, $component->name, $langcode), '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, FALSE));
+  return array_merge($files, file_scan_directory(_core_translation_get_directory($component->type, $component->name, $langcode), '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, TRUE));
 }
 
 function _core_translation_get_directory($type, $name, $langcode) {
@@ -244,8 +244,9 @@
       // install root.
       "",
     );
+    // We look in all module's subfolders, not only in 'translations' so we can find files in 'includes' or submodules
     foreach ($directories as $directory) {
-      $directory .= "$trans/$langcode/$dir/$name/$trans";
+      $directory .= "$trans/$langcode/$dir/$name";
       if (file_exists($directory)) {
         $directories[$type][$name] = $directory;
         break;