Index: trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php
===================================================================
--- trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php	(revision 5955)
+++ trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/comments.php	(working copy)
@@ -13,64 +13,76 @@
  */
 ?>
 
-			<div id="comments">
-<?php if ( post_password_required() ) : ?>
-				<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'wordcamporg' ); ?></p>
-			</div><!-- #comments -->
-<?php
-		/* Stop the rest of comments.php from being processed,
-		 * but don't kill the script entirely -- we still have
-		 * to fully load the template.
-		 */
-		return;
-	endif;
+<div id="comments">
+    <?php if (post_password_required()) : ?>
+        <p class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'wordcamporg'); ?></p>
+    </div><!-- #comments -->
+    <?php
+    /* Stop the rest of comments.php from being processed,
+     * but don't kill the script entirely -- we still have
+     * to fully load the template.
+     */
+    return;
+endif;
 ?>
 
 <?php
-	// You can start editing here -- including this comment!
+// You can start editing here -- including this comment!
 ?>
 
-<?php if ( have_comments() ) : ?>
-			<h3 id="comments-title"><?php
-			printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'wordcamporg' ),
-			number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
-			?></h3>
+<?php if (have_comments()) : ?>
+    <h3 id="comments-title"><?php
+        
+        $comments_number = get_comments_number();
+        if (1 == $comments_number) {
+            /* translators: %s: post title */
+            printf(_x('One Response to &ldquo;%2$s&rdquo;', 'comments title', 'wordcamporg'), '<span>' . get_the_title() . '</span>');
+        } else {
+            printf(
+                    /* translators: 1: number of comments, 2: post title */
+                    _nx(
+                            '%1$s Response to &ldquo;%2$s&rdquo;', '%1$s Response to &ldquo;%2$s&rdquo;', $comments_number, 'comments title', 'wordcamporg'
+                    ), number_format_i18n($comments_number), '<span>' . get_the_title() . '</span>'
+            );
+        }
+        ?></h3>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-			<div class="navigation">
-				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'wordcamporg' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?></div>
-			</div> <!-- .navigation -->
-<?php endif; // check for comment navigation ?>
+        <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through?  ?>
+        <div class="navigation">
+            <div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">&larr;</span> Older Comments', 'wordcamporg')); ?></div>
+            <div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">&rarr;</span>', 'wordcamporg')); ?></div>
+        </div> <!-- .navigation -->
+        <?php endif; // check for comment navigation  ?>
 
-			<ol class="commentlist">
-				<?php
-					/* Loop through and list the comments. Tell wp_list_comments()
-					 * to use twentyten_comment() to format the comments.
-					 * If you want to overload this in a child theme then you can
-					 * define twentyten_comment() and that will be used instead.
-					 * See twentyten_comment() in twentyten/functions.php for more.
-					 */
-					wp_list_comments( array( 'callback' => 'twentyten_comment' ) );
-				?>
-			</ol>
+    <ol class="commentlist">
+    <?php
+    /* Loop through and list the comments. Tell wp_list_comments()
+     * to use twentyten_comment() to format the comments.
+     * If you want to overload this in a child theme then you can
+     * define twentyten_comment() and that will be used instead.
+     * See twentyten_comment() in twentyten/functions.php for more.
+     */
+    wp_list_comments(array('callback' => 'twentyten_comment'));
+    ?>
+    </ol>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
-			<div class="navigation">
-				<div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'wordcamporg' ) ); ?></div>
-				<div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'wordcamporg' ) ); ?></div>
-			</div><!-- .navigation -->
-<?php endif; // check for comment navigation ?>
+        <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // Are there comments to navigate through?  ?>
+        <div class="navigation">
+            <div class="nav-previous"><?php previous_comments_link(__('<span class="meta-nav">&larr;</span> Older Comments', 'wordcamporg')); ?></div>
+            <div class="nav-next"><?php next_comments_link(__('Newer Comments <span class="meta-nav">&rarr;</span>', 'wordcamporg')); ?></div>
+        </div><!-- .navigation -->
+    <?php endif; // check for comment navigation   ?>
 
-<?php else : // or, if we don't have comments:
+    <?php
+else : // or, if we don't have comments:
 
-	/* If there are no comments and comments are closed,
-	 * let's leave a little note, shall we?
-	 */
-	if ( ! comments_open() ) :
-?>
-	<p class="nocomments"><?php _e( 'Comments are closed.', 'wordcamporg' ); ?></p>
-<?php endif; // end ! comments_open() ?>
+    /* If there are no comments and comments are closed,
+     * let's leave a little note, shall we?
+     */
+    if (!comments_open()) :
+        ?>
+        <p class="nocomments"><?php _e('Comments are closed.', 'wordcamporg'); ?></p>
+    <?php endif; // end ! comments_open() ?>
 
 <?php endif; // end have_comments() ?>