Index: src/wp-admin/includes/class-wp-automatic-updater.php
===================================================================
--- src/wp-admin/includes/class-wp-automatic-updater.php	(revision 45203)
+++ src/wp-admin/includes/class-wp-automatic-updater.php	(working copy)
@@ -648,18 +648,18 @@
 
 		switch ( $type ) {
 			case 'success': // We updated.
-				/* translators: 1: Site name, 2: WordPress version number. */
+				/* translators: Site updated notification email subject. 1: Site title, 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 title, 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 title. */
 				$subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
 				break;
 
@@ -911,10 +911,10 @@
 			);
 			$body[] = '';
 
-			/* translators: Background update failed notification email subject. %s: site title */
+			/* translators: Background update failed notification email subject. %s: Site title */
 			$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 title */
 			$subject = sprintf( __( '[%s] Background Update Finished' ), $site_title );
 		}
 
Index: src/wp-admin/includes/file.php
===================================================================
--- src/wp-admin/includes/file.php	(revision 45203)
+++ src/wp-admin/includes/file.php	(working copy)
@@ -2423,6 +2423,7 @@
 	$mail_success = wp_mail(
 		$email_address,
 		sprintf(
+			/* translators: Personal data export notification email subject. %s: Site title */
 			__( '[%s] Personal Data Export' ),
 			$site_name
 		),
Index: src/wp-admin/includes/misc.php
===================================================================
--- src/wp-admin/includes/misc.php	(revision 45203)
+++ src/wp-admin/includes/misc.php	(working copy)
@@ -1289,6 +1289,7 @@
 	$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 title */
 	wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
 
 	if ( $switched_locale ) {
Index: src/wp-admin/user-new.php
===================================================================
--- src/wp-admin/user-new.php	(revision 45203)
+++ src/wp-admin/user-new.php	(working copy)
@@ -122,6 +122,8 @@
 Please click the following link to confirm the invite:
 %4$s'
 			);
+
+			/* translators: Joining confirmation notification email subject. %s: Site title */
 			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 ) {
Index: src/wp-includes/ms-functions.php
===================================================================
--- src/wp-includes/ms-functions.php	(revision 45203)
+++ src/wp-includes/ms-functions.php	(working copy)
@@ -2645,6 +2645,7 @@
 	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
 	$content      = str_replace( '###SITEURL###', network_home_url(), $content );
 
+	/* translators: Email change notification email subject. %s: Network title */
 	wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
 
 	if ( $switched_locale ) {
Index: src/wp-includes/pluggable.php
===================================================================
--- src/wp-includes/pluggable.php	(revision 45203)
+++ src/wp-includes/pluggable.php	(working copy)
@@ -1535,7 +1535,7 @@
 				/* translators: %s: comment text */
 				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
 				$notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
-				/* translators: 1: blog name, 2: post title */
+				/* translators: Trackback notification email subject. 1: site title, 2: post title */
 				$subject = sprintf( __( '[%1$s] Trackback: "%2$s"' ), $blogname, $post->post_title );
 				break;
 			case 'pingback':
@@ -1548,7 +1548,7 @@
 				/* translators: %s: comment text */
 				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
 				$notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
-				/* translators: 1: blog name, 2: post title */
+				/* translators: Pingback notification email subject. 1: site title, 2: post title */
 				$subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );
 				break;
 			default: // Comments
@@ -1563,7 +1563,7 @@
 				/* translators: %s: comment text */
 				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
 				$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
-				/* translators: 1: blog name, 2: post title */
+				/* translators: Comment notification email subject. 1: site title, 2: post title */
 				$subject = sprintf( __( '[%1$s] Comment: "%2$s"' ), $blogname, $post->post_title );
 				break;
 		}
Index: src/wp-includes/user.php
===================================================================
--- src/wp-includes/user.php	(revision 45203)
+++ src/wp-includes/user.php	(working copy)
@@ -3085,7 +3085,7 @@
 	$content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
 
 	$subject = sprintf(
-		/* translators: 1: Site name. 2: Name of the confirmed action. */
+		/* translators: Privacy data request confirmed notification email subject. 1: Site title, 2: Name of the confirmed action. */
 		__( '[%1$s] Action Confirmed: %2$s' ),
 		$email_data['sitename'],
 		$action_description
@@ -3497,7 +3497,7 @@
 	$content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
 	$content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
 
-	/* translators: Privacy data request subject. 1: Site name, 2: Name of the action */
+	/* translators: Confirm privacy data request notification email subject. 1: Site name, 2: Name of the action */
 	$subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $email_data['sitename'], $email_data['description'] );
 
 	/**
Index: src/wp-login.php
===================================================================
--- src/wp-login.php	(revision 45203)
+++ src/wp-login.php	(working copy)
@@ -395,7 +395,7 @@
 	$message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
 	$message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . ">\r\n";
 
-	/* translators: Password reset email subject. %s: Site name */
+	/* translators: Password reset notification email subject. %s: Site title */
 	$title = sprintf( __( '[%s] Password Reset' ), $site_name );
 
 	/**