Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 15175)
+++ wp-admin/includes/template.php	(working copy)
@@ -3738,6 +3738,29 @@
 	if ( is_string($screen) )
 		$screen = convert_to_screen($screen);
 
+	$option = str_replace( '-', '_', "{$screen->id}_per_page" );
+	if ( 'edit_tags_per_page' == $option ) {
+		if ( 'category' == $tax->name )
+			$option = 'categories_per_page';
+		elseif ( 'post_tag' != $tax->name )
+			$option = 'edit_' . $tax->name . '_per_page';
+	}
+
+	$per_page = (int) get_user_option( $option );
+	if ( empty( $per_page ) || $per_page < 1 ) {
+		if ( 'plugins' == $screen->id )
+			$per_page = 999;
+		else
+			$per_page = 20;
+	}
+
+	if ( 'edit_comments_per_page' == $option )
+		$per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
+	elseif ( 'categories_per_page' == $option )
+		$per_page = apply_filters( 'edit_categories_per_page', $per_page );
+	else
+		$per_page = apply_filters( $option, $per_page );
+
 	switch ( $screen->base ) {
 		case 'edit':
 		case 'edit-pages':
@@ -3748,51 +3771,28 @@
 			$per_page_label = $post_type_object->labels->name;
 			break;
 		case 'ms-sites':
-			$per_page_label = __('Sites');
+			$per_page_label = _nx('Site', 'Sites', $per_page, 'screen options');
 			break;
 		case 'ms-users':
-			$per_page_label = __('Users');
+			$per_page_label = _nx('User', 'Users', $per_page, 'screen options');
 			break;
 		case 'edit-comments':
-			$per_page_label = __('Comments');
+			$per_page_label = _nx('Comment', 'Comments', $per_page, 'screen options');
 			break;
 		case 'upload':
-			$per_page_label = __('Media items');
+			$per_page_label = _nx('Media Item', 'Media items', $per_page, 'screen options');
 			break;
 		case 'edit-tags':
 			global $tax;
 			$per_page_label = $tax->labels->name;
 			break;
 		case 'plugins':
-			$per_page_label = __('Plugins');
+			$per_page_label = _nx('Plugin', 'Plugins', $per_page, 'screen options');
 			break;
 		default:
 			return '';
 	}
 
-	$option = str_replace( '-', '_', "{$screen->id}_per_page" );
-	if ( 'edit_tags_per_page' == $option ) {
-		if ( 'category' == $tax->name )
-			$option = 'categories_per_page';
-		elseif ( 'post_tag' != $tax->name )
-			$option = 'edit_' . $tax->name . '_per_page';
-	}
-
-	$per_page = (int) get_user_option( $option );
-	if ( empty( $per_page ) || $per_page < 1 ) {
-		if ( 'plugins' == $screen->id )
-			$per_page = 999;
-		else
-			$per_page = 20;
-	}
-
-	if ( 'edit_comments_per_page' == $option )
-		$per_page = apply_filters( 'comments_per_page', $per_page, isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all' );
-	elseif ( 'categories_per_page' == $option )
-		$per_page = apply_filters( 'edit_categories_per_page', $per_page );
-	else
-		$per_page = apply_filters( $option, $per_page );
-
 	$return = "<div class='screen-options'>\n";
 	if ( !empty($per_page_label) )
 		$return .= "<input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' /> <label for='$option'>$per_page_label</label>\n";