diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index 4be20051c7..d7990988f3 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -178,19 +178,35 @@ function install_themes_dashboard() {
 	<?php
 	$feature_list = install_themes_feature_list( );
 	echo '<div class="feature-filter">';
+	$trans = array ('Colors' => __('Colors'), 'black' => __('Black'), 'blue' => __('Blue'), 'brown' => __('Brown'),
+		'green' => __('Green'), 'orange' => __('Orange'), 'pink' => __('Pink'), 'purple' => __('Purple'), 'red' => __('Red'),
+		'silver' => __('Silver'), 'tan' => __('Tan'), 'white' => __('White'), 'yellow' => __('Yellow'), 'dark' => __('Dark'),
+		'light' => __('Light'), 'Columns' => __('Columns'), 'one-column' => __('One Column'), 'two-columns' => __('Two Columns'),
+		'three-columns' => __('Three Columns'), 'four-columns' => __('Four Columns'), 'left-sidebar' => __('Left Sidebar'),
+		'right-sidebar' => __('Right Sidebar'), 'Width' => __('Width'), 'fixed-width' => __('Fixed Width'), 'flexible-width' => __('Flexible Width'),
+		'Features' => __('Features'), 'custom-colors' => __('Custom Colors'), 'custom-header' => __('Custom Header'), 'theme-options' => __('Theme Options'),
+		'threaded-comments' => __('Threaded Comments'), 'sticky-post' => __('Sticky Post'), 'microformats' => __('Microformats'),
+		'Subject' => __('Subject'), 'holiday' => __('Holiday'), 'photoblogging' => __('Photoblogging'), 'seasonal' => __('Seasonal'),
+	);
 
 	foreach ( (array) $feature_list as $feature_name => $features ) {
-		$html_safe['feature_name'] = wp_specialchars( $feature_name );
-		echo '<div class="feature-name">' . $html_safe['feature_name'] . '</div>';
+		if ( isset($trans[$feature_name]) )
+			 $feature_name = $trans[$feature_name];
+		$feature_name = wp_specialchars( $feature_name );
+		echo '<div class="feature-name">' . $feature_name . '</div>';
 
 		echo '<ol style="float: left; width: 725px;" class="feature-group">';
 		foreach ( $features as $feature ) {
-			$html_safe['feature'] = wp_specialchars( $feature );
+			$feature_name = $feature;
+			if ( isset($trans[$feature]) )
+				$feature_name = $trans[$feature];
+			$feature_name = wp_specialchars( $feature_name );
+			$feature = attribute_escape($feature);
 ?>
 
 <li>
-	<input type="checkbox" name="features[<?php echo $html_safe['feature']; ?>]" id="feature-id-<?php echo $html_safe['feature']; ?>" value="<?php echo $html_safe['feature']; ?>">
-	<label for="feature-id-<?php echo $html_safe['feature']; ?>"><?php echo $html_safe['feature']; ?></label>
+	<input type="checkbox" name="features[<?php echo $feature; ?>]" id="feature-id-<?php echo $feature; ?>" value="<?php echo $feature; ?>">
+	<label for="feature-id-<?php echo $feature; ?>"><?php echo $feature_name; ?></label>
 </li>
 
 <?php	} ?>