Ticket #42161: 42161.2.patch

wp-admin/setup-config.php

@@ -46 +46 @@
 elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
         $config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
 else
-        wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file to your WordPress installation.' ) );
+        wp_die( sprintf(
+                /* translators: %s: wp-config-sample.php */
+                __( 'The %s file is needed to work from. Please re-upload this file to your WordPress installation.' ),
+                '<code>wp-config-sample.php</code>'
+        ) );
 
 // Check if wp-config.php has been created
 if ( file_exists( ABSPATH . 'wp-config.php' ) )
         wp_die( '<p>' . sprintf(
-                        /* translators: %s: install.php */
-                        __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+                        /* translators: 1: wp-config.php 2: install.php */
+                        __( 'The %1$s file already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
+                        '<code>wp-config.php</code>',
                         'install.php'
                 ) . '</p>'
         );
@@ -60 +65 @@
 // Check if wp-config.php exists above the root directory but is not part of another installation
 if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
         wp_die( '<p>' . sprintf(
-                        /* translators: %s: install.php */
-                        __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ),
+                        /* translators: 1: wp-config.php 2: install.php */
+                        __( 'The %1$s file already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
+                        '<code>wp-config.php</code>',
                         'install.php'
                 ) . '</p>'
         );
@@ -357 +363 @@
 ?>
 <p><?php
         /* translators: %s: wp-config.php */
-        printf( __( 'Sorry, but I can&#8217;t write the %s file.' ), '<code>wp-config.php</code>' );
+        printf( __( 'The %s file cannot be written.' ), '<code>wp-config.php</code>' );
 ?></p>
 <p><?php
         /* translators: %s: wp-config.php */
-        printf( __( 'You can create the %s manually and paste the following text into it.' ), '<code>wp-config.php</code>' );
+        printf( __( 'You can create the %s file 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 ) {