Ticket #46920: 46920.2.patch

wp-admin/includes/class-wp-automatic-updater.php

@@ -648 +648 @@
 
                 switch ( $type ) {
                         case 'success': // We updated.
-                                /* translators: 1: Site name, 2: WordPress version number. */
+                                /* translators: Site updated notification email subject. 1: Site name, 2: WordPress version number. */
                                 $subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
                                 break;
 
                         case 'fail':   // We tried to update but couldn't.
                         case 'manual': // We can't update (and made no attempt).
-                                /* translators: 1: Site name, 2: WordPress version number. */
+                                /* translators: Updated available notification email subject. 1: Site name, 2: WordPress version number. */
                                 $subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
                                 break;
 
                         case 'critical': // We tried to update, started to copy files, then things went wrong.
-                                /* translators: 1: Site name. */
+                                /* translators: Site down notification email subject. 1: Site name. */
                                 $subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
                                 break;
 
@@ -911 +911 @@
                         );
                         $body[] = '';
 
-                        /* translators: Background update failed notification email subject. %s: site title */
+                        /* translators: Background update failed notification email subject. %s: Site name */
                         $subject = sprintf( __( '[%s] Background Update Failed' ), $site_title );
                 } else {
-                        /* translators: Background update finished notification email subject. %s: site title */
+                        /* translators: Background update finished notification email subject. %s: Site name */
                         $subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
                 }
 

wp-admin/includes/file.php

@@ -2423 +2423 @@
         $mail_success = wp_mail(
                 $email_address,
                 sprintf(
+                        /* translators: Personal data export notification email subject. %s: Site name */
                         __( '[%s] Personal Data Export' ),
                         $site_name
                 ),

wp-admin/includes/misc.php

@@ -1289 +1289 @@
         $content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
         $content      = str_replace( '###SITEURL###', home_url(), $content );
 
+        /* translators: New admin email address notification email subject. %s: Site name */
         wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
 
         if ( $switched_locale ) {

wp-admin/user-new.php

@@ -122 +122 @@
 Please click the following link to confirm the invite:
 %4$s'
                         );
+
+                        /* translators: Joining confirmation notification email subject. %s: Site name */
                         wp_mail( $new_user_email, sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
 
                         if ( $switched_locale ) {