<!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>[14771] trunk/wp-includes/theme-compat:
First pass of conversion of theme-compat to the I18N version of the files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14771">14771</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-05-20 21:53:11 +0000 (Thu, 20 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>First pass of conversion of theme-compat to the I18N version of the files. See <a href="http://trac.wordpress.org/ticket/12425">#12425</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentsphp">trunk/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunkwpincludesthemecompatfooterphp">trunk/wp-includes/theme-compat/footer.php</a></li>
<li><a href="#trunkwpincludesthemecompatsidebarphp">trunk/wp-includes/theme-compat/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments-popup.php (14770 => 14771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php        2010-05-20 21:44:33 UTC (rev 14770)
+++ trunk/wp-includes/theme-compat/comments-popup.php        2010-05-20 21:53:11 UTC (rev 14771)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml">
</span><span class="cx"> <head>
</span><del>- <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
</del><ins>+ <title><?php printf(__('%1$s - Comments on %2$s'), get_option('blogname'), the_title('','',false)); ?></title>
</ins><span class="cx">
</span><span class="cx">         <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
</span><span class="cx">         <style type="text/css" media="screen">
</span><span class="lines">@@ -28,14 +28,14 @@
</span><span class="cx"> /* Don't remove these lines. */
</span><span class="cx"> add_filter('comment_text', 'popuplinks');
</span><span class="cx"> if ( have_posts() ) :
</span><del>-while ( have_posts() ) : the_post();
</del><ins>+while( have_posts()) : the_post();
</ins><span class="cx"> ?>
</span><del>-<h2 id="comments">Comments</h2>
</del><ins>+<h2 id="comments"><?php _e('Comments'); ?></h2>
</ins><span class="cx">
</span><del>-<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
</del><ins>+<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.'); ?></a></p>
</ins><span class="cx">
</span><span class="cx"> <?php if ( pings_open() ) { ?>
</span><del>-<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
</del><ins>+<p><?php printf(__('The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em>%s</em>'), get_trackback_url()); ?></p>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -53,69 +53,69 @@
</span><span class="cx"> <?php foreach ($comments as $comment) { ?>
</span><span class="cx">         <li id="comment-<?php comment_ID() ?>">
</span><span class="cx">         <?php comment_text() ?>
</span><del>-        <p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
</del><ins>+        <p><cite><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> <?php printf(__('by %1$s &#8212; %2$s @ <a href="#comment-%3$s">%4$s</a>'), get_comment_author_link(), get_comment_date(), get_comment_ID(), get_comment_time()); ?></cite></p>
</ins><span class="cx">         </li>
</span><span class="cx">
</span><span class="cx"> <?php } // end for each comment ?>
</span><span class="cx"> </ol>
</span><span class="cx"> <?php } else { // this is displayed if there are no comments so far ?>
</span><del>-        <p>No comments yet.</p>
</del><ins>+        <p><?php _e('No comments yet.'); ?></p>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() ) { ?>
</span><del>-<h2>Leave a comment</h2>
-<p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
</del><ins>+<h2><?php _e('Leave a comment'); ?></h2>
+<p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
</ins><span class="cx">
</span><span class="cx"> <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
</span><span class="cx"> <?php if ( $user_ID ) : ?>
</span><del>-        <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
</del><ins>+        <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity, wp_logout_url(get_permalink())); ?></p>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx">         <p>
</span><span class="cx">          <input type="text" name="author" id="author" class="textarea" value="<?php echo esc_attr($comment_author); ?>" size="28" tabindex="1" />
</span><del>-         <label for="author">Name</label>
</del><ins>+         <label for="author"><?php _e('Name'); ?></label>
</ins><span class="cx">         </p>
</span><span class="cx">
</span><span class="cx">         <p>
</span><span class="cx">          <input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="28" tabindex="2" />
</span><del>-         <label for="email">E-mail</label>
</del><ins>+         <label for="email"><?php _e('E-mail'); ?></label>
</ins><span class="cx">         </p>
</span><span class="cx">
</span><span class="cx">         <p>
</span><span class="cx">          <input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="28" tabindex="3" />
</span><del>-         <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
</del><ins>+         <label for="url"><?php _e('<abbr title="Universal Resource Locator">URL</abbr>'); ?></label>
</ins><span class="cx">         </p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx">         <p>
</span><del>-         <label for="comment">Your Comment</label>
</del><ins>+         <label for="comment"><?php _e('Your Comment'); ?></label>
</ins><span class="cx">         <br />
</span><span class="cx">          <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
</span><span class="cx">         </p>
</span><span class="cx">
</span><span class="cx">         <p>
</span><del>- <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
</del><ins>+         <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
</ins><span class="cx">          <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
</span><del>-         <input name="submit" type="submit" tabindex="5" value="Say It!" />
</del><ins>+         <input name="submit" type="submit" tabindex="5" value="<?php _e('Say It!' ); ?>" />
</ins><span class="cx">         </p>
</span><span class="cx">         <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx"> </form>
</span><span class="cx"> <?php } else { // comments are closed ?>
</span><del>-<p>Sorry, the comment form is closed at this time.</p>
</del><ins>+<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
</ins><span class="cx"> <?php }
</span><span class="cx"> } // end password check
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
</del><ins>+<div><strong><a href="javascript:window.close()"><?php _e('Close this window.'); ?></a></strong></div>
</ins><span class="cx">
</span><span class="cx"> <?php // if you delete this the sky will fall on your head
</span><del>-endwhile; //endwhile have_posts()
-else: //have_posts()
</del><ins>+endwhile; // have_posts()
+else: // have_posts()
</ins><span class="cx"> ?>
</span><del>-<p>Sorry, no posts matched your criteria.</p>
</del><ins>+<p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <!-- // this is just the end of the motor - don't touch that line either :) -->
</span><span class="cx"> <?php //} ?>
</span><del>-<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p>
</del><ins>+<p class="credit"><?php timer_stop(1); ?> <cite><?php printf(__('Powered by <a href="%s" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a>'), 'http://wordpress.org/'); ?></cite></p>
</ins><span class="cx"> <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> <!--
</span><span class="lines">@@ -126,4 +126,4 @@
</span><span class="cx"> // -->
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span><del>-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</html>
</ins></span></pre></div>
<a id="trunkwpincludesthemecompatcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments.php (14770 => 14771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments.php        2010-05-20 21:44:33 UTC (rev 14770)
+++ trunk/wp-includes/theme-compat/comments.php        2010-05-20 21:53:11 UTC (rev 14771)
</span><span class="lines">@@ -12,9 +12,9 @@
</span><span class="cx"> // Do not delete these lines
</span><span class="cx">         if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
</span><span class="cx">                 die ('Please do not load this page directly. Thanks!');
</span><del>-
</del><ins>+        
</ins><span class="cx">         if ( post_password_required() ) { ?>
</span><del>-                <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
</del><ins>+                <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
</ins><span class="cx">         <?php
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> <!-- You can start editing here. -->
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><del>-        <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
</del><ins>+        <h3 id="comments"><?php comments_number(__('No Responses'), __('One Response'), __('% Responses'));?> <?php printf(__('to &#8220;%s&#8221;'), the_title('', '', false)); ?></h3>
</ins><span class="cx">
</span><span class="cx">         <div class="navigation">
</span><span class="cx">                 <div class="alignleft"><?php previous_comments_link() ?></div>
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">         </div>
</span><span class="cx">
</span><span class="cx">         <ol class="commentlist">
</span><del>-        <?php wp_list_comments(); ?>
</del><ins>+        <?php wp_list_comments();?>
</ins><span class="cx">         </ol>
</span><span class="cx">
</span><span class="cx">         <div class="navigation">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx">          <?php else : // comments are closed ?>
</span><span class="cx">                 <!-- If comments are closed. -->
</span><del>-                <p class="nocomments">Comments are closed.</p>
</del><ins>+                <p class="nocomments"><?php _e('Comments are closed.'); ?></p>
</ins><span class="cx">
</span><span class="cx">         <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -55,41 +55,41 @@
</span><span class="cx">
</span><span class="cx"> <div id="respond">
</span><span class="cx">
</span><del>-<h3><?php comment_form_title( 'Leave a Reply', 'Leave a Reply to %s' ); ?></h3>
</del><ins>+<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
</ins><span class="cx">
</span><del>-<div class="cancel-comment-reply">
-        <small><?php cancel_comment_reply_link(); ?></small>
-</div>
</del><ins>+<div id="cancel-comment-reply">
+        <small><?php cancel_comment_reply_link() ?></small>
+</div>
</ins><span class="cx">
</span><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>
</del><ins>+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="cx"> <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><del>-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &raquo;</a></p>
</del><ins>+<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account'); ?>"><?php _e('Log out &raquo;'); ?></a></p>
</ins><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="cx"> <p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
</span><del>-<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
</del><ins>+<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
</ins><span class="cx">
</span><span class="cx"> <p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
</span><del>-<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
</del><ins>+<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
</ins><span class="cx">
</span><del>-<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
-<label for="url"><small>Website</small></label></p>
</del><ins>+<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
+<label for="url"><small><?php _e('Website'); ?></small></label></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<!--<p><small><strong>XHTML:</strong> You can use these tags: <code><?php echo allowed_tags(); ?></code></small></p>-->
</del><ins>+<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>'), allowed_tags()); ?></small></p>-->
</ins><span class="cx">
</span><span class="cx"> <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
</span><span class="cx">
</span><del>-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-<?php comment_id_fields(); ?>
</del><ins>+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
+<?php comment_id_fields(); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemecompatfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/footer.php (14770 => 14771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/footer.php        2010-05-20 21:44:33 UTC (rev 14770)
+++ trunk/wp-includes/theme-compat/footer.php        2010-05-20 21:53:11 UTC (rev 14771)
</span><span class="lines">@@ -14,11 +14,10 @@
</span><span class="cx"> <div id="footer" role="contentinfo">
</span><span class="cx"> <!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
</span><span class="cx">         <p>
</span><del>-                <?php bloginfo('name'); ?> is proudly powered by
-                <a href="http://wordpress.org/">WordPress</a>
-                <br /><a href="<?php bloginfo('rss2_url'); ?>">Entries (RSS)</a>
-                and <a href="<?php bloginfo('comments_rss2_url'); ?>">Comments (RSS)</a>.
-                <!-- <?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. -->
</del><ins>+                <?php printf(__('%1$s is proudly powered by %2$s'), get_bloginfo('name'),
+                '<a href="http://wordpress.org/">WordPress</a>'); ?>
+                <br /><?php printf(__('%1$s and %2$s.'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)') . '</a>'); ?>
+                <!-- <?php printf(__('%d queries. %s seconds.'), get_num_queries(), timer_stop(0, 3)); ?> -->
</ins><span class="cx">         </p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludesthemecompatsidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/sidebar.php (14770 => 14771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/sidebar.php        2010-05-20 21:44:33 UTC (rev 14770)
+++ trunk/wp-includes/theme-compat/sidebar.php        2010-05-20 21:53:11 UTC (rev 14771)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">                         </li>
</span><span class="cx">
</span><span class="cx">                         <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
</span><del>-                        <li><h2>Author</h2>
</del><ins>+                        <li><h2><?php _e('Author'); ?></h2>
</ins><span class="cx">                         <p>A little something about you, the author. Nothing lengthy, just an overview.</p>
</span><span class="cx">                         </li>
</span><span class="cx">                         -->
</span><span class="lines">@@ -29,26 +29,22 @@
</span><span class="cx">
</span><span class="cx">                         <?php /* If this is a 404 page */ if (is_404()) { ?>
</span><span class="cx">                         <?php /* If this is a category archive */ } elseif (is_category()) { ?>
</span><del>-                        <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
</del><ins>+                        <p><?php printf(__('You are currently browsing the archives for the %s category.'), single_cat_title('', false)); ?></p>
</ins><span class="cx">
</span><span class="cx">                         <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
</span><del>-                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
-                        for the day <?php the_time('l, F jS, Y'); ?>.</p>
</del><ins>+                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the day %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('l, F jS, Y'))); ?></p>
</ins><span class="cx">
</span><span class="cx">                         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
</span><del>-                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
-                        for <?php the_time('F, Y'); ?>.</p>
</del><ins>+                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time(__('F, Y'))); ?></p>
</ins><span class="cx">
</span><span class="cx">                         <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
</span><del>-                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
-                        for the year <?php the_time('Y'); ?>.</p>
</del><ins>+                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives for the year %3$s.'), get_bloginfo('url'), get_bloginfo('name'), get_the_time('Y')); ?></p>
</ins><span class="cx">
</span><span class="cx">                         <?php /* If this is a search result */ } elseif (is_search()) { ?>
</span><del>-                        <p>You have searched the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives
-                        for <strong>'<?php the_search_query(); ?>'</strong>. If you are unable to find anything in these search results, you can try one of these links.</p>
</del><ins>+                        <p><?php printf(__('You have searched the <a href="%1$s/">%2$s</a> blog archives for <strong>&#8216;%3$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.'), get_bloginfo('url'), get_bloginfo('name'), wp_specialchars(get_search_query(), true)); ?></p>
</ins><span class="cx">
</span><del>-                        <?php /* If this set is paginated */ } elseif ( !empty($_GET['paged']) ) { ?>
-                        <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php bloginfo('name'); ?></a> blog archives.</p>
</del><ins>+                        <?php /* If this set is paginated */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
+                        <p><?php printf(__('You are currently browsing the <a href="%1$s/">%2$s</a> blog archives.'), get_bloginfo('url'), get_bloginfo('name')); ?></p>
</ins><span class="cx">
</span><span class="cx">                         <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -56,27 +52,27 @@
</span><span class="cx">                 <?php }?>
</span><span class="cx">                 </ul>
</span><span class="cx">                 <ul role="navigation">
</span><del>-                        <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
</del><ins>+                        <?php wp_list_pages('title_li=<h2>' . __('Pages') . '</h2>' ); ?>
</ins><span class="cx">
</span><del>-                        <li><h2>Archives</h2>
</del><ins>+                        <li><h2><?php _e('Archives'); ?></h2>
</ins><span class="cx">                                 <ul>
</span><span class="cx">                                 <?php wp_get_archives(array('type' => 'monthly')); ?>
</span><span class="cx">                                 </ul>
</span><span class="cx">                         </li>
</span><span class="cx">
</span><del>-                        <?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>Categories</h2>')); ?>
</del><ins>+                        <?php wp_list_categories(array('show_count' => 1, 'title_li' => '<h2>' . __('Categories') . '</h2>')); ?>
</ins><span class="cx">                 </ul>
</span><span class="cx">                 <ul>
</span><span class="cx">                         <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
</span><span class="cx">                                 <?php wp_list_bookmarks(); ?>
</span><span class="cx">
</span><del>-                                <li><h2>Meta</h2>
</del><ins>+                                <li><h2><?php _e('Meta'); ?></h2>
</ins><span class="cx">                                 <ul>
</span><span class="cx">                                         <?php wp_register(); ?>
</span><span class="cx">                                         <li><?php wp_loginout(); ?></li>
</span><del>-                                        <li><a href="http://validator.w3.org/check/referer" title="This page validates as XHTML 1.0 Transitional">Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr></a></li>
-                                        <li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
-                                        <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
</del><ins>+                                        <li><a href="http://validator.w3.org/check/referer" title="<?php _e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
+                                        <li><a href="http://gmpg.org/xfn/"><abbr title="<?php _e('XHTML Friends Network'); ?>"><?php _e('XFN'); ?></abbr></a></li>
+                                        <li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WordPress</a></li>
</ins><span class="cx">                                         <?php wp_meta(); ?>
</span><span class="cx">                                 </ul>
</span><span class="cx">                                 </li>
</span></span></pre>
</div>
</div>
</body>
</html>