Index: /trunk/wp-content/themes/twentyeleven/content-image.php
===================================================================
--- /trunk/wp-content/themes/twentyeleven/content-image.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyeleven/content-image.php	(revision 19582)
@@ -37,5 +37,5 @@
 						get_the_date(),
 						esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-						sprintf( esc_attr__( 'View all posts by %s', 'twentyeleven' ), get_the_author() ),
+						esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
 						get_the_author()
 					);
Index: /trunk/wp-content/themes/twentyeleven/content-single.php
===================================================================
--- /trunk/wp-content/themes/twentyeleven/content-single.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyeleven/content-single.php	(revision 19582)
@@ -58,5 +58,5 @@
 			</div><!-- #author-avatar -->
 			<div id="author-description">
-				<h2><?php printf( esc_attr__( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
+				<h2><?php printf( __( 'About %s', 'twentyeleven' ), get_the_author() ); ?></h2>
 				<?php the_author_meta( 'description' ); ?>
 				<div id="author-link">
Index: /trunk/wp-content/themes/twentyeleven/functions.php
===================================================================
--- /trunk/wp-content/themes/twentyeleven/functions.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyeleven/functions.php	(revision 19582)
@@ -568,6 +568,6 @@
 		esc_html( get_the_date() ),
 		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		sprintf( esc_attr__( 'View all posts by %s', 'twentyeleven' ), get_the_author() ),
-		esc_html( get_the_author() )
+		esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+		get_the_author()
 	);
 }
@@ -583,7 +583,6 @@
 function twentyeleven_body_classes( $classes ) {
 
-	if ( ! is_multi_author() ) {
+	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
 		$classes[] = 'single-author';
-	}
 
 	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
Index: /trunk/wp-content/themes/twentyeleven/image.php
===================================================================
--- /trunk/wp-content/themes/twentyeleven/image.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyeleven/image.php	(revision 19582)
@@ -28,5 +28,5 @@
 								<?php
 									$metadata = wp_get_attachment_metadata();
-									printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%7$s</a>', 'twentyeleven' ),
+									printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', 'twentyeleven' ),
 										esc_attr( get_the_time() ),
 										get_the_date(),
@@ -35,4 +35,5 @@
 										$metadata['height'],
 										esc_url( get_permalink( $post->post_parent ) ),
+										esc_attr( strip_tags( get_the_title( $post->post_parent ) ) ),
 										get_the_title( $post->post_parent )
 									);
@@ -71,5 +72,5 @@
 	}
 ?>
-									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
 									$attachment_size = apply_filters( 'twentyeleven_attachment_size', 848 );
 									echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
Index: /trunk/wp-content/themes/twentyeleven/style.css
===================================================================
--- /trunk/wp-content/themes/twentyeleven/style.css	(revision 19581)
+++ /trunk/wp-content/themes/twentyeleven/style.css	(revision 19582)
@@ -5,5 +5,5 @@
 Author URI: http://wordpress.org/
 Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.
-Version: 1.2
+Version: 1.3
 License: GNU General Public License
 License URI: license.txt
Index: /trunk/wp-content/themes/twentyten/functions.php
===================================================================
--- /trunk/wp-content/themes/twentyten/functions.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyten/functions.php	(revision 19582)
@@ -474,5 +474,5 @@
 		sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
 			get_author_posts_url( get_the_author_meta( 'ID' ) ),
-			sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+			esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
 			get_the_author()
 		)
Index: /trunk/wp-content/themes/twentyten/loop-attachment.php
===================================================================
--- /trunk/wp-content/themes/twentyten/loop-attachment.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyten/loop-attachment.php	(revision 19582)
@@ -19,5 +19,5 @@
 
 				<?php if ( ! empty( $post->post_parent ) ) : ?>
-					<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
+					<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php echo esc_attr( sprintf( __( 'Return to %s', 'twentyten' ), strip_tags( get_the_title( $post->post_parent ) ) ) ); ?>" rel="gallery"><?php
 						/* translators: %s - title of parent post */
 						printf( __( '<span class="meta-nav">&larr;</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
@@ -34,5 +34,5 @@
 								sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
 									get_author_posts_url( get_the_author_meta( 'ID' ) ),
-									sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+									esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
 									get_the_author()
 								)
@@ -86,5 +86,5 @@
 	}
 ?>
-						<p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+						<p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
 							$attachment_width  = apply_filters( 'twentyten_attachment_size', 900 );
 							$attachment_height = apply_filters( 'twentyten_attachment_height', 900 );
@@ -97,5 +97,5 @@
 						</div><!-- #nav-below -->
 <?php else : ?>
-						<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+						<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
 <?php endif; ?>
 						</div><!-- .entry-attachment -->
Index: /trunk/wp-content/themes/twentyten/loop-single.php
===================================================================
--- /trunk/wp-content/themes/twentyten/loop-single.php	(revision 19581)
+++ /trunk/wp-content/themes/twentyten/loop-single.php	(revision 19582)
@@ -41,5 +41,5 @@
 						</div><!-- #author-avatar -->
 						<div id="author-description">
-							<h2><?php printf( esc_attr__( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
+							<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
 							<div id="author-link">
Index: /trunk/wp-content/themes/twentyten/style.css
===================================================================
--- /trunk/wp-content/themes/twentyten/style.css	(revision 19581)
+++ /trunk/wp-content/themes/twentyten/style.css	(revision 19582)
@@ -4,5 +4,5 @@
 Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
 Author: the WordPress team
-Version: 1.2
+Version: 1.3
 License: GNU General Public License
 License URI: license.txt