Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php	(working copy)
@@ -80,7 +80,7 @@
 		$num_posts = wp_count_posts( $post_type );
 
 		if ( $num_posts && $num_posts->publish ) {
-			$text             = sprintf( _n( '%s Plugin', '%s Plugins', $num_posts->publish ), number_format_i18n( $num_posts->publish ) );
+			$text             = sprintf( _n( '%s Plugin', '%s Plugins', $num_posts->publish, 'wporg-plugins' ), number_format_i18n( $num_posts->publish ) );
 			$post_type_object = get_post_type_object( $post_type );
 
 			if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
@@ -197,7 +197,7 @@
 			set_transient( 'settings_errors', array( array(
 				'setting' => 'wporg-plugins',
 				'code'    => 'plugins-bulk-rejected',
-				'message' => sprintf( _n( '1 plugin rejected.', '%d plugins rejected.', $rejected, 'wporg-plugins' ), $rejected ),
+				'message' => sprintf( _n( '%d plugin rejected.', '%d plugins rejected.', $rejected, 'wporg-plugins' ), $rejected ),
 				'type'    => 'updated',
 			) ) );
 		}
@@ -527,11 +527,11 @@
 		$response['supplemental'] = array(
 			'in_moderation'        => $counts->moderated,
 			'i18n_comments_text'   => sprintf(
-				_n( '%s Comment', '%s Comments', $counts->approved ),
+				_n( '%s Comment', '%s Comments', $counts->approved, 'wporg-plugins' ),
 				number_format_i18n( $counts->approved )
 			),
 			'i18n_moderation_text' => sprintf(
-				_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
+				_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments', 'wporg-plugins' ),
 				number_format_i18n( $counts->moderated )
 			)
 		);
Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php	(working copy)
@@ -361,7 +361,7 @@
 					'Mine <span class="count">(%s)</span>',
 					$user_post_count,
 					'posts',
-					'wporg-posts'
+					'wporg-plugins'
 				),
 				number_format_i18n( $user_post_count )
 			);
@@ -387,7 +387,7 @@
 				'All <span class="count">(%s)</span>',
 				$total_posts,
 				'posts',
-				'wporg-posts'
+				'wporg-plugins'
 			),
 			number_format_i18n( $total_posts )
 		);
@@ -441,7 +441,7 @@
 					'Sticky <span class="count">(%s)</span>',
 					$this->sticky_posts_count,
 					'posts',
-					'wporg-posts'
+					'wporg-plugins'
 				),
 				number_format_i18n( $this->sticky_posts_count )
 			);
Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php	(working copy)
@@ -96,7 +96,7 @@
 			if ( empty( $author_commit ) && empty( $author_plugins ) ) {
 				echo 'Not a developer on any plugin.';
 			} else {
-				echo '<strong>' . sprintf( _n( '1 plugin:', '%d plugins:', count( $all_plugins ) ), count( $all_plugins ) ) . '</strong>';
+				echo '<strong>' . sprintf( _n( '%d plugin:', '%d plugins:', count( $all_plugins ), 'wporg-plugins' ), count( $all_plugins ) ) . '</strong>';
 
 				echo '<ul>';
 				foreach ( $all_plugins as $plugin ) {
Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php	(working copy)
@@ -24,8 +24,9 @@
 		if ( $count <= 10 ) {
 			$text = __( 'Less than 10', 'wporg-plugins' );
 		} elseif ( $count >= 1000000 ) {
+			$million_count = intdiv( $count, 1000000 );
 			/* translators: %d: The integer number of million active installs */
-			$text = sprintf( __( '%d+ million', 'wporg-plugins' ), intdiv( $count, 1000000 ) );
+			$text = sprintf( _n( '%d+ million', '%d+ million', $million_count, 'wporg-plugins' ), $million_count );
 		} else {
 			$text = number_format_i18n( $count ) . '+';
 		}
Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php	(working copy)
@@ -59,7 +59,14 @@
 				<li><?php printf( __( 'Tested up to: %s', 'wporg-plugins' ), '<strong>' . $tested_up_to . '</strong>' ); ?></li>
 			<?php } ?>
 			<?php if ( $tags = get_the_term_list( $post->ID, 'plugin_tags', '<div class="tags">', '', '</div>' ) ) : ?>
-				<li><?php printf( _n( 'Tag: %s', 'Tags: %s', count( get_the_terms( $post, 'plugin_tags' ) ), 'wporg-plugins' ), $tags ); ?></li>
+				<li><?php
+					$terms = get_the_terms( $post, 'plugin_tags' );
+					if ( 1 == count( $terms ) ) {
+						printf( __( 'Tag: %s', 'wporg-plugins' ), $tags );
+					} else {
+						printf( __( 'Tags: %s', 'wporg-plugins' ), $tags );
+					}
+				?></li>
 			<?php endif; ?>
 		</ul>
 
Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php	(revision 5000)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php	(working copy)
@@ -52,7 +52,7 @@
 					?>
 					<li class="counter-container">
 						<a href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/?filter=' . $stars ); ?>">
-							<span class="counter-label"><?php printf( _n( '%d star', '%d stars', $stars, 'wporg-plugin' ), $stars ); ?></span>
+							<span class="counter-label"><?php printf( _n( '%d star', '%d stars', $stars, 'wporg-plugins' ), $stars ); ?></span>
 					<span class="counter-back">
 						<span class="counter-bar" style="width: <?php echo $rating_bar_width; ?>%;"></span>
 					</span>