Index: wp-includes/l10n.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/l10n.php	(revision 5cd5252964c99595dd76adc271b31ce744a74dac)
+++ wp-includes/l10n.php	(revision )
@@ -674,12 +674,12 @@
 		$path = get_template_directory();
 
 	// Load the textdomain according to the theme
-	$mofile = untrailingslashit( $path ) . "/{$locale}.mo";
+	$mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
 	if ( $loaded = load_textdomain( $domain, $mofile ) )
 		return $loaded;
 
 	// Otherwise, load from the languages directory
-	$mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
+	$mofile = untrailingslashit( $path ) . "/{$locale}.mo";
 	return load_textdomain( $domain, $mofile );
 }