From 0b338e2f58234ced875488ae3c9aeb1d2c245bdf Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 20 Jan 2017 06:00:42 +0000
Subject: [PATCH] Customize: Remove redundant context for "Reorder" and "Done"
 strings in nav menu and widget area controls to ensure consistent
 translations.

Props pavelevap, Presskopp.
Fixes #33747.
Built from https://develop.svn.wordpress.org/trunk@39927


git-svn-id: http://core.svn.wordpress.org/trunk@39864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/customize/class-wp-customize-nav-menu-control.php | 4 ++--
 .../customize/class-wp-widget-area-customize-control.php      | 4 ++--
 wp-includes/version.php                                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-includes/customize/class-wp-customize-nav-menu-control.php b/wp-includes/customize/class-wp-customize-nav-menu-control.php
index 6b00a91560..1431e3a49f 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-control.php
@@ -52,8 +52,8 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 			<?php _e( 'Add Items' ); ?>
 		</button>
 		<button type="button" class="button-link reorder-toggle" aria-label="<?php esc_attr_e( 'Reorder menu items' ); ?>" aria-describedby="reorder-items-desc-{{ data.menu_id }}">
-			<span class="reorder"><?php _ex( 'Reorder', 'Reorder menu items in Customizer' ); ?></span>
-			<span class="reorder-done"><?php _ex( 'Done', 'Cancel reordering menu items in Customizer' ); ?></span>
+			<span class="reorder"><?php _e( 'Reorder' ); ?></span>
+			<span class="reorder-done"><?php _e( 'Done' ); ?></span>
 		</button>
 		<p class="screen-reader-text" id="reorder-items-desc-{{ data.menu_id }}"><?php _e( 'When in reorder mode, additional controls to reorder menu items will be available in the items list above.' ); ?></p>
 		<span class="menu-delete-item">
diff --git a/wp-includes/customize/class-wp-widget-area-customize-control.php b/wp-includes/customize/class-wp-widget-area-customize-control.php
index 8f76169c9e..e4e68b403c 100644
--- a/wp-includes/customize/class-wp-widget-area-customize-control.php
+++ b/wp-includes/customize/class-wp-widget-area-customize-control.php
@@ -61,8 +61,8 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 			<?php _e( 'Add a Widget' ); ?>
 		</button>
 		<button type="button" class="button-link reorder-toggle" aria-label="<?php esc_attr_e( 'Reorder widgets' ); ?>" aria-describedby="<?php echo esc_attr( $id ); ?>">
-			<span class="reorder"><?php _ex( 'Reorder', 'Reorder widgets in Customizer' ); ?></span>
-			<span class="reorder-done"><?php _ex( 'Done', 'Cancel reordering widgets in Customizer' ); ?></span>
+			<span class="reorder"><?php _e( 'Reorder' ); ?></span>
+			<span class="reorder-done"><?php _e( 'Done' ); ?></span>
 		</button>
 		<p class="screen-reader-text" id="<?php echo esc_attr( $id ); ?>"><?php _e( 'When in reorder mode, additional controls to reorder widgets will be available in the widgets list above.' ); ?></p>
 		<?php
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b9f20a08e3..8d3d14c61a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-39926';
+$wp_version = '4.8-alpha-39927';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.