diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index 5c3afccf11..647083c82d 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -20,14 +20,14 @@ endif;
 ?>
 
 <?php if ( have_comments() ) : ?>
-			<h3 id="comments-title"><?php comments_number('No Responses to', 'One Response to', '% Responses to' );?>  <em><?php the_title(); ?></em></h3>
+			<h3 id="comments-title"><?php comments_number( __('No Responses to', 'twentyten'), __('One Response to', 'twentyten'), __('% Responses to', 'twentyten') );?>  <em><?php the_title(); ?></em></h3>
 
 <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
 				<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
 			</div>
-<?php endif; // check for comment navigation ?>								
+<?php endif; // check for comment navigation ?>
 
 			<ol class="commentlist">
 			<?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
@@ -38,15 +38,15 @@ endif;
 				<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
 				<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
 			</div>
-<?php endif; // check for comment navigation ?>											
-			
+<?php endif; // check for comment navigation ?>
+
 <?php else : // this is displayed if there are no comments so far ?>
 
-<?php if ( comments_open() ) : // If comments are open, but there are no comments ?>		
+<?php if ( comments_open() ) : // If comments are open, but there are no comments ?>
 
 <?php else : // if comments are closed ?>
 
-		<p class="nocomments">Comments are closed.</p>
+		<p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
 
 <?php endif; ?>
 <?php endif; ?>
@@ -54,61 +54,61 @@ endif;
 <?php if ( comments_open() ) : ?>
 
 			<div id="respond">
-			
-				<h3 id="reply-title"><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?> <small><?php cancel_comment_reply_link('Cancel reply'); ?></small></h3>
-			
+
+				<h3 id="reply-title"><?php comment_form_title( __('Leave a Reply', 'twentyten'), __('Leave a Reply to %s', 'twentyten') ); ?> <small><?php cancel_comment_reply_link( __('Cancel reply', 'twentyten') ); ?></small></h3>
+
 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
-				<p>You must be <a href="<?php echo wp_login_url( get_permalink() ); ?>">logged in</a> to post a comment.</p>
-				
-<?php else : // here's the big comment form ?>			
-				<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
-				
+				<p><?php printf( __('You must be <a href="%s">logged in</a> to post a comment.', 'twentyten'), wp_login_url( get_permalink() ) ); ?></p>
+
+<?php else : // here's the big comment form ?>
+				<form action="<?php echo site_url('wp-comments-post.php'); ?>" method="post" id="commentform">
+
 	<?php if ( $user_ID ) : ?>
 					<p id="login"><?php printf(__('<span class="loggedin">Logged in as <a href="%1$s" title="Logged in as %2$s">%2$s</a>.</span> <span class="logout"><a href="%3$s" title="Log out of this account">Log out?</a></span>', 'twentyten'),
-						get_option('siteurl') . '/wp-admin/profile.php',
+						admin_url('profile.php'),
 						wp_specialchars($user_identity, true),
 						wp_logout_url(get_permalink()) ) ?></p>
-					
+
 	<?php else : ?>
-	
+
 					<p id="comment-notes"><?php _e('Your email is <em>never</em> published nor shared.', 'twentyten') ?> <?php if ($req) _e('Required fields are marked <span class="required">*</span>', 'twentyten') ?></p>
-	
-					
+
+
 					<div id="form-section-author" class="form-section">
 						<div class="form-label"><label for="author"><?php _e('Name', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
 						<div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" tabindex="3" /></div>
 					</div><!-- #form-section-author .form-section -->
-					
+
 					<div id="form-section-email" class="form-section">
 						<div class="form-label"><label for="email"><?php _e('Email', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
 						<div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" tabindex="4" /></div>
 					</div><!-- #form-section-email .form-section -->
-					
+
 					<div id="form-section-url" class="form-section">
 						<div class="form-label"><label for="url"><?php _e('Website', 'twentyten') ?></label></div>
 						<div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" tabindex="5" /></div>
 					</div><!-- #form-section-url .form-section -->
-					
+
 	<?php endif; // if ( $user_ID ) ?>
-					
+
 					<div id="form-section-comment" class="form-section">
 						<div class="form-label"><label for="comment"><?php _e('Comment', 'twentyten') ?></label></div>
 						<div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
 					</div><!-- #form-section-comment .form-section -->
-					
+
 					<div id="form-allowed-tags" class="form-section">
 						<p><span><?php _e('You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:', 'twentyten') ?></span> <code><?php echo allowed_tags(); ?></code></p>
 					</div>
-					
+
 					<?php do_action('comment_form', $post->ID); ?>
-					
+
 					<div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e('Post Comment', 'twentyten') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
 
-<?php comment_id_fields(); ?>    
+<?php comment_id_fields(); ?>
+
 
-				
 				</form>
-			
+
 	<?php endif; // If registration required and not logged in ?>
 			</div> <!-- #respond -->
 
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index 376313d4e0..d24a18091f 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -1,22 +1,22 @@
 	</div><!-- #main -->
-	
+
 	<div id="footer">
 		<div id="colophon">
-		
-<?php get_sidebar('footer'); ?>				
-		
+
+<?php get_sidebar('footer'); ?>
+
 			<div id="site-info">
 				<a href="<?php bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a>
 			</div>
-			
+
 			<div id="site-generator">
-				Proudly powered by <span id="generator-link"><a href="http://wordpress.org/" title="<?php _e( 'Semantic Personal Publishing Platform', 'twentyten' ) ?>" rel="generator"><?php _e( 'WordPress', 'twentyten' ) ?></a>.</span>
+				<?php printf( __('Proudly powered by <span id="generator-link">%s</span>.', 'twentyten'), '<a href="http://wordpress.org/" title="' . __( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
 			</div>
-			
+
 		</div><!-- #colophon -->
 	</div><!-- #footer -->
-	
-</div><!-- #wrapper -->	
+
+</div><!-- #wrapper -->
 
 <?php wp_footer(); ?>
 
diff --git a/wp-content/themes/twentyten/index.php b/wp-content/themes/twentyten/index.php
index d5cda407cf..c21ae5d07b 100644
--- a/wp-content/themes/twentyten/index.php
+++ b/wp-content/themes/twentyten/index.php
@@ -1,16 +1,16 @@
 <?php get_header(); ?>
-	
-		<div id="container">	
+
+		<div id="container">
 			<div id="content">
-			
+
 <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
 				<div id="nav-above" class="navigation">
 					<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
 					<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
 				</div><!-- #nav-above -->
-<?php } ?>			
-	
-    <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
+<?php } ?>
+
+    <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
     <?php if ( in_category( 'Gallery' ) ) { ?>
     	<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
@@ -20,14 +20,14 @@
 				<a href="<?php
 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
 				<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
-				<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>					
+				<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
 			</div><!-- .entry-meta -->
 
 			<div class="entry-content">
 				<div class="gallery-thumb"><a class="size-thumbnail" href="<?php permalink_link() ?>"><?php $hilite = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment' LIMIT 1" ); echo wp_get_attachment_image( $hilite, 'thumbnail' );?></a></div>
-						
-				<p><em>This gallery contains <a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php echo $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment'" ); ?> photos</a>.</em></p>
-				
+
+				<p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment'" )); ?></em></p>
+
 				<?php the_excerpt(''); ?>
 			</div><!-- .entry-content -->
 
@@ -38,7 +38,7 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
 				?>
 				<a href="<?php echo $category_link; ?>" title="<?php _e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
 
-				<span class="meta-sep"> | </span>				
+				<span class="meta-sep"> | </span>
 
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
 
@@ -48,8 +48,8 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
 
 
 	<?php } elseif ( in_category( 'asides' ) ) { ?>
-		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>										
-			<div class="entry-content">	
+		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<div class="entry-content">
 <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
 			</div><!-- .entry-content -->
 
@@ -59,26 +59,26 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
 				<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
 				<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
-				<span class="meta-sep"> | </span>			
+				<span class="meta-sep"> | </span>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
-			</div><!-- #entry-utility -->	
+			</div><!-- #entry-utility -->
 		</div><!-- #post-<?php the_ID(); ?> -->
-				
-	
+
+
     <?php } else { ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-			
+
 			<div class="entry-meta">
 				<span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
 				<a href="<?php
 the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
 				<span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
-				<span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>					
+				<span class="author vcard"><a class="url fn n"2 href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
 			</div><!-- .entry-meta -->
-								
-			<div class="entry-content">	
+
+			<div class="entry-content">
 <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
 			</div><!-- .entry-content -->
@@ -89,11 +89,11 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
 				<?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
-			</div><!-- #entry-utility -->	
+			</div><!-- #entry-utility -->
 		</div><!-- #post-<?php the_ID(); ?> -->
-				
-<?php comments_template(); ?>				
-	
+
+<?php comments_template(); ?>
+
     <?php } ?>
     <?php endwhile; ?>
     <?php else : ?>
@@ -102,17 +102,17 @@ the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><
 			<p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
 		<?php get_search_form(); ?>
 		</div>
-    <?php endif; ?>		
+    <?php endif; ?>
 
 <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
 				<div id="nav-below" class="navigation">
 					<div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
 					<div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
 				</div><!-- #nav-below -->
-<?php } ?>			
-			
-			</div><!-- #content -->		
+<?php } ?>
+
+			</div><!-- #content -->
 		</div><!-- #container -->
-		
-<?php get_sidebar(); ?>	
+
+<?php get_sidebar(); ?>
 <?php get_footer(); ?>
diff --git a/wp-content/themes/twentyten/searchform.php b/wp-content/themes/twentyten/searchform.php
index 8e49d13501..29903bf258 100644
--- a/wp-content/themes/twentyten/searchform.php
+++ b/wp-content/themes/twentyten/searchform.php
@@ -1,6 +1,6 @@
     <form id="searchform" name="searchform" method="get" action="/">
 		<div>
-			<label for="s">Search</label>
+			<label for="s"><?php _e('Search', 'twentyten'); ?></label>
 			<input type="text" id="s" name="s" />
 			<input type="submit" id="searchsubmit" value="<?php _e('Search', 'twentyten'); ?>" />
 		</div>