diff --git a/includes/file.inc b/includes/file.inc
index f1206b5131d69afeb9a3287e5b8bda5c8895897d..eec106f0fc909e8d9ec99b6dd8deeca98773bc93 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -849,7 +849,7 @@ function file_download() {
  * from being scanned.
  *
  * @param $dir
- *   The base directory for the scan.
+ *   The base directory for the scan, without trailing slash.
  * @param $mask
  *   The regular expression of the files to find.
  * @param $nomask
diff --git a/includes/locale.inc b/includes/locale.inc
index 1fc9200876b40cc0ba5f9c4e59f56e62a21b50f7..a2abfca138b1485bf45b30f4ef9ca89978d522a8 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -2411,7 +2411,7 @@ function locale_batch_by_language($langcode, $finished = '_locale_batch_installe
     // with names ending with $langcode.po. This allows for filenames
     // like node-module.de.po to let translators use small files and
     // be able to import in smaller chunks.
-    $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations/', '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, FALSE));
+    $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations', '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, FALSE));
   }
 
   return _locale_batch_build($files, $finished);
@@ -2481,7 +2481,7 @@ function locale_batch_by_component($components, $finished = '_locale_batch_syste
         // as $langcode.po or with names ending with $langcode.po. This allows
         // for filenames like node-module.de.po to let translators use small
         // files and be able to import in smaller chunks.
-        $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations/', '(^|\.)('. $language_list .')\.po$', array('.', '..', 'CVS'), 0, FALSE));
+        $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations', '(^|\.)('. $language_list .')\.po$', array('.', '..', 'CVS'), 0, FALSE));
       }
     }
     return _locale_batch_build($files, $finished);