Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 23310)
+++ wp-includes/post.php	(working copy)
@@ -5331,20 +5331,21 @@
  *
  * @since 3.1.0
  *
+ * @param int $number The number to compare against to use either singular or plural Default 1
  * @return array The array of translations
  */
-function get_post_format_strings() {
+function get_post_format_strings( $number = 1 ) {
 	$strings = array(
-		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'standard' => _nx( 'Standard', 'Standards', $number, 'Post format' ), // Special case. any value that evals to false will be considered standard
+		'aside'    => _nx( 'Aside',    'Asides',    $number, 'Post format' ),
+		'chat'     => _nx( 'Chat',     'Chats',     $number, 'Post format' ),
+		'gallery'  => _nx( 'Gallery',  'Galleries', $number, 'Post format' ),
+		'link'     => _nx( 'Link',     'Links',     $number, 'Post format' ),
+		'image'    => _nx( 'Image',    'Images',    $number, 'Post format' ),
+		'quote'    => _nx( 'Quote',    'Quotes',    $number, 'Post format' ),
+		'status'   => _nx( 'Status',   'Statuses',  $number, 'Post format' ),
+		'video'    => _nx( 'Video',    'Videos',    $number, 'Post format' ),
+		'audio'    => _nx( 'Audio',    'Audios',    $number, 'Post format' ),
 	);
 	return $strings;
 }
@@ -5367,10 +5368,11 @@
  * @since 3.1.0
  *
  * @param string $slug A post format slug
+ * @param int $number The number to compare against to use either singular or plural Default 1
  * @return string The translated post format name
  */
-function get_post_format_string( $slug ) {
-	$strings = get_post_format_strings();
+function get_post_format_string( $slug, $number = 1 ) {
+	$strings = get_post_format_strings( $number );
 	if ( !$slug )
 		return $strings['standard'];
 	else