From cb54b8d5a75b8412c48c7e498334517a27dd1b3d Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sun, 20 Sep 2015 03:04:24 +0000
Subject: [PATCH] WP Query: Avoid using HTML tags in translation strings, add
 translator strings.

Props ramiy.
Fixes #31868.

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


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

diff --git a/wp-includes/query.php b/wp-includes/query.php
index a98aeb5391..dde5b59203 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -729,8 +729,14 @@ function is_404() {
  */
 function is_main_query() {
 	if ( 'pre_get_posts' === current_filter() ) {
-		$message = sprintf( __( 'In <code>%1$s</code>, use the <code>%2$s</code> method, not the <code>%3$s</code> function. See %4$s.' ),
-			'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __( 'https://codex.wordpress.org/Function_Reference/is_main_query' ) );
+		$message = sprintf(
+			/* translators: 1: pre_get_posts 2: WP_Query::is_main_query() 3: is_main_query() 4: link to codex is_main_query() page. */
+			__( 'In %1$s, use the %2$s method, not the %3$s function. See %4$s.' ),
+			'<code>pre_get_posts</code>',
+			'<code>WP_Query::is_main_query()</code>',
+			'<code>is_main_query()</code>',
+			__( 'https://codex.wordpress.org/Function_Reference/is_main_query' )
+		);
 		_doing_it_wrong( __FUNCTION__, $message, '3.7' );
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ae40265fb6..334055f288 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34344';
+$wp_version = '4.4-alpha-34345';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.