Index: wp-admin/includes/meta-boxes.php
===================================================================
--- wp-admin/includes/meta-boxes.php	(revision 18324)
+++ wp-admin/includes/meta-boxes.php	(working copy)
@@ -15,6 +15,15 @@
 	$post_type = $post->post_type;
 	$post_type_object = get_post_type_object($post_type);
 	$can_publish = current_user_can($post_type_object->cap->publish_posts);
+
+	$status_labels = array(
+		'private' => __( 'Privately Published' ),
+		'publish' => __( 'Published' ),
+		'future' => __( 'Scheduled' ),
+		'pending' => __( 'Pending Review' ),
+		'draft' => __( 'Draft' ),
+		'auto-draft' => __( 'Draft' ),
+	);
 ?>
 <div class="submitbox" id="submitpost">
 
@@ -27,13 +36,13 @@
 
 <div id="minor-publishing-actions">
 <div id="save-action">
-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status )  { ?>
+<?php if ( !in_array( $post->post_status, array( 'publish', 'future', 'pending' ) ) ) { ?>
 <input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" tabindex="4" class="button button-highlighted" />
 <?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
 <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" tabindex="4" class="button button-highlighted" />
 <?php } ?>
 <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading" id="draft-ajax-loading" alt="" />
-</div>
+</div><?php // #save-action ?>
 
 <div id="preview-action">
 <?php
@@ -50,62 +59,42 @@
 ?>
 <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php echo $preview_button; ?></a>
 <input type="hidden" name="wp-preview" id="wp-preview" value="" />
-</div>
+</div><?php // #preview-action ?>
 
 <div class="clear"></div>
-</div><?php // /minor-publishing-actions ?>
+</div><?php // #minor-publishing-actions ?>
 
 <div id="misc-publishing-actions">
 
 <div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label>
 <span id="post-status-display">
-<?php
-switch ( $post->post_status ) {
-	case 'private':
-		_e('Privately Published');
-		break;
-	case 'publish':
-		_e('Published');
-		break;
-	case 'future':
-		_e('Scheduled');
-		break;
-	case 'pending':
-		_e('Pending Review');
-		break;
-	case 'draft':
-	case 'auto-draft':
-		_e('Draft');
-		break;
-}
-?>
+	<?php echo $status_labels[ $post->post_status ]; ?>
 </span>
 <?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
 <a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
 
 <div id="post-status-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
+
 <select name='post_status' id='post_status' tabindex='4'>
-<?php if ( 'publish' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
-<?php elseif ( 'private' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
-<?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
-<?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php endif; ?>
+	<?php if ( in_array( $post->post_status, array( 'publish', 'private', 'future' ) ) ) : ?>
+	<option<?php selected( $post->post_status, 'publish' ); ?> value="<?php echo $post->post_status; ?>"><?php echo $status_labels[ $post->post_status ]; ?></option>
+	<?php endif; ?>
+
+	<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php echo $status_labels['pending']; ?></option>
+
+	<?php if ( 'auto-draft' == $post->post_status ) : ?>
+	<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php echo $status_labels['auto-draft']; ?></option>
+	<?php else : ?>
+	<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php echo $status_labels['draft']; ?></option>
+	<?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
  <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a>
-</div>
+</div><?php // #post-status-select ?>
 
 <?php } ?>
-</div><?php // /misc-pub-section ?>
+</div><?php // .misc-pub-section ?>
 
 <div class="misc-pub-section " id="visibility">
 <?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
@@ -149,10 +138,10 @@
  <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
  <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a>
 </p>
-</div>
+</div><?php // #post-visibility-select ?>
 <?php } ?>
 
-</div><?php // /misc-pub-section ?>
+</div><?php // .misc-pub-section ?>
 
 <?php
 // translators: Publish box date formt, see http://php.net/date
@@ -181,7 +170,7 @@
 	<?php printf($stamp, $date); ?></span>
 	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a>
 	<div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div>
-</div><?php // /misc-pub-section ?>
+</div><?php // .misc-pub-section ?>
 <?php endif; ?>
 
 <?php do_action('post_submitbox_misc_actions'); ?>