Index: src/wp-includes/comment-template.php
===================================================================
--- src/wp-includes/comment-template.php	(revision 53348)
+++ src/wp-includes/comment-template.php	(working copy)
@@ -2431,6 +2431,12 @@
 		trim( $required_indicator )
 	);
 
+	$logged_in_as = sprintf(
+		/* translators: %s: User name. */
+		__( 'Logged in as %s.' ),
+		$user_identity
+	);
+
 	/**
 	 * Filters the default comment form fields.
 	 *
@@ -2463,14 +2469,13 @@
 		'logged_in_as'         => sprintf(
 			'<p class="logged-in-as">%s%s</p>',
 			sprintf(
-				/* translators: 1: Edit user link, 2: Accessibility text, 3: User name, 4: Logout URL. */
-				__( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+				'<a href="%1$s" aria-label="%2$s">%3$s</a> <a href="%4$s">%5$s</a>',
 				get_edit_user_link(),
-				/* translators: %s: User name. */
-				esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-				$user_identity,
+				esc_attr( $logged_in_as . ' ' . __( 'Edit your profile.' ) ),
+				$logged_in_as,
 				/** This filter is documented in wp-includes/link-template.php */
-				wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+				wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) ),
+				__( 'Log out?' )
 			),
 			$required_text
 		),