diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 017a16396f..30f1c0fe6d 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -109,7 +109,7 @@ require_once('./includes/meta-boxes.php');
 add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', $post_type, 'side', 'core');
 
 if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
-	add_meta_box( 'formatdiv', __('Format'), 'post_format_meta_box', $post_type, 'side', 'core' );
+	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', $post_type, 'side', 'core' );
 
 // all taxonomies
 foreach ( get_object_taxonomies($post_type) as $tax_name ) {
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 8515f8184c..89532dcd61 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -87,8 +87,8 @@ function create_initial_taxonomies() {
 		'public' => true,
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Format' ),
-			'singular_name' => __( 'Format' ),
+			'name' => _x( 'Format', 'post format' ),
+			'singular_name' => _x( 'Format', 'post format' ),
 		),
 		'query_var' => true,
 		'rewrite' => $rewrite,