<!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" />
<title>[18348] trunk/wp-content/themes/twentyeleven: Simplify some Twenty-Eleven strings for i18n, props nbachiyski, fixes #17777</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18348">18348</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-06-27 20:24:23 +0000 (Mon, 27 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify some Twenty-Eleven strings for i18n, props nbachiyski, fixes <a href="http://trac.wordpress.org/ticket/17777">#17777</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyeleven404php">trunk/wp-content/themes/twentyeleven/404.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentasidephp">trunk/wp-content/themes/twentyeleven/content-aside.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentgalleryphp">trunk/wp-content/themes/twentyeleven/content-gallery.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentimagephp">trunk/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentlinkphp">trunk/wp-content/themes/twentyeleven/content-link.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentquotephp">trunk/wp-content/themes/twentyeleven/content-quote.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentstatusphp">trunk/wp-content/themes/twentyeleven/content-status.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentphp">trunk/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenshowcasephp">trunk/wp-content/themes/twentyeleven/showcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyeleven404php"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/404.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/404.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/404.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -32,8 +32,9 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><ins>+ /* translators: %1$s: smilie */
</ins><span class="cx"> $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
</span><del>- the_widget( 'WP_Widget_Archives', array('count' => 0 , 'dropdown' => 1 ), "after_title=</h2>$archive_content" );
</del><ins>+ the_widget( 'WP_Widget_Archives', array('count' => 0 , 'dropdown' => 1 ), array( 'after_title' => '</h2>'.$archive_content ) );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentasidephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-aside.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-aside.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-aside.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> <?php twentyeleven_posted_on(); ?>
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-gallery.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-gallery.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-gallery.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> <?php if ( $show_sep ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><span class="cx"> <?php endif; // End if $show_sep ?>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a Reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; // End if comments_open() ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-image.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-image.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-image.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( "Reply", 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- /* translators: used between list items, there is a space after the comma */
</del><ins>+ /* translators: used between list items, there is a space after the comma */
</ins><span class="cx"> $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
</span><span class="cx"> if ( $categories_list ):
</span><span class="cx"> ?>
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <?php endif; // End if $tags_list ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', __( '<strong>1</strong> Reply', 'twentyeleven' ), __( '<strong>%</strong> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; // End if comments_open() ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-link.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-link.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-link.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> <?php twentyeleven_posted_on(); ?>
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentquotephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-quote.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-quote.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-quote.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>t
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> <?php if ( $show_sep ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><span class="cx"> <?php endif; // End if $show_sep ?>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; // End if comments_open() ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentstatusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-status.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-status.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content-status.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> <?php twentyeleven_posted_on(); ?>
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/content.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> <?php if ( $show_sep ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><span class="cx"> <?php endif; // End if $show_sep ?>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</ins><span class="cx"> <?php endif; // End if comments_open() ?>
</span><span class="cx">
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/showcase.php (18347 => 18348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/showcase.php 2011-06-27 19:35:26 UTC (rev 18347)
+++ trunk/wp-content/themes/twentyeleven/showcase.php 2011-06-27 20:24:23 UTC (rev 18348)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> <li class="entry-title">
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
</span><span class="cx"> <span class="comments-link">
</span><del>- <?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
</del><ins>+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
</ins><span class="cx"> </span>
</span><span class="cx"> </li>
</span><span class="cx">
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> <?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=<h3 class="widget-title">&after_title=</h3>' );
</del><ins>+ the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array( 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; // end sidebar widget area ?>
</span></span></pre>
</div>
</div>
</body>
</html>