Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 23946)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -142,33 +142,43 @@
 
 	$all_post_formats = array(
 		'standard' => array (
+			'title'       => $post_type_object->labels->formats->standard_item,
 			'description' => __( 'Add a title and use the editor to compose your post.' )
 		),
 		'image' => array (
+			'title'       => $post_type_object->labels->formats->image_item,
 			'description' => __( 'Select or upload an image to use for your post.' )
 		),
 		'gallery' => array (
+			'title'       => $post_type_object->labels->formats->gallery_item,
 			'description' => __( 'Use the Add Media button to select or upload images for your gallery.' )
 		),
 		'link' => array (
+			'title'       => $post_type_object->labels->formats->link_item,
 			'description' => __( 'Add a link URL below.' )
 		),
 		'video' => array (
+			'title'       => $post_type_object->labels->formats->video_item,
 			'description' => __( 'Select or upload a video, or paste a video embed code into the box.' )
 		),
 		'audio' => array (
+			'title'       => $post_type_object->labels->formats->audio_item,
 			'description' => __( 'Select or upload an audio file, or paste an audio embed code into the box.' )
 		),
 		'chat' => array (
+			'title'       => $post_type_object->labels->formats->chat_item,
 			'description' => __( 'Copy a chat or Q&A transcript into the editor.' )
 		),
 		'status' => array (
+			'title'       => $post_type_object->labels->formats->status_item,
 			'description' => __( 'Use the editor to compose a status update. What’s new?' )
 		),
 		'quote' => array (
+			'title'       => $post_type_object->labels->formats->quote_item,
 			'description' => __( 'Copy a quotation into the box. Also add the source and URL if you have them.' )
 		),
 		'aside' => array (
+			'title'       => $post_type_object->labels->formats->aside_item,
 			'description' => __( 'An aside is a quick thought or side topic. Use the editor to compose one.' )
 		)
 	);
@@ -183,7 +193,7 @@
 			$active_post_format_description = $attr['description'];
 		}
 
-		$post_format_options .= '<a ' . $class . ' href="?format=' . $slug . '" data-description="' . $attr['description'] . '" data-wp-format="' . $slug . '" title="' . ucfirst( sprintf( __( '%s Post' ), $slug ) ) . '"><div class="' . $slug . '"></div></a>';
+		$post_format_options .= '<a ' . $class . ' href="?format=' . $slug . '" data-description="' . esc_attr( $attr['description'] ) . '" data-wp-format="' . $slug . '" title="' . esc_attr( $attr['title'] ) . '"><div class="' . $slug . '"></div></a>';
 	}
 
 	$current_post_format = array( 'currentPostFormat' => esc_html( $active_post_type_slug ) );
@@ -405,7 +415,7 @@
 
 <?php if ( ! empty( $post_format_options ) ) : ?>
 <div class="post-format-options">
-	<span class="post-format-tip">Standard Post</span>
+	<span class="post-format-tip"><?php echo $all_post_formats[$post_format]['title']; ?></span>
 	<?php echo $post_format_options; ?>
 </div>
 <?php endif; ?>
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 23946)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -315,7 +315,7 @@
 			$post_formats[0][] = $post_format;
 	?>
 	<div id="post-formats-select">
-		<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0"><?php _e('Standard'); ?></label>
+		<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0"><?php echo get_post_format_string( 'standard' ); ?></label>
 		<?php foreach ( $post_formats[0] as $format ) : ?>
 		<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
 		<?php endforeach; ?><br />
Index: wp-admin/options-writing.php
===================================================================
--- wp-admin/options-writing.php	(revision 23946)
+++ wp-admin/options-writing.php	(working copy)
@@ -87,7 +87,7 @@
 <th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
 <td>
 	<select name="default_post_format" id="default_post_format">
-		<option value="0"><?php _e('Standard'); ?></option>
+		<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
 <?php foreach ( $post_formats[0] as $format ): ?>
 		<option<?php selected( get_option('default_post_format'), $format ); ?> value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
 <?php endforeach; ?>
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 23946)
+++ wp-includes/post.php	(working copy)
@@ -1436,7 +1436,29 @@
 		'not_found' => array( __('No posts found.'), __('No pages found.') ),
 		'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
 		'parent_item_colon' => array( null, __('Parent Page:') ),
-		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) )
+		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
+		'formats' => (object) array(
+			'standard_item'      => array( _x( 'Standard Post',      'Post format' ),      _x( 'Standard Page',      'Post format' ) ),
+			'edit_standard_item' => array( _x( 'Edit Standard Post', 'Edit post format' ), _x( 'Edit Standard Page', 'Edit post format' ) ),
+			'aside_item'         => array( _x( 'Aside Post',         'Post format' ),      _x( 'Aside Page',         'Post format' ) ),
+			'edit_aside_item'    => array( _x( 'Edit Aside Post',    'Edit post format' ), _x( 'Edit Aside Page',    'Edit post format' ) ),
+			'chat_item'          => array( _x( 'Chat Post',          'Post format' ),      _x( 'Chat Page',          'Post format' ) ),
+			'edit_chat_item'     => array( _x( 'Edit Chat Post',     'Edit post format' ), _x( 'Edit Chat Page',     'Edit post format' ) ),
+			'gallery_item'       => array( _x( 'Gallery Post',       'Post format' ),      _x( 'Gallery Page',       'Post format' ) ),
+			'edit_gallery_item'  => array( _x( 'Edit Gallery Post',  'Edit post format' ), _x( 'Edit Gallery Page',  'Edit post format' ) ),
+			'link_item'          => array( _x( 'Link Post',          'Post format' ),      _x( 'Link Page',          'Post format' ) ),
+			'edit_link_item'     => array( _x( 'Edit Link Post',     'Edit post format' ), _x( 'Edit Link Page',     'Edit post format' ) ),
+			'image_item'         => array( _x( 'Image Post',         'Post format' ),      _x( 'Image Page',         'Post format' ) ),
+			'edit_image_item'    => array( _x( 'Edit Image Post',    'Edit post format' ), _x( 'Edit Image Page',    'Edit post format' ) ),
+			'quote_item'         => array( _x( 'Quote Post',         'Post format' ),      _x( 'Quote Page',         'Post format' ) ),
+			'edit_quote_item'    => array( _x( 'Edit Quote Post',    'Edit post format' ), _x( 'Edit Quote Page',    'Edit post format' ) ),
+			'status_item'        => array( _x( 'Status Post',        'Post format' ),      _x( 'Status Page',        'Post format' ) ),
+			'edit_status_item'   => array( _x( 'Edit Status Post',   'Edit post format' ), _x( 'Edit Status Page',   'Edit post format' ) ),
+			'video_item'         => array( _x( 'Video Post',         'Post format' ),      _x( 'Video Page',         'Post format' ) ),
+			'edit_video_item'    => array( _x( 'Edit Video Post',    'Edit post format' ), _x( 'Edit Video Page',    'Edit post format' ) ),
+			'audio_item'         => array( _x( 'Audio Post',         'Post format' ),      _x( 'Audio Page',         'Post format' ) ),
+			'edit_audio_item'    => array( _x( 'Edit Audio Post',    'Edit post format' ), _x( 'Edit Audio Page',    'Edit post format' ) )
+		)
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
@@ -1468,12 +1490,19 @@
 
 	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
 		$object->labels['all_items'] = $object->labels['menu_name'];
-
-	foreach ( $nohier_vs_hier_defaults as $key => $value )
-			$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
-
+	
+	// $formats = new stdClass();
+	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+		if ( 'formats' == $key ) {
+			foreach ( $value as $format => $_value )
+				$defaults['formats']->$format = $object->hierarchical ? $_value[1] : $_value[0];
+		} else {
+			$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];						
+		}
+	}
+	
 	$labels = array_merge( $defaults, $object->labels );
-	return (object)$labels;
+	return (object) $labels;
 }
 
 /**