Ticket #44360: 44360-src.diff

src/wp-admin/update.php

@@ -269 +269 @@
 
                 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
+                /* translators: %s: file name */
                 $title = sprintf( __( 'Installing Theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );
                 $nonce = 'theme-upload';
                 $url   = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-theme' );

src/wp-login.php

@@ -937 +937 @@
 
                 if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
                         if ( headers_sent() ) {
-                                /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
                                 $user = new WP_Error(
                                         'test_cookie', sprintf(
+                                                /* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
                                                 __( '<strong>ERROR</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
                                                 __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' )
                                         )
                                 );
                         } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
                                 // If cookies are disabled we can't log in even with a valid user+pass
-                                /* translators: %s: Browser cookie documentation URL */
                                 $user = new WP_Error(
                                         'test_cookie', sprintf(
+                                                /* translators: %s: Browser cookie documentation URL */
                                                 __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
                                                 __( 'https://codex.wordpress.org/Cookies' )
                                         )

src/wp-signup.php

@@ -323 +323 @@
         $blog_title = $filtered_results['blog_title'];
         $errors     = $filtered_results['errors'];
 
+        /* translators: %s: Network's site name. */
         echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
 
         if ( $errors->has_errors() ) {
                 echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
         }
         ?>
-        <p><?php printf( __( '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>
+        <p><?php
+                /* translators: %s: Current user's display name. */
+                printf( __( '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
         $blogs = get_blogs_of_user( $current_user->ID );
@@ -955 +958 @@
                                 $newblog = get_blogaddress_by_name( $newblogname );
 
                                 if ( $active_signup == 'blog' || $active_signup == 'all' ) {
-                                        /* translators: %s: site address */
                                         printf(
+                                                /* translators: %s: site address */
                                                 '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
                                                 '<strong>' . $newblog . '</strong>'
                                         );
-                                } else {                  /* translators: %s: site address */
+                                } else {
                                         printf(
+                                                /* translators: %s: site address */
                                                 '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
                                                 '<strong>' . $newblog . '</strong>'
                                         );