From af4cda27ccd6ff27aa14cf12264c13a0295f3c7d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 3 Oct 2017 15:11:48 +0000
Subject: [PATCH] Posts, Post Types: Simplify the wording in post locking
 notice.

Props munyagu.
Fixes #42023.
Built from https://develop.svn.wordpress.org/trunk@41706


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

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index febe05afaf..908b80c333 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -1595,9 +1595,13 @@ function _admin_notice_post_locked() {
 		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			if ( $override ) {
+				/* translators: %s: user's display name */
+				printf( __( '%s is already editing this post. Do you want to take over?' ), esc_html( $user->display_name ) );
+			} else {
+				/* translators: %s: user's display name */
+				printf( __( '%s is already editing this post.' ), esc_html( $user->display_name ) );
+			}
 		?>
 		</p>
 		<?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 00e96bba73..40fee6b1fa 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41705';
+$wp_version = '4.9-alpha-41706';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.