From c1ede533740aea5d86bee617ecb958098ddb68c8 Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Tue, 10 Oct 2017 21:04:49 +0000
Subject: [PATCH] Customize: Fix string translations for singular vs plural
 after [41812].

Props felipeelia, tobifjellner, SergeyBiryukov.
See #42112.
Fixes #42170.

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


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

diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 6c2a98b835..edad3fc694 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -414,7 +414,7 @@ final class WP_Customize_Nav_Menus {
 				'page_label'             => get_post_type_object( 'page' )->labels->singular_name,
 				/* translators: %s:      menu location */
 				'menuLocation'           => _x( '(Currently set to: %s)', 'menu' ),
-				'locationsTitle'         => _n( 'Menu Location', 'Menu Locations', $num_locations ),
+				'locationsTitle'         => 1 === $num_locations ? __( 'Menu Location' ) : __( 'Menu Locations' ),
 				'locationsDescription'   => $locations_description,
 				'menuNameLabel'          => __( 'Menu Name' ),
 				'newMenuNameDescription' => __( 'If your theme has multiple menus, giving them clear names will help you manage them.' ),
@@ -584,10 +584,10 @@ final class WP_Customize_Nav_Menus {
 		}
 
 		$this->manager->add_section( 'menu_locations', array(
-			'title'       => _nx( 'View Location', 'View All Locations', $num_locations, 'menu locations' ),
+			'title'       => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
 			'panel'       => 'nav_menus',
 			'priority'    => 30,
-			'description' => $description
+			'description' => $description,
 		) );
 
 		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6dc2c91e01..ab82e02fec 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-beta1-41815';
+$wp_version = '4.9-beta1-41816';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.