WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 7 deletions

diff --git a/wp-admin/index.php b/wp-admin/index.php
index 15bc950..3a10bcf 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -26,12 +26,8 @@ jQuery(function($) {
 }
 add_action( 'admin_head', 'index_js' );
 
-function index_css() {
-	wp_admin_css( 'css/dashboard' );
-}
-add_action( 'admin_head', 'index_css' );
-
 wp_enqueue_script( 'jquery' );
+wp_admin_css( 'dashboard' );
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
@@ -110,13 +106,12 @@ if ( $can_switch_themes = current_user_can( 'switch_themes' ) )
 	$widgets_text = "<a href='widgets.php'>$widgets_text</a>";
 ?>
 <p class="youare">
-	<?php printf( __( 'You are using %1$s theme with %2$s.' ), $ct->title, $widgets_text ); ?>
+	<?php printf( __( 'You are using the %1$s theme with %2$s.' ), $ct->title, $widgets_text ); ?>
 	<?php if ( $can_switch_themes ) : ?>
 		<a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a>
 	<?php endif; ?>
 	<?php update_right_now_message(); ?>
 </p>
-
 <?php do_action( 'rightnow_end' ); ?>
 <?php do_action( 'activity_box_end' ); ?>
 </div><!-- rightnow -->