Ticket #32334: 32334.patch

src/wp-admin/comment.php

@@ -66 +66 @@
         $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.') );
@@ -120 +120 @@
 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:');
@@ -174 +174 @@
 </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;
@@ -249 +249 @@
         $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.') );
 

src/wp-admin/edit-comments.php

@@ -161 +161 @@
         $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.' );

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -311 +311 @@
                 $columns['comment'] = _x( 'Comment', 'column name' );
 
                 if ( !$post_id )
-                        $columns['response'] = _x( 'In Response To', 'column name' );
+                        /* translators: column name or table row header */
+                        $columns['response'] = __( 'In Response To' );
 
                 return $columns;
         }