From 3cd78105dd5243ab94c138d36e8890f4c4c1b745 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 29 Feb 2016 03:17:26 +0000
Subject: [PATCH] I18N: Remove `<code>` tags from translatable string in
 `wp-admin/network/site-new.php`.

Props ramiy.
Fixes #35994.
Built from https://develop.svn.wordpress.org/trunk@36773


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

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 55137e245d..dd17201e4c 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -129,7 +129,14 @@ function ms_subdomain_constants() {
 	}
 
 	if ( $subdomain_error ) {
-		$vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
+		$vhost_deprecated = sprintf(
+			/* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
+			__( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+			'<code>VHOST</code>',
+			'<code>SUBDOMAIN_INSTALL</code>',
+			'<code>wp-config.php</code>',
+			'<code>is_subdomain_install()</code>'
+		);
 		if ( $subdomain_error_warn ) {
 			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
 		} else {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index abd1e5c289..dfd23597ad 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-beta1-36772';
+$wp_version = '4.5-beta1-36773';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.