Index: wp-admin/setup-config.php
===================================================================
--- wp-admin/setup-config.php	(revision 35466)
+++ wp-admin/setup-config.php	(working copy)
@@ -139,9 +139,9 @@
 	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
 <p>
-	<?php _e( 'We&#8217;re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
-	<strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
-	<?php _e( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
+	<?php printf( __( 'We&#8217;re going to use this information to create a %s file.' ), '<code>wp-config.php</code>' ); ?>
+	<strong><?php printf( __( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s." ), '<code>wp-config-sample.php</code>', '<code>wp-config.php</code>' ); ?></strong>
+	<?php printf( __( "Need more help? <a href='%s'>We got it</a>." ), __( 'https://codex.wordpress.org/Editing_wp-config.php' ) ); ?>
 </p>
 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you don&#8217;t have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
 
@@ -176,7 +176,7 @@
 		<tr>
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
-			<td><?php _e( 'You should be able to get this info from your web host, if <code>localhost</code> doesn&#8217;t work.' ); ?></td>
+			<td><?php printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ), '<code>localhost</code>' ); ?></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
@@ -307,8 +307,8 @@
 	if ( ! is_writable(ABSPATH) ) :
 		setup_config_display_header();
 ?>
-<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
-<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
+<p><?php printf( __( "Sorry, but I can&#8217;t write the %s file." ), '<code>wp-config.php</code>' ); ?></p>
+<p><?php printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' ); ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
 		foreach ( $config_file as $line ) {
 			echo htmlentities($line, ENT_COMPAT, 'UTF-8');