From 8fe9d04bf9e55f331861b68735838afa77ecabe5 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Sat, 20 Jun 2015 18:33:26 +0000
Subject: [PATCH] Customizer: Replace wrong usage of `_x()` with translator
 comments.

see #32576.
Built from https://develop.svn.wordpress.org/trunk@32887


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

diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 19832f554e..ca54403f15 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -271,8 +271,9 @@ final class WP_Customize_Nav_Menus {
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
 				'untitled'          => _x( '(no label)', 'Missing menu item navigation label.' ),
-				'custom_label'      => _x( 'Custom Link', 'Custom menu item type label.' ),
-				'menuLocation'      => _x( '(Currently set to: %s)', 'Current menu location.' ),
+				'custom_label'      => __( 'Custom Link' ),
+				/* translators: %s: Current menu location */
+				'menuLocation'      => __( '(Currently set to: %s)' ),
 				'deleteWarn'        => __( 'You are about to permanently delete this menu. "Cancel" to stop, "OK" to delete.' ),
 				'itemAdded'         => __( 'Menu item added' ),
 				'itemDeleted'       => __( 'Menu item deleted' ),
@@ -282,8 +283,11 @@ final class WP_Customize_Nav_Menus {
 				'movedDown'         => __( 'Menu item moved down' ),
 				'movedLeft'         => __( 'Menu item moved out of submenu' ),
 				'movedRight'        => __( 'Menu item is now a sub-item' ),
-				'customizingMenus'  => _x( 'Customizing &#9656; Menus', '&#9656 is the unicode right-pointing triangle' ),
+				/* translators: %s: &#9656 is the unicode right-pointing triangle */
+				'customizingMenus'  => __( 'Customizing &#9656; Menus' ),
+				/* translators: %s: title of menu item which is invalid */
 				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				/* translators: %s: title of menu item in draft status */
 				'pendingTitleTpl'   => __( '%s (Pending)' ),
 				'taxonomyTermLabel' => __( 'Taxonomy' ),
 				'postTypeLabel'     => __( 'Post Type' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6092f9916c..841a504a4a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32886';
+$wp_version = '4.3-alpha-32887';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.