Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 24180)
+++ wp-admin/post.php	(working copy)
@@ -181,7 +181,11 @@
 
 	add_action( 'admin_footer', '_admin_notice_post_locked' );
 
-	$title = $post_type_object->labels->edit_item;
+  if($post_type_object->labels->edit_item == 'Edit Post')
+    $title = 'Edit '.ucfirst($post->post_format).' Post';
+  else
+    $title = $post_type_object->labels->edit_item;
+   
 	$post = get_post($post_id, OBJECT, 'edit');
 
 	if ( post_type_supports($post_type, 'comments') ) {
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 24180)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -157,35 +157,45 @@
 
 	$all_post_formats = array(
 		'standard' => array (
-			'description' => __( 'Use the editor below to compose your post.' )
-		),
-		'image' => array (
-			'description' => __( 'Select or upload an image for your post.' )
-		),
-		'gallery' => array (
-			'description' => __( 'Use the Add Media button to select or upload images for your gallery.' )
-		),
-		'link' => array (
-			'description' => __( 'Add a link URL below.' )
-		),
-		'video' => array (
-			'description' => __( 'Select or upload a video, or paste a video embed code into the box.' )
-		),
-		'audio' => array (
-			'description' => __( 'Select or upload an audio file, or paste an audio embed code into the box.' )
-		),
-		'chat' => array (
-			'description' => __( 'Copy a chat or Q&A transcript into the editor.' )
-		),
-		'status' => array (
-			'description' => __( 'Use the editor to compose a status update. What’s new?' )
-		),
-		'quote' => array (
-			'description' => __( 'Add a source and URL if you have them. Use the editor to compose the quote.' )
-		),
-		'aside' => array (
-			'description' => __( 'Use the editor to share a quick thought or side topic.' )
-		)
+            			'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.' )
+        )
 	);
 
 	foreach ( $all_post_formats as $slug => $attr ) {
@@ -195,7 +205,7 @@
 			$active_post_type_slug = $slug;
 		}
 
-		$post_format_options .= '<a ' . $class . ' href="?format=' . $slug . '" data-description="' . $attr['description'] . '" data-wp-format="' . $slug . '" title="' . ucfirst( $slug ) . '"><div class="' . $slug . '"></div><span class="post-format-title">' . ucfirst( $slug ) . '</span></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 ) );
@@ -391,7 +401,8 @@
 <?php if ( ! empty( $post_format_options ) ) : ?>
 <div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
 	<div class="post-format-options">
-		<?php echo $post_format_options; ?>
+        <span class="post-format-tip"><?php echo $all_post_formats[ $post_format ]['title']; ?></span>
+        <?php echo $post_format_options; ?>
 	</div>
 </div>
 <?php endif; ?>
Index: wp-admin/includes/upgrade.php
===================================================================
--- wp-admin/includes/upgrade.php	(revision 24180)
+++ wp-admin/includes/upgrade.php	(working copy)
@@ -147,6 +147,7 @@
 								'post_content' => $first_post,
 								'post_excerpt' => '',
 								'post_title' => __('Hello world!'),
+								'post_format' => __('standard'),
 								/* translators: Default post slug */
 								'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
 								'post_modified' => $now,
Index: wp-admin/includes/schema.php
===================================================================
--- wp-admin/includes/schema.php	(revision 24180)
+++ wp-admin/includes/schema.php	(working copy)
@@ -144,6 +144,7 @@
   post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
   post_content longtext NOT NULL,
   post_title text NOT NULL,
+  post_format text NOT NULL,
   post_excerpt text NOT NULL,
   post_status varchar(20) NOT NULL default 'publish',
   comment_status varchar(20) NOT NULL default 'open',
Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 24180)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -315,8 +315,8 @@
 			$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>
-		<?php foreach ( $post_formats[0] as $format ) : ?>
+        <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 />
 	</div>
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 24180)
+++ wp-includes/post.php	(working copy)
@@ -566,6 +566,12 @@
 	 * @var string
 	 */
 	public $filter;
+  
+  /**
+	 *
+	 * @var string
+	 */
+	public $post_format = '';
 
 	public static function get_instance( $post_id ) {
 		global $wpdb;
@@ -1425,18 +1431,40 @@
  */
 function get_post_type_labels( $post_type_object ) {
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-		'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-		'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-		'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-		'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-		'new_item' => array( __('New Post'), __('New Page') ),
-		'view_item' => array( __('View Post'), __('View Page') ),
-		'search_items' => array( __('Search Posts'), __('Search Pages') ),
-		'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' ) )
+   		'name'               => array( _x( 'Posts', 'post type general name' ), _x( 'Pages', 'post type general name' ) ),
+		'singular_name'      => array( _x( 'Post', 'post type singular name' ), _x( 'Page', 'post type singular name' ) ),
+		'add_new'            => array( _x( 'Add New', 'post' ),                 _x( 'Add New', 'page' )                 ),
+		'add_new_item'       => array( __( 'Add New Post' ),                    __( 'Add New Page' )                    ),
+		'edit_item'          => array( __( 'Edit Post' ),                       __( 'Edit Page' )                       ),
+		'new_item'           => array( __( 'New Post' ),                        __( 'New Page' )                        ),
+		'view_item'          => array( __( 'View Post' ),                       __( 'View Page' )                       ),
+		'search_items'       => array( __( 'Search Posts' ),                    __( 'Search Pages' )                    ),
+		'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' )                       ),
+		'formats' => array(
+        			'standard_item'      => array( __( 'Standard Post' ),      __( 'Standard Page' )      ),
+        			'edit_standard_item' => array( __( 'Edit Standard Post' ), __( 'Edit Standard Page' ) ),
+        			'aside_item'         => array( __( 'Aside Post' ),         __( 'Aside Page' )         ),
+        			'edit_aside_item'    => array( __( 'Edit Aside Post' ),    __( 'Edit Aside Page' )    ),
+        			'chat_item'          => array( __( 'Chat Post' ),          __( 'Chat Page' )          ),
+        			'edit_chat_item'     => array( __( 'Edit Chat Post' ),     __( 'Edit Chat Page' )     ),
+        			'gallery_item'       => array( __( 'Gallery Post' ),       __( 'Gallery Page' )       ),
+        			'edit_gallery_item'  => array( __( 'Edit Gallery Post' ),  __( 'Edit Gallery Page' )  ),
+        			'link_item'          => array( __( 'Link Post' ),          __( 'Link Page' )          ),
+        			'edit_link_item'     => array( __( 'Edit Link Post' ),     __( 'Edit Link Page' )     ),
+        			'image_item'         => array( __( 'Image Post' ),         __( 'Image Page' )         ),
+        			'edit_image_item'    => array( __( 'Edit Image Post' ),    __( 'Edit Image Page' )    ),
+        			'quote_item'         => array( __( 'Quote Post' ),         __( 'Quote Page' )         ),
+        			'edit_quote_item'    => array( __( 'Edit Quote Post' ),    __( 'Edit Quote Page' )    ),
+        			'status_item'        => array( __( 'Status Post' ),        __( 'Status Page' )        ),
+        			'edit_status_item'   => array( __( 'Edit Status Post' ),   __( 'Edit Status Page' )   ),
+        			'video_item'         => array( __( 'Video Post' ),         __( 'Video Page' )         ),
+        			'edit_video_item'    => array( __( 'Edit Video Post' ),    __( 'Edit Video Page' )    ),
+        			'audio_item'         => array( __( 'Audio Post' ),         __( 'Audio Page' )         ),
+        			'edit_audio_item'    => array( __( 'Edit Audio Post' ),    __( 'Edit Audio Page' )    ),
+        		)
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
@@ -2623,7 +2651,7 @@
 		'ping_status' => get_option('default_ping_status'), 'post_parent' => 0,
 		'menu_order' => 0, 'to_ping' =>  '', 'pinged' => '', 'post_password' => '',
 		'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0,
-		'post_content' => '', 'post_title' => '');
+		'post_content' => '', 'post_title' => '', 'post_format' => '');
 
 	$postarr = wp_parse_args($postarr, $defaults);
 
@@ -2784,7 +2812,7 @@
 	$post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
 	// expected_slashed (everything!)
-	$data = compact( array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'guid' ) );
+	$data = compact( array( 'post_format', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'guid' ) );
 	$data = apply_filters('wp_insert_post_data', $data, $postarr);
 	$data = wp_unslash( $data );
 	$where = array( 'ID' => $post_ID );