Index: network.php
===================================================================
--- network.php	(revision 31935)
+++ network.php	(working copy)
@@ -103,7 +103,14 @@
 }
 
 if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
-	wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
+	wp_die(
+		printf(
+			/* translators: 1: WP_ALLOW_MULTISITE 2: wp-config.php */
+			__( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ),
+			'<code>WP_ALLOW_MULTISITE</code>',
+			'<code>wp-config.php</code>'
+		)
+	);
 
 if ( is_network_admin() ) {
 	$title = __( 'Network Setup' );
@@ -172,7 +179,7 @@
 	$has_ports = strstr( $hostname, ':' );
 	if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
 		echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
-		echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
+		echo '<p>' . sprintf( __( 'You cannot use port numbers such as %s.' ), '<code>'.$has_ports.'</code>' ) . '</p>';
 		echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
 		echo '</div>';
 		include( ABSPATH . 'wp-admin/admin-footer.php' );
@@ -224,17 +231,19 @@
 			<tr>
 				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
 				<td><?php printf(
-					/* translators: 1: hostname */
-					_x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
-					$hostname
+					/* translators: 1: sub-domain example 1. 2: sub-domain example 2. */
+					__( 'like %1$s and %2$s' ),
+					'<code>site1.' . $hostname . '</code>',
+					'<code>site2.' . $hostname . '</code>'
 				); ?></td>
 			</tr>
 			<tr>
 				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
 				<td><?php printf(
-					/* translators: 1: hostname */
-					_x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
-					$hostname
+					/* translators: 1: sub-directory example 1. 2: sub-directory example 2. */
+					__( 'like %1$s and %2$s' ),
+					'<code>' . $hostname . '/site1</code>',
+					'<code>' . $hostname . '/site2</code>'
 				); ?></td>
 			</tr>
 		</table>
@@ -249,12 +258,22 @@
 		if ( $is_www ) :
 		?>
 		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
-		<p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></p>
+		<p><?php printf(
+			/* translators: 1: site url 2: host name 3. www */
+			__( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
+			'<code>' . substr( $hostname, 4 ) . '</code>',
+			'<code>' . $hostname . '</code>',
+			'<code>www</code>'
+		); ?></p>
 		<table class="form-table">
 			<tr>
 				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
 				<td>
-					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
+					<?php printf(
+						/* translators: host name */
+						__( 'The internet address of your network will be %s.' ),
+						'<code>' . $hostname . '</code>'
+					); ?>
 				</td>
 			</tr>
 		</table>
@@ -294,7 +313,11 @@
 			<tr>
 				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
 				<td>
-					<?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?>
+					<?php printf(
+						/* translators: host name */
+						__( 'The internet address of your network will be %s.' ),
+						'<code>' . $hostname . '</code>'
+					); ?>
 				</td>
 			</tr>
 		<?php endif; ?>
@@ -380,17 +403,36 @@
 		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
 		<div class="updated inline"><p><?php
 			if ( file_exists( $home_path . '.htaccess' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' );
+				printf(
+					/* translators: 1: wp-config.php 2: .htaccess */
+					__( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ),
+					'<code>wp-config.php</code>',
+					'<code>.htaccess</code>'
+				);
 			elseif ( file_exists( $home_path . 'web.config' ) )
-				printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' );
+				printf(
+					/* translators: 1: wp-config.php 2: web.config */
+					__( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ),
+					'<code>wp-config.php</code>',
+					'<code>web.config</code>'
+				);
 			else
-				_e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' );
+				printf(
+					/* translators: 1: wp-config.php */
+					__( '<strong>Caution:</strong> We recommend you back up your existing %s file.' ),
+					'<code>wp-config.php</code>'
+				);
 		?></p></div>
 <?php
 	}
 ?>
 		<ol>
-			<li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p>
+			<li><p><?php printf(
+				/* translators: 1: wp-config.php 2: location of wp-config file */
+				__( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ),
+				'<code>wp-config.php</code>',
+				'<code>' . $location_of_wp_config . '</code>'
+			); ?></p>
 				<textarea class="code" readonly="readonly" cols="100" rows="7">
 define('MULTISITE', true);
 define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
@@ -424,9 +466,17 @@
 	<p>
 		<?php
 			if ( 1 == $num_keys_salts ) {
-				_e( 'This unique authentication key is also missing from your <code>wp-config.php</code> file.' );
+				printf(
+					/* translators: 1: wp-config.php */
+					__( 'This unique authentication key is also missing from your %s file.' );
+					'<code>wp-config.php</code>',
+				);
 			} else {
-				_e( 'These unique authentication keys are also missing from your <code>wp-config.php</code> file.' );
+				printf(
+					/* translators: 1: wp-config.php */
+					__( 'These unique authentication keys are also missing from your %s file.' );
+					'<code>wp-config.php</code>',
+				);
 			}
 		?>
 		<?php _e( 'To make your installation more secure, you should also add:' ); ?>
@@ -491,9 +541,12 @@
 ';
 
 		echo '<li><p>';
-		/* translators: 1: a filename like .htaccess. 2: a file path. */
-		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<code>web.config</code>', '<code>' . $home_path . '</code>' );
+		printf(
+			/* translators: 1: a filename like .htaccess. 2: a file path. */
+			__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+			'<code>web.config</code>',
+			'<code>' . $home_path . '</code>'
+		);
 		echo '</p>';
 		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
 			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
@@ -528,9 +581,12 @@
 EOF;
 
 		echo '<li><p>';
-		/* translators: 1: a filename like .htaccess. 2: a file path. */
-		printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<code>.htaccess</code>', '<code>' . $home_path . '</code>' );
+		printf(
+			/* translators: 1: a filename like .htaccess. 2: a file path. */
+			__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+			'<code>.htaccess</code>',
+			'<code>' . $home_path . '</code>'
+		);
 		echo '</p>';
 		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
 			echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';