From 3566ac11fb41fae8beafc76974f8d1efba85cf0e Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 11 Apr 2015 21:40:26 +0000
Subject: [PATCH] Explain all placeholders in translator comment, not just the
 first one.

see [32110], #31675.
Built from https://develop.svn.wordpress.org/trunk@32111


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

diff --git a/wp-includes/version.php b/wp-includes/version.php
index b034b43ee6..1cdf0589ce 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32110';
+$wp_version = '4.2-beta4-32111';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 67282a9b3c..319798ed76 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -819,8 +819,8 @@ function register_sidebar($args = array()) {
 	$sidebar = wp_parse_args( $args, $defaults );
 
 	if ( $id_is_empty ) {
-		/* translators: %1$s: the id argument */
-		_doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to  "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
+		/* translators: %1$s: the id argument, %2$s: sidebar name, %3$s: recommended id value  */
+		_doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
 	}
 
 	$wp_registered_sidebars[$sidebar['id']] = $sidebar;