Index: wp-signup.php
===================================================================
--- wp-signup.php	(revision 36444)
+++ wp-signup.php	(working copy)
@@ -117,7 +117,15 @@
 			$site = $current_site->domain . $current_site->path . __( 'sitename' );
 		else
 			$site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
-		echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+
+		echo '<p>(<strong>' .
+			sprintf(
+				/* translators: %s: site address */
+				__( 'Your address will be %s.' ),
+				$site
+			) . '</strong>) ' .
+			__( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) .
+			'</p>';
 	}
 
 	// Blog Title
@@ -445,18 +453,28 @@
 		$login_url = 'http://' . $domain . $path . 'wp-login.php';
 	}
 
-	$site = sprintf( '<a href="%1$s">%2$s</a>',
+	$site = sprintf(
+		'<a href="%1$s">%2$s</a>',
 		esc_url( $home_url ),
 		$blog_title
 	);
 
 	?>
-	<h2><?php printf( __( 'The site %s is yours.' ), $site ); ?></h2>
+	<h2><?php printf(
+			/* translators: %s: site name */
+			__( 'The site %s is yours.' ),
+			$site
+		);
+	?></h2>
 	<p>
 		<?php printf(
-			__( '<a href="%1$s">%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ),
-			esc_url( $home_url ),
-			untrailingslashit( $domain . $path ),
+			/* translators: %s: link to the site */
+			__( '%s is your new site.' ),
+			'<a href="' . esc_url( $home_url ) . '">' . untrailingslashit( $domain . $path ) . '</a>'
+		); ?>
+		<?php printf(
+			/* translators: 1: login url 2: user name */
+			__( '<a href="%1$s">Log in</a> as &#8220;%2$s&#8221; using your existing password.' ),
 			esc_url( $login_url ),
 			$user_name
 		); ?>
@@ -513,7 +531,11 @@
 
 	?>
 
-	<h2><?php printf( __( 'Get your own %s account in seconds' ), get_current_site()->site_name ) ?></h2>
+	<h2><?php printf(
+		/* translators: %s: site name */
+		__( 'Get your own %s account in seconds' ),
+		get_current_site()->site_name
+	); ?></h2>
 	<form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
 		<input type="hidden" name="stage" value="validate-user-signup" />
 		<?php
@@ -581,11 +603,17 @@
  */
 function confirm_user_signup($user_name, $user_email) {
 	?>
-	<h2><?php /* translators: %s: username */
-	printf( __( '%s is your new username' ), $user_name) ?></h2>
+	<h2><?php printf(
+		/* translators: %s: username */
+		__( '%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 printf(
+		/* translators: %s: email address */
+		__( '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
 	/** This action is documented in wp-signup.php */
@@ -726,20 +754,29 @@
  */
 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>
-
-	<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>' ); ?></p>
+	<h2><?php printf(
+		/* 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 printf(
+		/* translators: %s: email address */
+		__( 'Check your inbox at %s and click the link given.' ),
+		'<strong>' . $user_email . '</strong>'
+	); ?></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:' ) ?>
+		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ); ?>
 		<ul id="noemail-tips">
-			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
-			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-			<li><?php printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
+			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ); ?></strong></p></li>
+			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li>
+			<li><?php printf(
+				/* translators: %s: email address */
+				__( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ),
+				$user_email
+			); ?></li>
 		</ul>
 	</p>
 	<?php
@@ -799,7 +836,14 @@
 $i18n_signup['user'] = _x('user', 'Multisite active signup type');
 
 if ( is_super_admin() )
-	echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+	echo '<div class="mu_alert">' .
+		sprintf(
+			/* translators: 1: type of site sign-up; 2: network settings url */
+			__( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ),
+			$i18n_signup[$active_signup],
+			esc_url( network_admin_url( 'settings.php' ) )
+		) .
+		'</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
 
@@ -808,7 +852,11 @@
 	_e( 'Registration has been disabled.' );
 } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
 	$login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
-	echo sprintf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
+	echo sprintf(
+		/* translators: %s: login url */
+		__( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ),
+		$login_url
+	);
 } else {
 	$stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
 	switch ( $stage ) {
@@ -849,15 +897,19 @@
 				$newblog = get_blogaddress_by_name( $newblogname );
 
 				if ( $active_signup == 'blog' || $active_signup == 'all' )
-					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
+					echo '<p><em>' .
+					sprintf(
+						/* translators: %s: site address */
+						__( 'The site you were looking for, %s, does not exist, but you can create it now!' ),
 						'<strong>' . $newblog . '</strong>'
-					);
+					) . '</em></p>';
 				else
-					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
+					echo '<p><em>' .
+					sprintf(
+						/* translators: %s: site address */
+						__( 'The site you were looking for, %s, does not exist.' ),
 						'<strong>' . $newblog . '</strong>'
-					);
+					) . '</em></p>';
 			}
 			break;
 	}