From 6b71b2304b6cb5e7380aa374d2e47289a68a6b20 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 3 Oct 2015 13:57:27 +0000
Subject: [PATCH] Merge some strings in `wp-admin/upload.php` with existing
 strings with the same meaning.

Props pavelevap.
Fixes #31727.
Built from https://develop.svn.wordpress.org/trunk@34797


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

diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 66ec318a43..72c11ceced 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -128,7 +128,7 @@ if ( $doaction ) {
 				break;
 			foreach ( (array) $post_ids as $post_id ) {
 				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post to the trash.' ) );
+					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
 
 				if ( !wp_trash_post( $post_id ) )
 					wp_die( __( 'Error in moving to Trash.' ) );
@@ -140,7 +140,7 @@ if ( $doaction ) {
 				break;
 			foreach ( (array) $post_ids as $post_id ) {
 				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
+					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
 
 				if ( !wp_untrash_post( $post_id ) )
 					wp_die( __( 'Error in restoring from Trash.' ) );
@@ -152,7 +152,7 @@ if ( $doaction ) {
 				break;
 			foreach ( (array) $post_ids as $post_id_del ) {
 				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this post.' ) );
+					wp_die( __( 'You are not allowed to delete this item.' ) );
 
 				if ( !wp_delete_attachment( $post_id_del ) )
 					wp_die( __( 'Error in deleting.' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d3ffe772d4..0b7fdc73be 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34796';
+$wp_version = '4.4-alpha-34797';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.