From 8db1c75a7e22d0eb36436e3c91a9dc3bfd7c96d3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 22 Sep 2015 14:33:25 +0000
Subject: [PATCH] Remove extra HTML from translatable strings in
 `WP_Comments_List_Table::get_views()`.

Add a context and translator comments.

Props Tmeister for initial patch.
Fixes #31859.
Built from https://develop.svn.wordpress.org/trunk@34424


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

diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index 9259017dbc..8204f97153 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -204,11 +204,39 @@ class WP_Comments_List_Table extends WP_List_Table {
 		//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
 		//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
 		$stati = array(
-				'all' => _nx_noop('All', 'All', 'comments'), // singular not used
-				'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
-				'approved' => _n_noop('Approved <span class="count">(<span class="approved-count">%s</span>)</span>', 'Approved <span class="count">(<span class="approved-count">%s</span>)</span>'),
-				'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
-				'trash' => _n_noop('Trash <span class="count">(<span class="trash-count">%s</span>)</span>', 'Trash <span class="count">(<span class="trash-count">%s</span>)</span>')
+				'all' => _nx_noop( 'All', 'All', 'comments' ), // singular not used
+				'moderated' => str_replace( '%s', '<span class="pending-count">%s</span>',
+					/* translators: %s: pending comments count */
+					_nx_noop(
+						'Pending <span class="count">(%s)</span>',
+						'Pending <span class="count">(%s)</span>',
+						'comments'
+					)
+				),
+				'approved' => str_replace( '%s', '<span class="approved-count">%s</span>',
+					/* translators: %s: approved comments count */
+					_nx_noop(
+						'Approved <span class="count">(%s)</span>',
+						'Approved <span class="count">(%s)</span>',
+						'comments'
+					)
+				),
+				'spam' => str_replace( '%s', '<span class="spam-count">%s</span>',
+					/* translators: %s: spam comments count */
+					_nx_noop(
+						'Spam <span class="count">(%s)</span>',
+						'Spam <span class="count">(%s)</span>',
+						'comments'
+					)
+				),
+				'trash' => str_replace( '%s', '<span class="trash-count">%s</span>',
+					/* translators: %s: trashed comments count */
+					_nx_noop(
+						'Trash <span class="count">(%s)</span>',
+						'Trash <span class="count">(%s)</span>',
+						'comments'
+					)
+				)
 			);
 
 		if ( !EMPTY_TRASH_DAYS )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8d668aa538..7f2923ad27 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34423';
+$wp_version = '4.4-alpha-34424';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.