From 82034319e14eef3bd4569f9db78a0161667bd701 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 26 Jul 2015 22:48:26 +0000
Subject: [PATCH] Merge duplicate strings related to Trash.

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


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

diff --git a/wp-admin/post.php b/wp-admin/post.php
index 08b0232410..bc71c44b53 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -278,7 +278,7 @@ case 'untrash':
 		wp_die( __( 'Unknown post type.' ) );
 
 	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+		wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
 
 	if ( ! wp_untrash_post( $post_id ) )
 		wp_die( __( 'Error in restoring from Trash.' ) );
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 9db7fc0514..e7fedc68ad 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -129,7 +129,7 @@ if ( $doaction ) {
 					wp_die( __( 'You are not allowed to move this post to the trash.' ) );
 
 				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to trash.' ) );
+					wp_die( __( 'Error in moving to Trash.' ) );
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
@@ -141,7 +141,7 @@ if ( $doaction ) {
 					wp_die( __( 'You are not allowed to move this post out of the trash.' ) );
 
 				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from trash.' ) );
+					wp_die( __( 'Error in restoring from Trash.' ) );
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 78c19658b2..84a79798a8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33430';
+$wp_version = '4.3-beta4-33431';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.