<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13024] trunk/wp-content/themes/twentyten: gettext for twentyten.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13024">13024</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 17:59:08 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gettext for twentyten. see <a href="http://trac.wordpress.org/ticket/12170">#12170</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfooterphp">trunk/wp-content/themes/twentyten/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchformphp">trunk/wp-content/themes/twentyten/searchform.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13023 => 13024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-02-08 16:23:32 UTC (rev 13023)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-02-08 17:59:08 UTC (rev 13024)
</span><span class="lines">@@ -20,14 +20,14 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>- <h3 id="comments-title"><?php comments_number('No Responses to', 'One Response to', '% Responses to' );?> <em><?php the_title(); ?></em></h3>
</del><ins>+ <h3 id="comments-title"><?php comments_number( __('No Responses to', 'twentyten'), __('One Response to', 'twentyten'), __('% Responses to', 'twentyten') );?> <em><?php the_title(); ?></em></h3>
</ins><span class="cx">
</span><span class="cx"> <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
</span><span class="cx"> <div class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
</span><span class="cx"> </div>
</span><del>-<?php endif; // check for comment navigation ?>
</del><ins>+<?php endif; // check for comment navigation ?>
</ins><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><span class="cx"> <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
</span><span class="lines">@@ -38,15 +38,15 @@
</span><span class="cx"> <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
</span><span class="cx"> <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
</span><span class="cx"> </div>
</span><del>-<?php endif; // check for comment navigation ?>
-
</del><ins>+<?php endif; // check for comment navigation ?>
+
</ins><span class="cx"> <?php else : // this is displayed if there are no comments so far ?>
</span><span class="cx">
</span><del>-<?php if ( comments_open() ) : // If comments are open, but there are no comments ?>
</del><ins>+<?php if ( comments_open() ) : // If comments are open, but there are no comments ?>
</ins><span class="cx">
</span><span class="cx"> <?php else : // if comments are closed ?>
</span><span class="cx">
</span><del>- <p class="nocomments">Comments are closed.</p>
</del><ins>+ <p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -54,61 +54,61 @@
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx">
</span><span class="cx"> <div id="respond">
</span><del>-
- <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>
-
</del><ins>+
+ <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>
+
</ins><span class="cx"> <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
</span><del>- <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">
-
</del><ins>+ <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">
+
</ins><span class="cx"> <?php if ( $user_ID ) : ?>
</span><span class="cx"> <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'),
</span><del>- get_option('siteurl') . '/wp-admin/profile.php',
</del><ins>+ admin_url('profile.php'),
</ins><span class="cx"> wp_specialchars($user_identity, true),
</span><span class="cx"> wp_logout_url(get_permalink()) ) ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php else : ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <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>
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> <div id="form-section-author" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="author"><?php _e('Name', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
</span><span class="cx"> <div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" tabindex="3" /></div>
</span><span class="cx"> </div><!-- #form-section-author .form-section -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="form-section-email" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="email"><?php _e('Email', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
</span><span class="cx"> <div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" tabindex="4" /></div>
</span><span class="cx"> </div><!-- #form-section-email .form-section -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="form-section-url" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="url"><?php _e('Website', 'twentyten') ?></label></div>
</span><span class="cx"> <div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" tabindex="5" /></div>
</span><span class="cx"> </div><!-- #form-section-url .form-section -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php endif; // if ( $user_ID ) ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="form-section-comment" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="comment"><?php _e('Comment', 'twentyten') ?></label></div>
</span><span class="cx"> <div class="form-textarea"><textarea id="comment" name="comment" cols="45" rows="8" tabindex="6"></textarea></div>
</span><span class="cx"> </div><!-- #form-section-comment .form-section -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="form-allowed-tags" class="form-section">
</span><span class="cx"> <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>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <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>
</span><span class="cx">
</span><del>-<?php comment_id_fields(); ?>
</del><ins>+<?php comment_id_fields(); ?>
</ins><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> </form>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php endif; // If registration required and not logged in ?>
</span><span class="cx"> </div> <!-- #respond -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (13023 => 13024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-02-08 16:23:32 UTC (rev 13023)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-02-08 17:59:08 UTC (rev 13024)
</span><span class="lines">@@ -1,23 +1,23 @@
</span><span class="cx"> </div><!-- #main -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="footer">
</span><span class="cx"> <div id="colophon">
</span><del>-
-<?php get_sidebar('footer'); ?>
-
</del><ins>+
+<?php get_sidebar('footer'); ?>
+
</ins><span class="cx"> <div id="site-info">
</span><span class="cx"> <a href="<?php bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="site-generator">
</span><del>- 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>
</del><ins>+ <?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>' ); ?>
</ins><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div><!-- #colophon -->
</span><span class="cx"> </div><!-- #footer -->
</span><del>-
-</div><!-- #wrapper -->
</del><span class="cx">
</span><ins>+</div><!-- #wrapper -->
+
</ins><span class="cx"> <?php wp_footer(); ?>
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (13023 => 13024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-02-08 16:23:32 UTC (rev 13023)
+++ trunk/wp-content/themes/twentyten/index.php 2010-02-08 17:59:08 UTC (rev 13024)
</span><span class="lines">@@ -1,16 +1,16 @@
</span><span class="cx"> <?php get_header(); ?>
</span><del>-
- <div id="container">
</del><ins>+
+ <div id="container">
</ins><span class="cx"> <div id="content">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-above -->
</span><del>-<?php } ?>
-
- <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
</del><ins>+<?php } ?>
+
+ <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
</ins><span class="cx"> <?php if ( in_category( 'Gallery' ) ) { ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <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>
</span><span class="lines">@@ -20,14 +20,14 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> 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><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <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>
</span><del>-
- <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>
-
</del><ins>+
+ <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>
+
</ins><span class="cx"> <?php the_excerpt(''); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $category_link; ?>" title="<?php _e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
</span><span class="cx">
</span><del>- <span class="meta-sep"> | </span>
</del><ins>+ <span class="meta-sep"> | </span>
</ins><span class="cx">
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx">
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <?php } elseif ( in_category( 'asides' ) ) { ?>
</span><del>- <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <div class="entry-content">
</del><ins>+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <div class="entry-content">
</ins><span class="cx"> <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="lines">@@ -59,26 +59,26 @@
</span><span class="cx"> 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><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><span class="cx"> <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><del>- <span class="meta-sep"> | </span>
</del><ins>+ <span class="meta-sep"> | </span>
</ins><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?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" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> <?php } else { ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <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>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> 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><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-
- <div class="entry-content">
</del><ins>+
+ <div class="entry-content">
</ins><span class="cx"> <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="lines">@@ -89,11 +89,11 @@
</span><span class="cx"> <?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><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
</span><span class="cx"> <?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" ) ?>
</span><del>- </div><!-- #entry-utility -->
</del><ins>+ </div><!-- #entry-utility -->
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><del>-
-<?php comments_template(); ?>
-
</del><ins>+
+<?php comments_template(); ?>
+
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> <?php else : ?>
</span><span class="lines">@@ -102,17 +102,17 @@
</span><span class="cx"> <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
</span><span class="cx"> <?php get_search_form(); ?>
</span><span class="cx"> </div>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
</span><span class="cx"> <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><del>-<?php } ?>
-
- </div><!-- #content -->
</del><ins>+<?php } ?>
+
+ </div><!-- #content -->
</ins><span class="cx"> </div><!-- #container -->
</span><del>-
-<?php get_sidebar(); ?>
</del><ins>+
+<?php get_sidebar(); ?>
</ins><span class="cx"> <?php get_footer(); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/searchform.php (13023 => 13024)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/searchform.php 2010-02-08 16:23:32 UTC (rev 13023)
+++ trunk/wp-content/themes/twentyten/searchform.php 2010-02-08 17:59:08 UTC (rev 13024)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <form id="searchform" name="searchform" method="get" action="/">
</span><span class="cx"> <div>
</span><del>- <label for="s">Search</label>
</del><ins>+ <label for="s"><?php _e('Search', 'twentyten'); ?></label>
</ins><span class="cx"> <input type="text" id="s" name="s" />
</span><span class="cx"> <input type="submit" id="searchsubmit" value="<?php _e('Search', 'twentyten'); ?>" />
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>