diff --git src/wp-includes/l10n.php src/wp-includes/l10n.php
index c017952..8cf0aef 100644
--- src/wp-includes/l10n.php
+++ src/wp-includes/l10n.php
@@ -681,14 +681,16 @@ function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path
 		$path = WP_PLUGIN_DIR;
 	}
 
-	// Load the textdomain according to the plugin first
+	/*
+	 * Load the plugin textdomain.
+	 *
+	 * Load from the languages directory first,
+	 * otherwise, load the textdomain according to the plugin.
+	 */
 	$mofile = $domain . '-' . $locale . '.mo';
-	if ( $loaded = load_textdomain( $domain, $path . '/'. $mofile ) )
-		return $loaded;
+	$loaded = load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile );
 
-	// Otherwise, load from the languages directory
-	$mofile = WP_LANG_DIR . '/plugins/' . $mofile;
-	return load_textdomain( $domain, $mofile );
+	return ( $loaded ) ? $loaded : load_textdomain( $domain, $path . '/' . $mofile );
 }
 
 /**
@@ -743,17 +745,20 @@ function load_theme_textdomain( $domain, $path = false ) {
 	 */
 	$locale = apply_filters( 'theme_locale', $locale, $domain );
 
-	if ( ! $path )
+	if ( ! $path ) {
 		$path = get_template_directory();
+	}
 
-	// Load the textdomain according to the theme
-	$mofile = untrailingslashit( $path ) . "/{$locale}.mo";
-	if ( $loaded = load_textdomain( $domain, $mofile ) )
-		return $loaded;
+	/*
+	 * Load the theme textdomain.
+	 *
+	 * Load from the languages directory first,
+	 * otherwise, load the textdomain according to the theme.
+	 */
+	$mofile = $domain . '-' . $locale . '.mo';
+	$loaded = load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile );
 
-	// Otherwise, load from the languages directory
-	$mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
-	return load_textdomain( $domain, $mofile );
+	return ( $loaded ) ? $loaded : load_textdomain( $domain, $path . '/' . $mofile );
 }
 
 /**