From 6a297b848afa62166ffb68ca29cf9a5b2ba3b3b5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 1 Apr 2015 11:37:26 +0000
Subject: [PATCH] After [31941], use the decoupled strings from
 `WP_Customize_Manager::register_controls()` on the Menus screen.

see #28502.
Built from https://develop.svn.wordpress.org/trunk@31951


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

diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index 8878a723bd..1b23358c3c 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -562,7 +562,11 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<?php
 	if ( $locations_screen ) :
-		echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu you would like to use.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+		if ( 1 == $num_locations ) {
+			echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+		} else {
+			echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+		}
 	?>
 	<div id="menu-locations-wrap">
 		<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4400ca368e..b4e91f60c5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31950';
+$wp_version = '4.2-beta3-31951';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.