From 695d3ee98bfbecccac9efc5b871b6dfefdc3f709 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 5 Sep 2015 20:46:24 +0000
Subject: [PATCH] Merge two strings in `Walker_Comment::comment()` and
 `Walker_Comment::html5_comment()`.

Props pavelevap.
Fixes #33744.
Built from https://develop.svn.wordpress.org/trunk@33919


git-svn-id: http://core.svn.wordpress.org/trunk@33888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-template.php | 7 +++++--
 wp-includes/version.php          | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 5c680d9388..8c4c60e520 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1934,7 +1934,7 @@ class Walker_Comment extends Walker {
 
 		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 			<?php
-				/* translators: 1: date, 2: time */
+				/* translators: 1: comment date, 2: comment time */
 				printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
 			?>
 		</div>
@@ -1983,7 +1983,10 @@ class Walker_Comment extends Walker {
 					<div class="comment-metadata">
 						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
 							<time datetime="<?php comment_time( 'c' ); ?>">
-								<?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
+								<?php
+									/* translators: 1: comment date, 2: comment time */
+									printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() );
+								?>
 							</time>
 						</a>
 						<?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e88fb979f7..0886c8a209 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33918';
+$wp_version = '4.4-alpha-33919';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.