WordPress.org

Make WordPress Core

Ticket #7307: kubrik.r8844.patch

File kubrik.r8844.patch, 36.0 KB (added by msi08, 12 years ago)

current version to reflect the latest changeset

Line 
1Index: comments.php
2===================================================================
3--- comments.php
4+++ comments.php
5@@ -1,9 +1,9 @@
6 <?php // Do not delete these lines
7        if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
8-               die ('Please do not load this page directly. Thanks!');
9+               die ( __('Please do not load this page directly. Thanks!') );
10 
11        if ( post_password_required() ) { ?>
12-               <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
13+               <p class="nocomments"><?php _e("This post is password protected. Enter the password to view comments"); ?>.</p>
14        <?php
15                return;
16        }
17@@ -15,7 +15,7 @@
18 <!-- You can start editing here. -->
19 
20 <?php if ($comments) : ?>
21-       <h3 id="comments"><?php comments_number('No Responses', 'One Response', '% Responses' );?> to &#8220;<?php the_title(); ?>&#8221;</h3>
22+       <h3 id="comments"><?php comments_number( __('No Responses'), __('One Response'), __('% Responses') );?> <?php _e("to"); ?> &#8220;<?php the_title(); ?>&#8221;</h3>
23 
24        <ol class="commentlist">
25 
26@@ -23,13 +23,13 @@
27 
28                <li <?php comment_class($oddcomment) ?> id="comment-<?php comment_ID() ?>">
29                        <?php echo get_avatar( $comment, 32 ); ?>
30-                       <cite><?php comment_author_link() ?></cite> Says:
31+                       <cite><?php comment_author_link() ?></cite> <?php _e("Says"); ?>:
32                        <?php if ($comment->comment_approved == '0') : ?>
33-                       <em>Your comment is awaiting moderation.</em>
34+                       <em><?php _e("Your comment is awaiting moderation"); ?>.</em>
35                        <?php endif; ?>
36                        <br />
37 
38-                       <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('edit','&nbsp;&nbsp;',''); ?></small>
39+                       <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf( _c('%1$s at %2$s|1: date, 2: time'), get_comment_date( get_option('date_format') ), get_comment_time() ); ?></a> <?php edit_comment_link( __('edit'),'&nbsp;&nbsp;',''); ?></small>
40 
41                        <?php comment_text() ?>
42 
43@@ -51,7 +51,7 @@
44 
45         <?php else : // comments are closed ?>
46                <!-- If comments are closed. -->
47-               <p class="nocomments">Comments are closed.</p>
48+               <p class="nocomments"><?php _e("Comments are closed"); ?>.</p>
49 
50        <?php endif; ?>
51 <?php endif; ?>
52@@ -59,28 +59,28 @@
53 
54 <?php if ('open' == $post->comment_status) : ?>
55 
56-<h3 id="respond">Leave a Reply</h3>
57+<h3 id="respond"><?php _e("Leave a Reply"); ?></h3>
58 
59 <?php if ( get_option('comment_registration') && !$user_ID ) : ?>
60-<p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
61+<p><?php printf( _c('You must be <a href="%1$s">logged in</a> to post a comment.|1: login URL'), get_option('siteurl') . "/wp-login.php?redirect_to=" . urlencode(get_permalink()) ); ?></p>
62 <?php else : ?>
63 
64 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
65 
66 <?php if ( $user_ID ) : ?>
67 
68-<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a></p>
69+<p><?php printf( _c('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>|1: profile URL, 2: user name, 3: logout URL'), get_option('siteurl') . "/wp-admin/profile.php", $user_identity, get_option('siteurl') . "/wp-login.php?action=logout" ); ?></p>
70 
71 <?php else : ?>
72 
73 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
74-<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
75+<label for="author"><small><?php _e("Name"); ?> <?php if ($req) _e("(required)");; ?></small></label></p>
76 
77 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
78-<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
79+<label for="email"><small><?php _e("Mail (will not be published)"); ?> <?php if ($req) _e("(required)"); ?></small></label></p>
80 
81 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
82-<label for="url"><small>Website</small></label></p>
83+<label for="url"><small><?php _e("Website"); ?></small></label></p>
84 
85 <?php endif; ?>
86 
87@@ -88,7 +88,7 @@
88 
89 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
90 
91-<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
92+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
93 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
94 </p>
95 <?php do_action('comment_form', $post->ID); ?>
96Index: image.php
97===================================================================
98--- image.php
99+++ image.php
100@@ -10,7 +10,7 @@
101                                <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->ID); ?>"><?php echo wp_get_attachment_image( $post->ID, 'medium' ); ?></a></p>
102                 <div class="caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); // this is the "caption" ?></div>
103 
104-                               <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
105+                               <?php the_content('<p class="serif">' . __('Read the rest of this entry') . ' &raquo;</p>'); ?>
106 
107                                <div class="navigation">
108                                        <div class="alignleft"><?php previous_image_link() ?></div>
109@@ -20,28 +20,27 @@
110 
111                                <p class="postmetadata alt">
112                                        <small>
113-                                               This entry was posted on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
114-                                               and is filed under <?php the_category(', ') ?>.
115+                                               <?php printf( _c('This entry was posted on %1$s at %2$s and is filed under %3$s.|1: date, 2: time, 3: categories'), get_the_time( get_option('date_format') ), get_the_time( get_option('time_format') ), get_the_category_list(', ') ); ?>
116                                                <?php the_taxonomies(); ?>
117-                                               You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
118+                                               <?php printf( _c('You can follow any responses to this entry through the %1$s feed.|1: comments feed URL'), '<a href="' . get_post_comments_feed_link() . '">' . __("RSS 2.0") . '</a>' ); ?>
119 
120                                                <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
121                                                        // Both Comments and Pings are open ?>
122-                                                       You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
123+                                                       <?php printf( __("You can <a href='#respond'>leave a response</a>, or <a href='%s' rel='trackback'>trackback</a> from your own site"), get_trackback_url() ); ?>.
124 
125                                                <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
126                                                        // Only Pings are Open ?>
127-                                                       Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
128+                                                       <?php printf( __("Responses are currently closed, but you can <a href='%s' rel='trackback'>trackback</a> from your own site"), get_trackback_url() ); ?>.
129 
130                                                <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
131                                                        // Comments are open, Pings are not ?>
132-                                                       You can skip to the end and leave a response. Pinging is currently not allowed.
133+                                                       <?php _e("You can skip to the end and leave a response. Pinging is currently not allowed"); ?>.
134 
135                                                <?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
136                                                        // Neither Comments, nor Pings are open ?>
137-                                                       Both comments and pings are currently closed.
138+                                                       <?php _e("Both comments and pings are currently closed"); ?>.
139 
140-                                               <?php } edit_post_link('Edit this entry.','',''); ?>
141+                                               <?php } edit_post_link( __('Edit this entry'),'','.'); ?>
142 
143                                        </small>
144                                </p>
145@@ -54,7 +53,7 @@
146 
147        <?php endwhile; else: ?>
148 
149-               <p>Sorry, no attachments matched your criteria.</p>
150+               <p><?php _e("Sorry, no attachments matched your criteria"); ?>.</p>
151 
152 <?php endif; ?>
153 
154Index: archive.php
155===================================================================
156--- archive.php
157+++ archive.php
158@@ -6,50 +6,50 @@
159 
160          <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
161          <?php /* If this is a category archive */ if (is_category()) { ?>
162-               <h2 class="pagetitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
163+               <h2 class="pagetitle"><?php printf( __("Archive for the &#8216;%s&#8217; Category"), single_cat_title( '', false ) ); ?></h2>
164          <?php /* If this is a tag archive */ } elseif( is_tag() ) { ?>
165-               <h2 class="pagetitle">Posts Tagged &#8216;<?php single_tag_title(); ?>&#8217;</h2>
166+               <h2 class="pagetitle"><?php printf( __("Posts Tagged &#8216;%s&#8217;"), single_tag_title( '', false ) ); ?></h2>
167          <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
168-               <h2 class="pagetitle">Archive for <?php the_time('F jS, Y'); ?></h2>
169+               <h2 class="pagetitle"><?php printf( __("Archive for %s"), get_the_time( __('F jS, Y') ) ); ?></h2>
170          <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
171-               <h2 class="pagetitle">Archive for <?php the_time('F, Y'); ?></h2>
172+               <h2 class="pagetitle"><?php printf( __("Archive for %s"), get_the_time( __('F, Y' ) ) ); ?></h2>
173          <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
174-               <h2 class="pagetitle">Archive for <?php the_time('Y'); ?></h2>
175+               <h2 class="pagetitle"><?php printf( __("Archive for %s"), get_the_time( __('Y' )) ); ?></h2>
176          <?php /* If this is an author archive */ } elseif (is_author()) { ?>
177-               <h2 class="pagetitle">Author Archive</h2>
178+               <h2 class="pagetitle"><?php printf( __("Archive for %s"), get_the_time( __('Y' )) ); ?></h2>
179          <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
180-               <h2 class="pagetitle">Blog Archives</h2>
181+               <h2 class="pagetitle"><?php _e("Blog Archives"); ?></h2>
182          <?php } ?>
183 
184 
185                <div class="navigation">
186-                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
187-                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
188+                       <div class="alignleft"><?php next_posts_link( __('&laquo; Older Entries' ) ) ?></div>
189+                       <div class="alignright"><?php previous_posts_link( __('Newer Entries &raquo;' ) ) ?></div>
190                </div>
191 
192                <?php while (have_posts()) : the_post(); ?>
193                <div <?php post_class() ?>>
194-                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
195-                               <small><?php the_time('l, F jS, Y') ?></small>
196+                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( __("Permanent Link to %s"), the_title_attribute( array( "echo" => false ) ) ); ?>"><?php the_title(); ?></a></h3>
197+                               <small><?php the_time( get_option('date_format') ) ?></small>
198 
199                                <div class="entry">
200                                        <?php the_content() ?>
201                                </div>
202 
203-                               <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
204+                               <p class="postmetadata"><?php the_tags( __('Tags') . ': ', ', ', '<br />'); ?> <?php printf( __("Posted in %s"), get_the_category_list(', ') ); ?> | <?php edit_post_link( __('Edit'), '', ' | '); ?>  <?php comments_popup_link( __('No Comments') . ' &#187;', __('1 Comment') . ' &#187;', __('% Comments') . ' &#187;', '', __('Comments Off') . '&#187;' ); ?></p>
205 
206                        </div>
207 
208                <?php endwhile; ?>
209 
210                <div class="navigation">
211-                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
212-                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
213+                       <div class="alignleft"><?php next_posts_link( __('&laquo; Older Entries' ) ) ?></div>
214+                       <div class="alignright"><?php previous_posts_link( __('Newer Entries &raquo;') ) ?></div>
215                </div>
216 
217        <?php else : ?>
218 
219-               <h2 class="center">Not Found</h2>
220+               <h2 class="center"><?php _e("Not Found"); ?></h2>
221                <?php include (TEMPLATEPATH . '/searchform.php'); ?>
222 
223        <?php endif; ?>
224Index: 404.php
225===================================================================
226--- 404.php
227+++ 404.php
228@@ -2,10 +2,10 @@
229 
230        <div id="content" class="narrowcolumn">
231 
232-               <h2 class="center">Error 404 - Not Found</h2>
233+               <h2 class="center"><?php _e("Error 404 - Not Found"); ?></h2>
234 
235        </div>
236 
237Index: searchform.php
238===================================================================
239--- searchform.php
240+++ searchform.php
241@@ -1,6 +1,6 @@
242 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
243 <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
244 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
245-<input type="submit" id="searchsubmit" value="Search" />
246+<input type="submit" id="searchsubmit" value="<?php _e('Search'); ?>" />
247 </div>
248 </form>
249Index: sidebar.php
250===================================================================
251--- sidebar.php
252+++ sidebar.php
253@@ -7,7 +7,7 @@
254                        </li>
255 
256                        <!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
257-                       <li><h2>Author</h2>
258+                       <li><h2><?php _e("Author"); ?></h2>
259                        <p>A little something about you, the author. Nothing lengthy, just an overview.</p>
260                        </li>
261                        -->
262@@ -18,23 +18,19 @@
263 
264                        <?php /* If this is a 404 page */ if (is_404()) { ?>
265                        <?php /* If this is a category archive */ } elseif (is_category()) { ?>
266-                       <p>You are currently browsing the archives for the <?php single_cat_title(''); ?> category.</p>
267+                       <p><?php printf( __("You are currently browsing the archives for the %s category."), single_cat_title( '', false ) ); ?></p>
268 
269-                       <?php /* If this is a yearly archive */ } elseif (is_day()) { ?>
270-                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
271-                       for the day <?php the_time('l, F jS, Y'); ?>.</p>
272+                       <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
273+                       <p><?php printf( _c('You are currently browsing the %1$s blog archives for the day %2$s.|1: blog URL, 2: day'), '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') .'</a>', get_the_time( __('l, F jS, Y') ) ); ?></p>
274 
275                        <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
276-                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
277-                       for <?php the_time('F, Y'); ?>.</p>
278+                       <p><?php printf( _c('You are currently browsing the %1$s blog archives for %2$s.|1: blog URL, 2: month'), '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') .'</a>', get_the_time( __('F, Y') ) ); ?></p>
279 
280                        <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
281-                       <p>You are currently browsing the <a href="<?php bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
282-                       for the year <?php the_time('Y'); ?>.</p>
283+                       <p><?php printf( _c('You are currently browsing the %1$s blog archives for the year %2$s.|1: blog URL, 2: year'), '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') .'</a>', get_the_time( __('Y') ) ); ?></p>
284 
285                        <?php /* If this is a monthly archive */ } elseif (is_search()) { ?>
286-                       <p>You have searched the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives
287-                       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>
288+                       <p><?php printf( _c('You have searched the %1$s blog archives for <strong>\'%2$s\'</strong>. If you are unable to find anything in these search results, you can try one of these links.|1: blog URL, 2: search query'), '<a href="' . get_bloginfo('url') . '/">' . get_bloginfo('name') .'</a>', get_search_query() ); ?></p>
289 
290                        <?php /* If this is a monthly archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
291                        <p>You are currently browsing the <a href="<?php echo bloginfo('url'); ?>/"><?php echo bloginfo('name'); ?></a> blog archives.</p>
292@@ -43,26 +39,26 @@
293 
294                        </li> <?php }?>
295 
296-                       <?php wp_list_pages('title_li=<h2>Pages</h2>' ); ?>
297+                       <?php wp_list_pages('title_li=<h2>' . __('Pages') . '</h2>' ); ?>
298 
299-                       <li><h2>Archives</h2>
300+                       <li><h2><?php _e("Archives"); ?></h2>
301                                <ul>
302                                <?php wp_get_archives('type=monthly'); ?>
303                                </ul>
304                        </li>
305 
306-                       <?php wp_list_categories('show_count=1&title_li=<h2>Categories</h2>'); ?>
307+                       <?php wp_list_categories('show_count=1&title_li=<h2>' . __('Categories') . '</h2>'); ?>
308 
309                        <?php /* If this is the frontpage */ if ( is_home() || is_page() ) { ?>
310                                <?php wp_list_bookmarks(); ?>
311 
312-                               <li><h2>Meta</h2>
313+                               <li><h2><?php _e("Meta"); ?></h2>
314                                <ul>
315                                        <?php wp_register(); ?>
316                                        <li><?php wp_loginout(); ?></li>
317-                                       <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>
318+                                       <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>
319                                        <li><a href="http://gmpg.org/xfn/"><abbr title="XHTML Friends Network">XFN</abbr></a></li>
320-                                       <li><a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform.">WordPress</a></li>
321+                                       <li><a href="http://wordpress.org/" title="<?php _e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WordPress</a></li>
322                                        <?php wp_meta(); ?>
323                                </ul>
324                                </li>
325Index: header.php
326===================================================================
327--- header.php
328+++ header.php
329@@ -4,7 +4,7 @@
330 <head profile="http://gmpg.org/xfn/11">
331 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
332 
333-<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title>
334+<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; <?php _e("Blog Archive"); ?> <?php } ?> <?php wp_title(); ?></title>
335 
336 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
337 <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php bloginfo('rss2_url'); ?>" />
338Index: index.php
339===================================================================
340--- index.php
341+++ index.php
342@@ -7,27 +7,27 @@
343                <?php while (have_posts()) : the_post(); ?>
344 
345                        <div <?php post_class() ?> id="post-<?php the_ID(); ?>">
346-                               <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
347-                               <small><?php the_time('F jS, Y') ?> <!-- by <?php the_author() ?> --></small>
348+                               <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( __("Permanent Link to %s"), the_title_attribute( array( "echo" => false ) ) ); ?>"><?php the_title(); ?></a></h2>
349+                               <small><?php the_time( get_option('date_format') ) ?> <!-- by <?php the_author() ?> --></small>
350 
351                                <div class="entry">
352-                                       <?php the_content('Read the rest of this entry &raquo;'); ?>
353+                                       <?php the_content( __('Read the rest of this entry') . ' &raquo;'); ?>
354                                </div>
355 
356-                               <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
357+                               <p class="postmetadata"><?php the_tags(__('Tags') . ': ', ', ', '<br />'); ?> <?php printf( __("Posted in %s"), get_the_category_list(', ') ); ?> | <?php edit_post_link( __('Edit'), '', ' | '); ?>  <?php comments_popup_link( __('No Comments') . ' &#187;', __('1 Comment') . ' &#187;', __('% Comments') . ' &#187;', '', __('Comments Off') . '&#187;' ); ?></p>
358                        </div>
359 
360                <?php endwhile; ?>
361 
362                <div class="navigation">
363-                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
364-                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
365+                       <div class="alignleft"><?php next_posts_link( __('&laquo; Older Entries') ) ?></div>
366+                       <div class="alignright"><?php previous_posts_link( __('Newer Entries &raquo;') ) ?></div>
367                </div>
368 
369        <?php else : ?>
370 
371-               <h2 class="center">Not Found</h2>
372-               <p class="center">Sorry, but you are looking for something that isn't here.</p>
373+               <h2 class="center"><?php _e("Not Found"); ?></h2>
374+               <p class="center"><?php _e("Sorry, but you are looking for something that isn't here."); ?></p>
375                <?php include (TEMPLATEPATH . "/searchform.php"); ?>
376 
377        <?php endif; ?>
378Index: footer.php
379===================================================================
380--- footer.php
381+++ footer.php
382@@ -3,10 +3,9 @@
383 <div id="footer">
384 <!-- 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. -->
385        <p>
386-               <?php bloginfo('name'); ?> is proudly powered by
387-               <a href="http://wordpress.org/">WordPress</a>
388-               <br /><a href="<?php bloginfo('rss2_url'); ?>">Entries (RSS)</a>
389-               and <a href="<?php bloginfo('comments_rss2_url'); ?>">Comments (RSS)</a>.
390+               <?php printf( _c('%1$s is proudly powered by %2$s|1: blog name, 2: WordPress URL'), get_bloginfo('name'), '<a href="http://wordpress.org/">WordPress</a>' ); ?>.
391+               <br/>
392+               <?php printf( _c('%1$s and %2$s|1: entries RSS, 2: comments RSS'), '<a href="' . get_bloginfo('rss2_url') . '">' . __("Entries (RSS)") . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __("Comments (RSS)") . '</a>' ); ?>.
393                <!-- <?php echo get_num_queries(); ?> queries. <?php timer_stop(1); ?> seconds. -->
394        </p>
395 </div>
396Index: search.php
397===================================================================
398--- search.php
399+++ search.php
400@@ -4,33 +4,33 @@
401 
402        <?php if (have_posts()) : ?>
403 
404-               <h2 class="pagetitle">Search Results</h2>
405+               <h2 class="pagetitle"><?php _e("Search Results"); ?></h2>
406 
407                <div class="navigation">
408-                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
409-                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
410+                       <div class="alignleft"><?php next_posts_link( __('&laquo; Older Entries') ) ?></div>
411+                       <div class="alignright"><?php previous_posts_link( __('Newer Entries &raquo;') ) ?></div>
412                </div>
413 
414 
415                <?php while (have_posts()) : the_post(); ?>
416 
417                        <div <?php post_class() ?>>
418-                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
419-                               <small><?php the_time('l, F jS, Y') ?></small>
420+                               <h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf( __("Permanent Link to %s"), the_title_attribute( array( "echo" => false ) ) ); ?>"><?php the_title(); ?></a></h3>
421+                               <small><?php the_time( get_option('date_format') ) ?></small>
422 
423-                               <p class="postmetadata"><?php the_tags('Tags: ', ', ', '<br />'); ?> Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
424+                               <p class="postmetadata"><?php the_tags(__('Tags') . ': ', ', ', '<br />'); ?> <?php printf( __("Posted in %s"), get_the_category_list(', ') ); ?> | <?php edit_post_link( __('Edit'), '', ' | '); ?>  <?php comments_popup_link( __('No Comments') . ' &#187;', __('1 Comment') . ' &#187;', __('% Comments') . ' &#187;', '', __('Comments Off') . '&#187;' ); ?></p>
425                        </div>
426 
427                <?php endwhile; ?>
428 
429                <div class="navigation">
430-                       <div class="alignleft"><?php next_posts_link('&laquo; Older Entries') ?></div>
431-                       <div class="alignright"><?php previous_posts_link('Newer Entries &raquo;') ?></div>
432+                       <div class="alignleft"><?php next_posts_link( __('&laquo; Older Entries') ) ?></div>
433+                       <div class="alignright"><?php previous_posts_link( __('Newer Entries &raquo;') ) ?></div>
434                </div>
435 
436        <?php else : ?>
437 
438-               <h2 class="center">No posts found. Try a different search?</h2>
439+               <h2 class="center"><?php _e("No posts found. Try a different search?"); ?></h2>
440                <?php include (TEMPLATEPATH . '/searchform.php'); ?>
441 
442        <?php endif; ?>
443Index: links.php
444===================================================================
445--- links.php
446+++ links.php
447@@ -8,7 +8,7 @@
448 
449 <div id="content" class="widecolumn">
450 
451-<h2>Links:</h2>
452+<h2><?php _e("Links"); ?>:</h2>
453 <ul>
454 <?php wp_list_bookmarks(); ?>
455 </ul>
456Index: page.php
457===================================================================
458--- page.php
459+++ page.php
460@@ -6,16 +6,16 @@
461                <div class="post" id="post-<?php the_ID(); ?>">
462                <h2><?php the_title(); ?></h2>
463                        <div class="entry">
464-                               <?php the_content('<p class="serif">Read the rest of this page &raquo;</p>'); ?>
465+                               <?php the_content('<p class="serif">' . __('Read the rest of this page') . ' &raquo;</p>'); ?>
466 
467-                               <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
468+                               <?php wp_link_pages(array('before' => '<p><strong>' . __('Pages') . ':</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
469 
470                        </div>
471                </div>
472                <?php endwhile; endif; ?>
473-       <?php edit_post_link('Edit this entry.', '<p>', '</p>'); ?>
474+       <?php edit_post_link( __('Edit this entry'), '<p>', '.</p>'); ?>
475        </div>
476 
477 <?php get_sidebar(); ?>
478Index: single.php
479===================================================================
480--- single.php
481+++ single.php
482@@ -13,39 +13,36 @@
483                        <h2><?php the_title(); ?></h2>
484 
485                        <div class="entry">
486-                               <?php the_content('<p class="serif">Read the rest of this entry &raquo;</p>'); ?>
487+                               <?php the_content('<p class="serif">' . __('Read the rest of this entry') . ' &raquo;</p>'); ?>
488 
489-                               <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
490-                               <?php the_tags( '<p>Tags: ', ', ', '</p>'); ?>
491+                               <?php wp_link_pages(array('before' => '<p><strong>' . __('Pages') . ':</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
492+                               <?php the_tags( '<p>' . __('Tags') . ': ', ', ', '</p>'); ?>
493 
494                                <p class="postmetadata alt">
495                                        <small>
496-                                               This entry was posted
497                                                <?php /* This is commented, because it requires a little adjusting sometimes.
498                                                        You'll need to download this plugin, and follow the instructions:
499                                                        http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
500                                                        /* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); echo time_since($entry_datetime); echo ' ago'; */ ?>
501-                                               on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?>
502-                                               and is filed under <?php the_category(', ') ?>.
503-                                               You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed.
504+                                               <?php printf( _c('This entry was posted on %1$s at %2$s and is filed under %3$s. You can follow any responses to this entry through the %4$s feed.|1: date, 2: time, 3: categories, 4: comments feed URL'), get_the_time( get_option('date_format') ), get_the_time( get_option('time_format') ), get_the_category_list(', '), '<a href="' . get_post_comments_feed_link() . '">' . __("RSS 2.0") . '</a>' ); ?>
505 
506                                                <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
507                                                        // Both Comments and Pings are open ?>
508-                                                       You can <a href="#respond">leave a response</a>, or <a href="<?php trackback_url(); ?>" rel="trackback">trackback</a> from your own site.
509+                                                       <?php printf( __("You can <a href='#respond'>leave a response</a>, or <a href='%s' rel='trackback'>trackback</a> from your own site"), get_trackback_url() ); ?>.
510 
511                                                <?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
512                                                        // Only Pings are Open ?>
513-                                                       Responses are currently closed, but you can <a href="<?php trackback_url(); ?> " rel="trackback">trackback</a> from your own site.
514+                                                       <?php printf( __("Responses are currently closed, but you can <a href='%s' rel='trackback'>trackback</a> from your own site"), get_trackback_url() ); ?>.
515 
516                                                <?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
517                                                        // Comments are open, Pings are not ?>
518-                                                       You can skip to the end and leave a response. Pinging is currently not allowed.
519+                                                       <?php _e("You can skip to the end and leave a response. Pinging is currently not allowed" ); ?>.
520 
521                                                <?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
522                                                        // Neither Comments, nor Pings are open ?>
523-                                                       Both comments and pings are currently closed.
524+                                                       <?php _e("Both comments and pings are currently closed"); ?>.
525 
526-                                               <?php } edit_post_link('Edit this entry','','.'); ?>
527+                                               <?php } edit_post_link( __('Edit this entry'),'','.'); ?>
528 
529                                        </small>
530                                </p>
531@@ -57,7 +54,7 @@
532 
533        <?php endwhile; else: ?>
534 
535-               <p>Sorry, no posts matched your criteria.</p>
536+               <p><?php _e("Sorry, no posts matched your criteria"); ?>.</p>
537 
538 <?php endif; ?>
539 
540Index: archives.php
541===================================================================
542--- archives.php
543+++ archives.php
544@@ -10,12 +10,12 @@
545 
546 <?php include (TEMPLATEPATH . '/searchform.php'); ?>
547 
548-<h2>Archives by Month:</h2>
549+<h2><?php _e("Archives by Month"); ?>:</h2>
550        <ul>
551                <?php wp_get_archives('type=monthly'); ?>
552        </ul>
553 
554-<h2>Archives by Subject:</h2>
555+<h2><?php _e("Archives by Subject"); ?>:</h2>
556        <ul>
557                 <?php wp_list_categories(); ?>
558        </ul>
559Index: comments-popup.php
560===================================================================
561--- comments-popup.php
562+++ comments-popup.php
563@@ -6,7 +6,7 @@
564 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
565 <html xmlns="http://www.w3.org/1999/xhtml">
566 <head>
567-     <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
568+     <title><?php printf( _c('%1$s - Comments on %2$s|1: blog name, 2: title'), get_option('blogname'), get_the_title() ); ?></title>
569 
570        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
571        <style type="text/css" media="screen">
572@@ -19,12 +19,12 @@
573 
574 <h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
575 
576-<h2 id="comments">Comments</h2>
577+<h2 id="comments"><?php _e("Comments"); ?></h2>
578 
579-<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>
580+<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>
581 
582 <?php if ('open' == $post->ping_status) { ?>
583-<p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
584+<p><?php _e('The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is:'); ?> <em><?php trackback_url() ?></em></p>
585 <?php } ?>
586 
587 <?php
588@@ -42,59 +42,59 @@
589 <?php foreach ($comments as $comment) { ?>
590        <li id="comment-<?php comment_ID() ?>">
591        <?php comment_text() ?>
592-       <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>
593+       <p><cite><?php comment_type( __('Comment'), __('Trackback'), __('Pingback') ); ?> <?php printf( _c('by %1$s &#8212; %2$s @ %3$s|1: author, 2: date, 3: time&link'), get_comment_author_link(), get_comment_date(), '<a href="#comment-' . get_comment_ID() . '">' . get_comment_time() . '</a>' ); ?></cite></p>
594        </li>
595 
596 <?php } // end for each comment ?>
597 </ol>
598 <?php } else { // this is displayed if there are no comments so far ?>
599-       <p>No comments yet.</p>
600+       <p><?php _e("No comments yet."); ?></p>
601 <?php } ?>
602 
603 <?php if ('open' == $post->comment_status) { ?>
604-<h2>Leave a comment</h2>
605-<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>
606+<h2><?php _e("Leave a comment"); ?></h2>
607+<p><?php _e('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>
608 
609 <form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
610 <?php if ( $user_ID ) : ?>
611-       <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a></p>
612+       <p><?php printf( _c('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>|1: profile URL, 2: user name, 3: logout URL'), get_option('siteurl') . "/wp-admin/profile.php", $user_identity, get_option('siteurl') . "/wp-login.php?action=logout" ); ?></p>
613 <?php else : ?>
614        <p>
615          <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
616-          <label for="author">Name</label>
617+          <label for="author"><?php _e("Name"); ?></label>
618        <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
619        <input type="hidden" name="redirect_to" value="<?php echo attribute_escape($_SERVER["REQUEST_URI"]); ?>" />
620        </p>
621 
622        <p>
623          <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
624-          <label for="email">E-mail</label>
625+          <label for="email"><?php _e("E-mail"); ?></label>
626        </p>
627 
628        <p>
629          <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
630-          <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
631+          <label for="url"><?php _e('<abbr title="Universal Resource Locator">URL</abbr>'); ?></label>
632        </p>
633 <?php endif; ?>
634 
635        <p>
636-         <label for="comment">Your Comment</label>
637+         <label for="comment"><?php _e("Your Comment"); ?></label>
638        <br />
639          <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
640        </p>
641 
642        <p>
643-         <input name="submit" type="submit" tabindex="5" value="Say It!" />
644+         <input name="submit" type="submit" tabindex="5" value="<?php _e('Say It!'); ?>" />
645        </p>
646        <?php do_action('comment_form', $post->ID); ?>
647 </form>
648 <?php } else { // comments are closed ?>
649-<p>Sorry, the comment form is closed at this time.</p>
650+<p><?php _e("Sorry, the comment form is closed at this time."); ?></p>
651 <?php }
652 } // end password check
653 ?>
654 
655-<div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
656+<div><strong><a href="javascript:window.close()"><?php _e("Close this window."); ?></a></strong></div>
657 
658 <?php // if you delete this the sky will fall on your head
659 endwhile;
660@@ -102,7 +102,7 @@
661 
662 <!-- // this is just the end of the motor - don't touch that line either :) -->
663 <?php //} ?>
664-<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>
665+<p class="credit"><?php timer_stop(1); ?> <cite><?php printf( __("Powered by %s"), '<a href="http://wordpress.org/" title="' . __('Powered by WordPress, state-of-the-art semantic personal publishing platform.') . '"><strong>WordPress</strong></a>' ); ?></cite></p>
666 <?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
667 <script type="text/javascript">
668 <!--