From fee26cf741074c91649657ff3b888892b0e60b22 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 23 Aug 2016 00:17:27 +0000
Subject: [PATCH] I18N: Replace unnecessary context with a translator comment
 for `%s Sites` string in `network_step1()`.

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


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

diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php
index d04b4f9a28..fef6b66850 100644
--- a/wp-admin/includes/network.php
+++ b/wp-admin/includes/network.php
@@ -144,8 +144,18 @@ function network_step1( $errors = false ) {
 		$error_codes = $errors->get_error_codes();
 	}
 
-	$site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) );
-	$admin_email = ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) ? $_POST['email'] : get_option( 'admin_email' );
+	if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) {
+		$site_name = $_POST['sitename'];
+	} else {
+		/* translators: %s: Default network name */
+		$site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) );
+	}
+
+	if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) {
+		$admin_email = $_POST['email'];
+	} else {
+		$admin_email = get_option( 'admin_email' );
+	}
 	?>
 	<p><?php _e( 'Welcome to the Network installation process!' ); ?></p>
 	<p><?php _e( 'Fill in the information below and you&#8217;ll be on your way to creating a network of WordPress sites. We will create configuration files in the next step.' ); ?></p>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d4be552115..ac74ceb004 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38322';
+$wp_version = '4.7-alpha-38323';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.