From 48a1c86245b261d9ac7a2007a2e79af160909535 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 26 Jul 2015 23:36:24 +0000
Subject: [PATCH] Comment string tweaks: * Merge two strings about an invalid
 comment ID. * Add missing context to 'Mark as Spam' string. * Merge two 'In
 Response To' strings, replace redundant context with a translator comment.

props pavelevap.
fixes #32334.
Built from https://develop.svn.wordpress.org/trunk@33436


git-svn-id: http://core.svn.wordpress.org/trunk@33403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/comment.php                               | 8 ++++----
 wp-admin/edit-comments.php                         | 2 +-
 wp-admin/includes/class-wp-comments-list-table.php | 6 ++++--
 wp-includes/version.php                            | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index 4c71f3422f..7131a0c7f3 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -69,7 +69,7 @@ case 'editcomment' :
 	$comment_id = absint( $_GET['c'] );
 
 	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
 
 	if ( !current_user_can( 'edit_comment', $comment_id ) )
 		comment_footer_die( __('You are not allowed to edit this comment.') );
@@ -123,7 +123,7 @@ case 'spam'    :
 switch ( $action ) {
 	case 'spam' :
 		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = __('Mark as Spam');
+		$button      = _x( 'Mark as Spam', 'comment' );
 		break;
 	case 'trash' :
 		$caution_msg = __('You are about to move the following comment to the Trash:');
@@ -177,7 +177,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 </tr>
 <?php } ?>
 <tr>
-	<th scope="row"><?php _e( 'In Response To' ); ?></th>
+	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
 	<td>
 	<?php
 		$post_id = $comment->comment_post_ID;
@@ -252,7 +252,7 @@ case 'unapprovecomment' :
 	$noredir = isset($_REQUEST['noredir']);
 
 	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
 	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
 		comment_footer_die( __('You are not allowed to edit comments on this post.') );
 
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 057b0a5d6c..300ede8305 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -161,7 +161,7 @@ if ( isset( $_REQUEST['error'] ) ) {
 	$error_msg = '';
 	switch ( $error ) {
 		case 1 :
-			$error_msg = __( 'Oops, no comment with this ID.' );
+			$error_msg = __( 'Invalid comment ID.' );
 			break;
 		case 2 :
 			$error_msg = __( 'You are not allowed to edit comments on this post.' );
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 93ff8713ff..b7608f379a 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -357,8 +357,10 @@ class WP_Comments_List_Table extends WP_List_Table {
 		$columns['author'] = __( 'Author' );
 		$columns['comment'] = _x( 'Comment', 'column name' );
 
-		if ( !$post_id )
-			$columns['response'] = _x( 'In Response To', 'column name' );
+		if ( ! $post_id ) {
+			/* translators: column name or table row header */
+			$columns['response'] = __( 'In Response To' );
+		}
 
 		return $columns;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b3f5603e17..1f1a3b5b10 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta4-33435';
+$wp_version = '4.3-beta4-33436';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.