From f2d0e69030e1e8258ac3988bfa87d250abf09c4f Mon Sep 17 00:00:00 2001
From: jrf <jrf@git.wordpress.org>
Date: Thu, 30 Aug 2018 12:36:24 +0000
Subject: [PATCH] I18n: Improve translators comments [2].

* Add missing translators comments.
* Fix placement of some translators comments.
  Translators comments should be on the line directly above the line containing the translation function call for optimal compatibility with various `.pot` file generation tools.
  The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translators comments.

Patch `44360.wp-includes_customize.3.patch` of the series.

Props marcomartins, mihaiiceyro, michielatyoast
See #44360

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


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

diff --git a/wp-includes/customize/class-wp-customize-header-image-control.php b/wp-includes/customize/class-wp-customize-header-image-control.php
index f8ca8fe21f..ae7eac7d8c 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -182,20 +182,20 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 				if ( current_theme_supports( 'custom-header', 'video' ) ) {
 					_e( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image that matches the size of your video &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' );
 				} elseif ( $width && $height ) {
-					/* translators: %s: header size in pixels */
 					printf(
+						/* translators: %s: header size in pixels */
 						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header size of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s &times; %s</strong>', $width, $height )
 					);
 				} elseif ( $width ) {
-					/* translators: %s: header width in pixels */
 					printf(
+						/* translators: %s: header width in pixels */
 						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header width of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s</strong>', $width )
 					);
 				} else {
-					/* translators: %s: header height in pixels */
 					printf(
+						/* translators: %s: header height in pixels */
 						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header height of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s</strong>', $height )
 					);
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php b/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
index f6474f6511..7102a9cb32 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
@@ -74,8 +74,8 @@ class WP_Customize_Nav_Menu_Locations_Control extends WP_Customize_Control {
 								<?php echo $description; ?>
 								<span class="theme-location-set">
 									<?php
-									/* translators: %s: menu name */
 									printf(
+										/* translators: %s: menu name */
 										_x( '(Current: %s)', 'menu location' ),
 										'<span class="current-menu-location-name-' . esc_attr( $location ) . '"></span>'
 									);
diff --git a/wp-includes/customize/class-wp-customize-themes-section.php b/wp-includes/customize/class-wp-customize-themes-section.php
index 1af0b1a1a2..b112552e23 100644
--- a/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/wp-includes/customize/class-wp-customize-themes-section.php
@@ -87,8 +87,8 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 					<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 					<p class="no-themes-local">
 						<?php
-						/* translators: %s: "Search WordPress.org themes" button */
 						printf(
+							/* translators: %s: "Search WordPress.org themes" button text */
 							__( 'No themes found. Try a different search, or %s.' ),
 							sprintf( '<button type="button" class="button-link search-dotorg-themes">%s</button>', __( 'Search WordPress.org themes' ) )
 						);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3548a980ef..6d0f8a8c79 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-43595';
+$wp_version = '5.0-alpha-43596';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.