Index: src/wp-signup.php
===================================================================
--- src/wp-signup.php	(revision 46984)
+++ src/wp-signup.php	(working copy)
@@ -344,18 +344,13 @@
 	if ( $errors->has_errors() ) {
 		echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
 	}
-	?>
-	<p>
-		<?php
-		printf(
-			/* translators: %s: Current user's display name. */
-			__( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ),
-			$current_user->display_name
-		);
-		?>
-	</p>
 
-	<?php
+	echo '<p>' . sprintf(
+		/* translators: %s: Current user's display name. */
+		__( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ),
+		$current_user->display_name
+	) . '</p>';
+
 	$blogs = get_blogs_of_user( $current_user->ID );
 	if ( ! empty( $blogs ) ) {
 		?>
@@ -515,29 +510,24 @@
 		$blog_title
 	);
 
-	?>
-	<h2>
-	<?php
+	echo '<h2>' . sprintf(
 		/* translators: %s: Site title. */
-		printf( __( 'The site %s is yours.' ), $site );
-	?>
-	</h2>
-	<p>
-		<?php
-		printf(
-			/* translators: 1: Link to new site, 2: Login URL, 3: Username. */
-			__( '%1$s is your new site. <a href="%2$s">Log in</a> as &#8220;%3$s&#8221; using your existing password.' ),
-			sprintf(
-				'<a href="%s">%s</a>',
-				esc_url( $home_url ),
-				untrailingslashit( $domain . $path )
-			),
-			esc_url( $login_url ),
-			$user_name
-		);
-		?>
-	</p>
-	<?php
+		__( 'The site %s is yours.' ),
+		$site
+	) . '</h2>';
+
+	echo '<p>' . srintf(
+		/* translators: 1: Link to new site, 2: Login URL, 3: Username. */
+		__( '%1$s is your new site. <a href="%2$s">Log in</a> as &#8220;%3$s&#8221; using your existing password.' ),
+		sprintf(
+			'<a href="%s">%s</a>',
+			esc_url( $home_url ),
+			untrailingslashit( $domain . $path )
+		),
+		esc_url( $login_url ),
+		$user_name
+	) . '</p>';
+
 	/**
 	 * Fires when the site or user sign-up process is complete.
 	 *
@@ -588,14 +578,12 @@
 	$user_email       = $filtered_results['user_email'];
 	$errors           = $filtered_results['errors'];
 
-	?>
-
-	<h2>
-	<?php
+	echo '<h2>' . sprintf(
 		/* translators: %s: Name of the network. */
-		printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
+		__( 'Get your own %s account in seconds' ),
+		get_network()->site_name
+	) . '</h2>';
 	?>
-	</h2>
 	<form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
 		<input type="hidden" name="stage" value="validate-user-signup" />
 		<?php
@@ -662,22 +650,22 @@
  * @param string $user_email The user's email address
  */
 function confirm_user_signup( $user_name, $user_email ) {
-	?>
-	<h2>
-	<?php
-	/* translators: %s: Username. */
-	printf( __( '%s is your new username' ), $user_name )
-	?>
-	</h2>
-	<p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ); ?></p>
-	<p>
-	<?php
-	/* translators: %s: Email address. */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
-	?>
-	</p>
-	<p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
-	<?php
+	echo '<h2>' . sprintf(
+		/* translators: %s: Username. */
+		__( '%s is your new username' ),
+		$user_name
+	) . '</h2>';
+
+	echo '<p>' . __( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) . '</p>';
+
+	echo '<p>' . sprintf(
+		/* translators: %s: Email address. */
+		__( 'Check your inbox at %s and click the link given.' ),
+		'<strong>' . $user_email . '</strong>'
+	) . '</p>';
+
+	echo '<p>' . __( 'If you do not activate your username within two days, you will have to sign up again.' ) . '</p>';
+
 	/** This action is documented in wp-signup.php */
 	do_action( 'signup_finished' );
 }
@@ -819,23 +807,24 @@
  * @param array $meta Any additional meta from the {@see 'add_signup_meta'} filter in validate_blog_signup()
  */
 function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
-	?>
-	<h2>
-	<?php
-	/* translators: %s: Site address. */
-	printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" )
-	?>
-	</h2>
+	echo '<h2>' . sprintf(
+		/* translators: %s: Site address. */
+		__( 'Congratulations! Your new site, %s, is almost ready.' ),
+		"<a href='http://{$domain}{$path}'>{$blog_title}</a>"
+	) . '</h2>';
 
-	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ); ?></p>
-	<p>
-	<?php
-	/* translators: %s: Email address. */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
+	echo '<p>' . __( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) . '</p>';
+
+	echo '<p>' . sprintf(
+		/* translators: %s: Email address. */
+		__( 'Check your inbox at %s and click the link given.' ),
+		'<strong>' . $user_email . '</strong>'
+	) . '</p>';
+
+	echo '<p>' . __( 'If you do not activate your site within two days, you will have to sign up again.' ) . '</p>';
+
+	echo '<h2>' . __( 'Still waiting for your email?' ) . '</h2>';
 	?>
-	</p>
-	<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
-	<h2><?php _e( 'Still waiting for your email?' ); ?></h2>
 	<p>
 		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ); ?>
 		<ul id="noemail-tips">