From 6485e5e3cf3828757c924b0c67991ffa459c0489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Wed, 2 Nov 2016 22:11:31 +0000
Subject: [PATCH] Menus: Use a label of "Display location" for individual nav
 menu settings.

While "Menu/Theme locations" was descriptive of what the choices listed were, in the context of editing an individual nav menu it is more descriptive to use a setting label that tells you what it is you are affecting for that nav menu, which is where it will be displayed. Technically multiple locations can be chosen, but in practice that appears to be rare enough that we can avoid an awkward "location(s)" type string.

props Fencer04 for the initial patch.
fixes #38525.

Built from https://develop.svn.wordpress.org/trunk@39098


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

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 9ca69e244e..a00eb885de 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -808,7 +808,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 								<?php if ( current_theme_supports( 'menus' ) ) : ?>
 
 									<fieldset class="menu-settings-group menu-theme-locations">
-										<legend class="menu-settings-group-name howto"><?php _e( 'Theme locations' ); ?></legend>
+										<legend class="menu-settings-group-name howto"><?php _e( 'Display location' ); ?></legend>
 										<?php foreach ( $locations as $location => $description ) : ?>
 										<div class="menu-settings-input checkbox-input">
 											<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
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 64292a73e7..6b00a91560 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-control.php
@@ -64,7 +64,7 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 		<?php if ( current_theme_supports( 'menus' ) ) : ?>
 		<ul class="menu-settings">
 			<li class="customize-control">
-				<span class="customize-control-title"><?php _e( 'Menu Locations' ); ?></span>
+				<span class="customize-control-title"><?php _e( 'Display Location' ); ?></span>
 			</li>
 
 			<?php foreach ( get_registered_nav_menus() as $location => $description ) : ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6383ba72bc..196c56d330 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta1-39097';
+$wp_version = '4.7-beta1-39098';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.