From 32b5726fd4e372ff5a240499d24213187b300dd9 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 1 Sep 2015 13:46:24 +0000
Subject: [PATCH] Merge two similar strings.

props pavelevap.
fixes #33643.
Built from https://develop.svn.wordpress.org/trunk@33842


git-svn-id: http://core.svn.wordpress.org/trunk@33810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/async-upload.php | 2 +-
 wp-includes/version.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 47cae15fb9..9b668238f5 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -89,7 +89,7 @@ $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {
 	echo '<div class="error-div error">
 	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload due to an error'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
+	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
 	esc_html($id->get_error_message()) . '</div>';
 	exit;
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a303151df8..892f022fa2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33841';
+$wp_version = '4.4-alpha-33842';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.