<!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>[12789] trunk: i18n fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12789">12789</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-21 21:37:43 +0000 (Thu, 21 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>i18n fixes. Props nbachiyski. fixes <a href="http://trac.wordpress.org/ticket/11954">#11954</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminimportbloggerphp">trunk/wp-admin/import/blogger.php</a></li>
<li><a href="#trunkwpadminimportgreymatterphp">trunk/wp-admin/import/greymatter.php</a></li>
<li><a href="#trunkwpadminimportlivejournalphp">trunk/wp-admin/import/livejournal.php</a></li>
<li><a href="#trunkwpadminimportmtphp">trunk/wp-admin/import/mt.php</a></li>
<li><a href="#trunkwpadminimportrssphp">trunk/wp-admin/import/rss.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminmaintrepairphp">trunk/wp-admin/maint/repair.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesfeedatomcommentsphp">trunk/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/admin-ajax.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> if ( ! $id )
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><del>- $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() );
</del><ins>+ $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="_blank">Please log in again.</a>'), wp_login_url() );
</ins><span class="cx"> $x = new WP_Ajax_Response( array(
</span><span class="cx"> 'what' => 'autosave',
</span><span class="cx"> 'id' => $id,
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx"> $data = '';
</span><span class="cx"> /* translators: draft saved date format, see http://php.net/date */
</span><span class="cx"> $draft_saved_date_format = __('g:i:s a');
</span><del>- $message = sprintf( __('Draft Saved at %s.'), date_i18n( $draft_saved_date_format ) );
</del><ins>+ $message = sprintf( __('Draft saved at %s.'), date_i18n( $draft_saved_date_format ) );
</ins><span class="cx">
</span><span class="cx"> $supplemental = array();
</span><span class="cx"> if ( isset($login_grace_period) )
</span></span></pre></div>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/comment.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<p><?php _e('Are you sure you want to do that?'); ?></p>
</del><ins>+<p><?php _e('Are you sure you want to do this?'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <form action='comment.php' method='get'>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/edit-comments.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> //, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"),
</span><span class="cx"> //, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>")
</span><span class="cx"> $stati = array(
</span><del>- 'all' => _n_noop('All', 'All'), // singular not used
</del><ins>+ 'all' => _nx_noop('All', 'All', 'comments'), // singular not used
</ins><span class="cx"> 'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
</span><span class="cx"> 'approved' => _n_noop('Approved', 'Approved'), // singular not used
</span><span class="cx"> 'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/edit-form-advanced.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -27,12 +27,14 @@
</span><span class="cx"> __('Custom field updated.'),
</span><span class="cx"> __('Custom field deleted.'),
</span><span class="cx"> __('Post updated.'),
</span><ins>+ /* translators: %s: date and time of the revision */
</ins><span class="cx"> isset($_GET['revision']) ? sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
</span><span class="cx"> sprintf( __('Post published. <a href="%s">View post</a>'), get_permalink($post_ID) ),
</span><span class="cx"> __('Post saved.'),
</span><span class="cx"> sprintf( __('Post submitted. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</span><del>- // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
- sprintf( __('Post scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview post</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Post scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview post</a>'),
+ // translators: Publish box date format, see http://php.net/date
+ date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
</ins><span class="cx"> sprintf( __('Post draft updated. <a target="_blank" href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
</span><span class="cx"> );
</span><span class="cx"> $messages['page'] = array(
</span><span class="lines">@@ -44,8 +46,7 @@
</span><span class="cx"> isset($_GET['revision']) ? sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
</span><span class="cx"> sprintf( __('Page published. <a href="%s">View page</a>'), get_permalink($post_ID) ),
</span><span class="cx"> sprintf( __('Page submitted. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ),
</span><del>- // translators: Publish box date format, see http://php.net/date - Same as in meta-boxes.php
- sprintf( __('Page scheduled for: <b>%1$s</b>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
</del><ins>+ sprintf( __('Page scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview page</a>'), date_i18n( __( 'M j, Y @ G:i' ), strtotime( $post->post_date ) ), get_permalink($post_ID) ),
</ins><span class="cx"> sprintf( __('Page draft updated. <a target="_blank" href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) )
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -75,7 +76,7 @@
</span><span class="cx"> if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
</span><span class="cx"> foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
</span><span class="cx"> if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
</span><del>- $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>.' ), get_edit_post_link( $autosave->ID ) );
</del><ins>+ $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/edit.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
</span><del>-<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div>
</del><ins>+<div id="message" class="updated"><p><strong><?php _e('This has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View Post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit Post'); ?></a></p></div>
</ins><span class="cx"> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimportbloggerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/blogger.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/blogger.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/import/blogger.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> $this->save_vars();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user&#8217;s posts to a different WordPress user. You may <a href="users.php">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the &#8220;Restart&#8221; function below.');
</del><ins>+ $directions = sprintf( __('All posts were imported with the current user as author. Use this form to move each Blogger user&#8217;s posts to a different WordPress user. You may <a href="%s">add users</a> and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the &#8220;Restart&#8221; function below.'), 'users.php' );
</ins><span class="cx"> $heading = __('Author mapping');
</span><span class="cx"> $blogtitle = "{$blog['title']} ({$blog['host']})";
</span><span class="cx"> $mapthis = __('Blogger username');
</span></span></pre></div>
<a id="trunkwpadminimportgreymatterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/greymatter.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/greymatter.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/import/greymatter.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> <ul>
</span><span class="cx"> <li><?php _e('Parse gm-counter.cgi, gm-banlist.cgi, gm-cplog.cgi (you can make a CP log hack if you really feel like it, but I question the need of a CP log).') ?></li>
</span><span class="cx"> <li><?php _e('Import gm-templates.') ?></li>
</span><del>-<li><?php _e("Doesn't keep entries on top.")?></li>
</del><ins>+<li><?php _e("Doesn&#8217;t keep entries on top.")?></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> <p>&nbsp;</p>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimportlivejournalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/livejournal.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/livejournal.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/import/livejournal.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> update_option( 'ljapi_maxid', $maxid );
</span><span class="cx"> update_option( 'ljapi_highest_id', $highest_id );
</span><span class="cx">
</span><del>- echo '<p>' . __( ' Comment metadata downloaded successfully, proceeding with comment bodies...' ) . '</p>';
</del><ins>+ echo '<p>' . __( 'Comment metadata downloaded successfully, proceeding with comment bodies...' ) . '</p>';
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportmtphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/mt.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/mt.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/import/mt.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID");
</span><span class="cx"> ?><select name="userselect[<?php echo $n; ?>]">
</span><del>- <option value="#NONE#"><?php _e('- Select -') ?></option>
</del><ins>+ <option value="#NONE#"><?php _e('&mdash; Select &mdash;') ?></option>
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> // Add tags or keywords
</span><span class="cx"> if ( 1 < strlen($post->post_keywords) ) {
</span><span class="cx"> // Keywords exist.
</span><del>- printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords));
</del><ins>+ printf('<br />'.__('Adding tags <em>%s</em>...'), stripslashes($post->post_keywords));
</ins><span class="cx"> wp_add_post_tags($post_id, $post->post_keywords);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminimportrssphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import/rss.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import/rss.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/import/rss.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> if (0 != count($categories))
</span><span class="cx"> wp_create_categories($categories, $post_id);
</span><del>- _e('Done !');
</del><ins>+ _e('Done!');
</ins><span class="cx"> }
</span><span class="cx"> echo '</li>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> function generic_strings() {
</span><span class="cx"> $this->strings['bad_request'] = __('Invalid Data provided.');
</span><span class="cx"> $this->strings['fs_unavailable'] = __('Could not access filesystem.');
</span><del>- $this->strings['fs_error'] = __('Filesystem error');
</del><ins>+ $this->strings['fs_error'] = __('Filesystem error.');
</ins><span class="cx"> $this->strings['fs_no_root_dir'] = __('Unable to locate WordPress Root directory.');
</span><span class="cx"> $this->strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
</span><span class="cx"> $this->strings['fs_no_plugins_dir'] = __('Unable to locate WordPress Plugin directory.');
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> $this->strings['installing_package'] = __('Installing the latest version&#8230;');
</span><span class="cx"> $this->strings['folder_exists'] = __('Destination folder already exists.');
</span><span class="cx"> $this->strings['mkdir_failed'] = __('Could not create directory.');
</span><del>- $this->strings['bad_package'] = __('Incompatible Archive');
</del><ins>+ $this->strings['bad_package'] = __('Incompatible Archive.');
</ins><span class="cx">
</span><span class="cx"> $this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
</span><span class="cx"> $this->strings['maintenance_end'] = __('Disabling Maintenance mode&#8230;');
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> $i = 1;
</span><span class="cx"> foreach ( $plugins as $plugin ) {
</span><span class="cx">
</span><del>- $this->show_before = sprintf( '<h4>' . __('Updating plugin %1$d of %2$d...') . '</h4>', $i, $all );
</del><ins>+ $this->show_before = sprintf( '<h4>' . __('Updating plugin %1$d of %2$d&#8230;') . '</h4>', $i, $all );
</ins><span class="cx"> $i++;
</span><span class="cx">
</span><span class="cx"> if ( !isset( $current->response[ $plugin ] ) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/dashboard.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -582,7 +582,10 @@
</span><span class="cx"> <?php echo get_avatar( $comment, 50 ); ?>
</span><span class="cx">
</span><span class="cx"> <div class="dashboard-comment-wrap">
</span><del>- <h4 class="comment-meta"><?php printf( __( 'From %1$s on %2$s%3$s' ), '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?></h4>
</del><ins>+ <h4 class="comment-meta">
+ <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
+ '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
+ </h4>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> else :
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/file.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -452,15 +452,15 @@
</span><span class="cx"> function download_url( $url ) {
</span><span class="cx"> //WARNING: The file is not automatically deleted, The script must unlink() the file.
</span><span class="cx"> if ( ! $url )
</span><del>- return new WP_Error('http_no_url', __('Invalid URL Provided'));
</del><ins>+ return new WP_Error('http_no_url', __('Invalid URL Provided.'));
</ins><span class="cx">
</span><span class="cx"> $tmpfname = wp_tempnam($url);
</span><span class="cx"> if ( ! $tmpfname )
</span><del>- return new WP_Error('http_no_file', __('Could not create Temporary file'));
</del><ins>+ return new WP_Error('http_no_file', __('Could not create Temporary file.'));
</ins><span class="cx">
</span><span class="cx"> $handle = @fopen($tmpfname, 'wb');
</span><span class="cx"> if ( ! $handle )
</span><del>- return new WP_Error('http_no_file', __('Could not create Temporary file'));
</del><ins>+ return new WP_Error('http_no_file', __('Could not create Temporary file.'));
</ins><span class="cx">
</span><span class="cx"> $response = wp_remote_get($url, array('timeout' => 300));
</span><span class="cx">
</span><span class="lines">@@ -512,10 +512,10 @@
</span><span class="cx">
</span><span class="cx"> // Is the archive valid?
</span><span class="cx"> if ( false == ($archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING)) )
</span><del>- return new WP_Error('incompatible_archive', __('Incompatible archive'), $archive->errorInfo(true));
</del><ins>+ return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
</ins><span class="cx">
</span><span class="cx"> if ( 0 == count($archive_files) )
</span><del>- return new WP_Error('empty_archive', __('Empty archive'));
</del><ins>+ return new WP_Error('empty_archive', __('Empty archive.'));
</ins><span class="cx">
</span><span class="cx"> $path = explode('/', untrailingslashit($to));
</span><span class="cx"> for ( $i = count($path); $i > 0; $i-- ) { //>0 = first element is empty allways for paths starting with '/'
</span><span class="lines">@@ -524,7 +524,7 @@
</span><span class="cx"> for ( $i = $i + 1; $i <= count($path); $i++ ) {
</span><span class="cx"> $tmppath = implode('/', array_slice($path, 0, $i) );
</span><span class="cx"> if ( ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
</span><del>- return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
</del><ins>+ return new WP_Error('mkdir_failed', __('Could not create directory.'), $tmppath);
</ins><span class="cx"> }
</span><span class="cx"> break; //Exit main for loop
</span><span class="cx"> }
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> for ( $i = $i + 1; $i <= count($path); $i++ ) { //< count() no file component please.
</span><span class="cx"> $tmppath = $to . implode('/', array_slice($path, 0, $i) );
</span><span class="cx"> if ( ! $fs->is_dir($tmppath) && ! $fs->mkdir($tmppath, FS_CHMOD_DIR) )
</span><del>- return new WP_Error('mkdir_failed', __('Could not create directory'), $tmppath);
</del><ins>+ return new WP_Error('mkdir_failed', __('Could not create directory.'), $tmppath);
</ins><span class="cx"> }
</span><span class="cx"> break; //Exit main for loop
</span><span class="cx"> }
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> // We've made sure the folders are there, so let's extract the file now:
</span><span class="cx"> if ( ! $file['folder'] ) {
</span><span class="cx"> if ( !$fs->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
</span><del>- return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
</del><ins>+ return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return true;
</span><span class="lines">@@ -581,13 +581,13 @@
</span><span class="cx"> // If copy failed, chmod file to 0644 and try again.
</span><span class="cx"> $wp_filesystem->chmod($to . $filename, 0644);
</span><span class="cx"> if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) )
</span><del>- return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename);
</del><ins>+ return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
</ins><span class="cx"> }
</span><span class="cx"> $wp_filesystem->chmod($to . $filename, FS_CHMOD_FILE);
</span><span class="cx"> } elseif ( 'd' == $fileinfo['type'] ) {
</span><span class="cx"> if ( !$wp_filesystem->is_dir($to . $filename) ) {
</span><span class="cx"> if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
</span><del>- return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
</del><ins>+ return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
</ins><span class="cx"> }
</span><span class="cx"> $result = copy_dir($from . $filename, $to . $filename);
</span><span class="cx"> if ( is_wp_error($result) )
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/image-edit.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> <p><?php _e('Discard any changes and restore the original image.');
</span><span class="cx">
</span><span class="cx"> if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
</span><del>- _e(' Previously edited copies of the image will not be deleted.');
</del><ins>+ echo ' '.__('Previously edited copies of the image will not be deleted.');
</ins><span class="cx">
</span><span class="cx"> ?></p>
</span><span class="cx"> <div class="imgedit-submit">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('(help)'); ?></a>
</span><span class="cx"> <div class="imgedit-help">
</span><span class="cx"> <p><?php _e('The image can be cropped by clicking on it and dragging to select the desired part. While dragging the dimensions of the selection are displayed below.'); ?></p>
</span><del>- <strong><?php _e('Keyboard shortcuts'); ?></strong>
</del><ins>+ <strong><?php _e('Keyboard Shortcuts'); ?></strong>
</ins><span class="cx"> <ul>
</span><span class="cx"> <li><?php _e('Arrow: move by 10px'); ?></li>
</span><span class="cx"> <li><?php _e('Shift + arrow: move by 1px'); ?></li>
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/media.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -819,7 +819,7 @@
</span><span class="cx"> function image_size_input_fields( $post, $check = '' ) {
</span><span class="cx">
</span><span class="cx"> // get a list of the actual pixel dimensions of each possible intermediate version of this image
</span><del>- $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full size'));
</del><ins>+ $size_names = array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size'));
</ins><span class="cx">
</span><span class="cx"> if ( empty($check) )
</span><span class="cx"> $check = get_user_setting('imgsize', 'medium');
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> $html .= "<label for='{$css_id}'>$label</label>";
</span><span class="cx"> // only show the dimensions if that choice is available
</span><span class="cx"> if ( $enabled )
</span><del>- $html .= " <label for='{$css_id}' class='help'>" . sprintf( __("(%d&nbsp;&times;&nbsp;%d)"), $downsize[1], $downsize[2] ). "</label>";
</del><ins>+ $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
</ins><span class="cx">
</span><span class="cx"> $html .= '</div>';
</span><span class="cx">
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx">
</span><span class="cx"> $form_fields['image_alt'] = array(
</span><span class="cx"> 'value' => $alt,
</span><del>- 'label' => __('Alternate text'),
</del><ins>+ 'label' => __('Alternate Text'),
</ins><span class="cx"> 'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1200,7 +1200,7 @@
</span><span class="cx"> $image_edit_button = '';
</span><span class="cx"> if ( gd_edit_image_support( $post->post_mime_type ) ) {
</span><span class="cx"> $nonce = wp_create_nonce( "image_editor-$post->ID" );
</span><del>- $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
</del><ins>+ $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <img src='images/wpspin_light.gif' class='imgedit-wait-spin' alt='' />";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $attachment_url = get_permalink( $attachment_id );
</span><span class="lines">@@ -1772,14 +1772,14 @@
</span><span class="cx"> </th>
</span><span class="cx"> <td class="field">
</span><span class="cx"> <select id="columns" name="columns">
</span><del>- <option value="2"><?php _e('2'); ?></option>
- <option value="3" selected="selected"><?php _e('3'); ?></option>
- <option value="4"><?php _e('4'); ?></option>
- <option value="5"><?php _e('5'); ?></option>
- <option value="6"><?php _e('6'); ?></option>
- <option value="7"><?php _e('7'); ?></option>
- <option value="8"><?php _e('8'); ?></option>
- <option value="9"><?php _e('9'); ?></option>
</del><ins>+ <option value="2">2</option>
+ <option value="3" selected="selected">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
</ins><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> <input name="advanced_view" type="hidden" value="1" />
</span><span class="cx"> <p class="meta-options">
</span><span class="cx"> <label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /><?php _e('Allow Comments.') ?></label><br />
</span><del>- <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /><?php printf( __('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'),_x('http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments','Url to codex article on Managing Comments')); ?></label>
</del><ins>+ <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /><?php printf( __('Allow <a href="%s" target="_blank">trackbacks and pingbacks</a> on this page.'),__('http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments')); ?></label>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -616,13 +616,13 @@
</span><span class="cx"> <fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
</span><span class="cx"> <p><label for="link_target_blank" class="selectit">
</span><span class="cx"> <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
</span><del>-<?php _e('<code>_blank</code> - new window or tab.'); ?></label></p>
</del><ins>+<?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
</ins><span class="cx"> <p><label for="link_target_top" class="selectit">
</span><span class="cx"> <input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
</span><del>-<?php _e('<code>_top</code> - current window or tab, with no frames.'); ?></label></p>
</del><ins>+<?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
</ins><span class="cx"> <p><label for="link_target_none" class="selectit">
</span><span class="cx"> <input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
</span><del>-<?php _e('<code>_none</code> - same window or tab.'); ?></label></p>
</del><ins>+<?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
</ins><span class="cx"> </fieldset>
</span><span class="cx"> <p><?php _e('Choose the target frame for your link.'); ?></p>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/plugin-install.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> function install_plugins_upload( $page = 1 ) {
</span><span class="cx"> ?>
</span><span class="cx"> <h4><?php _e('Install a plugin in .zip format') ?></h4>
</span><del>- <p class="install-help"><?php _e('If you have a plugin in a .zip format, You may install it by uploading it here.') ?></p>
</del><ins>+ <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.') ?></p>
</ins><span class="cx"> <form method="post" enctype="multipart/form-data" action="<?php echo admin_url('update.php?action=upload-plugin') ?>">
</span><span class="cx"> <?php wp_nonce_field( 'plugin-upload') ?>
</span><span class="cx"> <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> endswitch; ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php endif; ?>
</span><del>- <h2 class="mainheader"><?php _e('FYI') ?></h2>
</del><ins>+ <h2 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h2>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php if ( ! empty($api->version) ) : ?>
</span><span class="cx"> <li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/plugin.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
</span><del>- return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
</del><ins>+ return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
</ins><span class="cx">
</span><span class="cx"> //Get the base plugin folder
</span><span class="cx"> $plugins_dir = $wp_filesystem->wp_plugins_dir();
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty($errors) )
</span><del>- return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
</del><ins>+ return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
</ins><span class="cx">
</span><span class="cx"> // Force refresh of plugin update information
</span><span class="cx"> if ( $current = get_site_transient('update_plugins') ) {
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/template.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -1063,7 +1063,7 @@
</span><span class="cx"> if ( $authors && count( $authors ) > 1 ) :
</span><span class="cx"> $users_opt = array('include' => $authors, 'name' => 'post_author', 'class'=> 'authors', 'multi' => 1, 'echo' => 0);
</span><span class="cx"> if ( $bulk )
</span><del>- $users_opt['show_option_none'] = __('- No Change -');
</del><ins>+ $users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
</ins><span class="cx"> $authors_dropdown = '<label>';
</span><span class="cx"> $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
</span><span class="cx"> $authors_dropdown .= wp_dropdown_users( $users_opt );
</span><span class="lines">@@ -1124,7 +1124,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> $dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order, post_title');
</span><span class="cx"> if ( $bulk )
</span><del>- $dropdown_args['show_option_no_change'] = __('- No Change -');
</del><ins>+ $dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
</ins><span class="cx"> $dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
</span><span class="cx"> wp_dropdown_pages($dropdown_args);
</span><span class="cx"> ?>
</span><span class="lines">@@ -1143,7 +1143,7 @@
</span><span class="cx"> <span class="title"><?php _e( 'Template' ); ?></span>
</span><span class="cx"> <select name="page_template">
</span><span class="cx"> <?php if ( $bulk ) : ?>
</span><del>- <option value="-1"><?php _e('- No Change -'); ?></option>
</del><ins>+ <option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
</ins><span class="cx"> <?php endif; // $bulk ?>
</span><span class="cx"> <option value="default"><?php _e( 'Default Template' ); ?></option>
</span><span class="cx"> <?php page_template_dropdown() ?>
</span><span class="lines">@@ -1165,7 +1165,7 @@
</span><span class="cx"> <label class="alignleft">
</span><span class="cx"> <span class="title"><?php _e( 'Comments' ); ?></span>
</span><span class="cx"> <select name="comment_status">
</span><del>- <option value=""><?php _e('- No Change -'); ?></option>
</del><ins>+ <option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
</ins><span class="cx"> <option value="open"><?php _e('Allow'); ?></option>
</span><span class="cx"> <option value="closed"><?php _e('Do not allow'); ?></option>
</span><span class="cx"> </select>
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> <label class="alignright">
</span><span class="cx"> <span class="title"><?php _e( 'Pings' ); ?></span>
</span><span class="cx"> <select name="ping_status">
</span><del>- <option value=""><?php _e('- No Change -'); ?></option>
</del><ins>+ <option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
</ins><span class="cx"> <option value="open"><?php _e('Allow'); ?></option>
</span><span class="cx"> <option value="closed"><?php _e('Do not allow'); ?></option>
</span><span class="cx"> </select>
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx"> <span class="title"><?php _e( 'Status' ); ?></span>
</span><span class="cx"> <select name="_status">
</span><span class="cx"> <?php if ( $bulk ) : ?>
</span><del>- <option value="-1"><?php _e('- No Change -'); ?></option>
</del><ins>+ <option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
</ins><span class="cx"> <?php endif; // $bulk ?>
</span><span class="cx"> <?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
</span><span class="cx"> <option value="publish"><?php _e( 'Published' ); ?></option>
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> <label class="alignright">
</span><span class="cx"> <span class="title"><?php _e( 'Sticky' ); ?></span>
</span><span class="cx"> <select name="sticky">
</span><del>- <option value="-1"><?php _e( '- No Change -' ); ?></option>
</del><ins>+ <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
</ins><span class="cx"> <option value="sticky"><?php _e( 'Sticky' ); ?></option>
</span><span class="cx"> <option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
</span><span class="cx"> </select>
</span><span class="lines">@@ -1964,7 +1964,7 @@
</span><span class="cx"> $r .= "<td $attributes>$user_object->first_name $user_object->last_name</td>";
</span><span class="cx"> break;
</span><span class="cx"> case 'email':
</span><del>- $r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>";
</del><ins>+ $r .= "<td $attributes><a href='mailto:$email' title='" . sprintf( __('E-mail: %s' ), $email ) . "'>$email</a></td>";
</ins><span class="cx"> break;
</span><span class="cx"> case 'role':
</span><span class="cx"> $r .= "<td $attributes>$role_name</td>";
</span><span class="lines">@@ -2146,13 +2146,16 @@
</span><span class="cx"> case 'comment':
</span><span class="cx"> echo "<td $attributes>";
</span><span class="cx"> echo '<div id="submitted-on">';
</span><del>- printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url, get_comment_date( __('Y/m/d') ), get_comment_date( __( 'g:ia' ) ) );
</del><ins>+ /* translators: 2: comment date, 3: comment time */
+ printf( __( '<a href="%1$s">%2$s at %3$s</a>' ), $comment_url,
+ /* translators: comment date format. See http://php.net/date */ get_comment_date( __('Y/m/d') ),
+ /* translators: comment time format. See http://php.net/date */ get_comment_date( get_option( 'time_format' ) ) );
</ins><span class="cx">
</span><span class="cx"> if ( $comment->comment_parent ) {
</span><span class="cx"> $parent = get_comment( $comment->comment_parent );
</span><span class="cx"> $parent_link = esc_url( get_comment_link( $comment->comment_parent ) );
</span><span class="cx"> $name = apply_filters( 'get_comment_author', $parent->comment_author ); // there's no API function for this
</span><del>- printf( __( ' | In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
</del><ins>+ printf( ' | '.__( 'In reply to <a href="%1$s">%2$s</a>.' ), $parent_link, $name );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> echo '</div>';
</span><span class="lines">@@ -2544,7 +2547,7 @@
</span><span class="cx"> if ( $keys )
</span><span class="cx"> natcasesort($keys);
</span><span class="cx"> ?>
</span><del>-<p><strong><?php _e( 'Add new custom field:' ) ?></strong></p>
</del><ins>+<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
</ins><span class="cx"> <table id="newmeta">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -2558,7 +2561,7 @@
</span><span class="cx"> <td id="newmetaleft" class="left">
</span><span class="cx"> <?php if ( $keys ) { ?>
</span><span class="cx"> <select id="metakeyselect" name="metakeyselect" tabindex="7">
</span><del>-<option value="#NONE#"><?php _e( '- Select -' ); ?></option>
</del><ins>+<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> foreach ( $keys as $key ) {
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/includes/theme.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
</span><span class="cx">
</span><span class="cx"> if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
</span><del>- return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
</del><ins>+ return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
</ins><span class="cx">
</span><span class="cx"> //Get the base plugin folder
</span><span class="cx"> $themes_dir = $wp_filesystem->wp_themes_dir();
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> $deleted = $wp_filesystem->delete($theme_dir, true);
</span><span class="cx">
</span><span class="cx"> if ( ! $deleted )
</span><del>- return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s'), $template) );
</del><ins>+ return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $template) );
</ins><span class="cx">
</span><span class="cx"> // Force refresh of theme update information
</span><span class="cx"> delete_site_transient('update_themes');
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/link-manager.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap nosubsub">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
</del><ins>+<h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="button add-new-h2"><?php esc_html_x('Add New', 'link'); ?></a> <?php
</ins><span class="cx"> if ( isset($_GET['s']) && $_GET['s'] )
</span><span class="cx"> printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
</span><span class="cx"> </h2>
</span></span></pre></div>
<a id="trunkwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/maint/repair.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/maint/repair.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> if ( !defined('WP_ALLOW_REPAIR') ) {
</span><del>- _e("<p>To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
</del><ins>+ echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</ins><span class="cx"> } elseif ( isset($_GET['repair']) ) {
</span><span class="cx"> $problems = array();
</span><span class="cx"> check_admin_referer('repair_db');
</span><span class="lines">@@ -66,13 +66,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($problems) ) {
</span><del>- printf(__('<p>Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.</p>'), 'http://wordpress.org/support/forum/3');
</del><ins>+ printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', 'http://wordpress.org/support/forum/3');
</ins><span class="cx"> $problem_output = array();
</span><span class="cx"> foreach ( $problems as $table => $problem )
</span><span class="cx"> $problem_output[] = "$table: $problem";
</span><span class="cx"> echo '<textarea name="errors" id="errors" rows="20" cols="60">' . format_to_edit(implode("\n", $problem_output)) . '</textarea>';
</span><span class="cx"> } else {
</span><del>- _e("<p>Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.</p><code>define('WP_ALLOW_REPAIR', true);</code>");
</del><ins>+ echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/menu.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top', 'menu-links', 'div' );
</span><span class="cx"> $submenu['link-manager.php'][5] = array( __('Edit'), 'manage_links', 'link-manager.php' );
</span><span class="cx"> /* translators: add new links */
</span><del>- $submenu['link-manager.php'][10] = array( _x('Add New', 'links'), 'manage_links', 'link-add.php' );
</del><ins>+ $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
</ins><span class="cx"> $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
</span><span class="cx">
</span><span class="cx"> $menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top', 'menu-pages', 'div' );
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> $menu[60] = array( __('Appearance'), 'switch_themes', 'themes.php', '', 'menu-top', 'menu-appearance', 'div' );
</span><span class="cx"> $submenu['themes.php'][5] = array(__('Themes'), 'switch_themes', 'themes.php');
</span><span class="cx"> if ( !is_multisite() )
</span><del>- $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php');
</del><ins>+ $submenu['themes.php'][10] = array(_x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
</ins><span class="cx"> $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php');
</span><span class="cx">
</span><span class="cx"> $update_plugins = get_site_transient( 'update_plugins' );
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> /* translators: add new plugin */
</span><span class="cx"> $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php');
</span><span class="cx"> if ( !is_multisite() )
</span><del>- $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' );
</del><ins>+ $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( current_user_can('edit_users') )
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php');
</span><span class="cx">
</span><span class="cx"> $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
</span><del>- $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
</del><ins>+ $submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
</ins><span class="cx"> $submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
</span><span class="cx"> $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
</span><span class="cx"> $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/options-discussion.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e('Avatar Display') ?></th>
</span><del>-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar display') ?></span></legend>
</del><ins>+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display') ?></span></legend>
</ins><span class="cx"> <?php
</span><span class="cx"> $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
</span><span class="cx"> foreach ( $yesorno as $key => $value) {
</span><span class="lines">@@ -173,7 +173,16 @@
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating') ?></span></legend>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-$ratings = array( 'G' => __('G &#8212; Suitable for all audiences'), 'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'), 'R' => __('R &#8212; Intended for adult audiences above 17'), 'X' => __('X &#8212; Even more mature than above'));
</del><ins>+$ratings = array(
+ /* translators: Content suitability rating: http://bit.ly/89QxZA */
+ 'G' => __('G &#8212; Suitable for all audiences'),
+ /* translators: Content suitability rating: http://bit.ly/89QxZA */
+ 'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'),
+ /* translators: Content suitability rating: http://bit.ly/89QxZA */
+ 'R' => __('R &#8212; Intended for adult audiences above 17'),
+ /* translators: Content suitability rating: http://bit.ly/89QxZA */
+ 'X' => __('X &#8212; Even more mature than above')
+);
</ins><span class="cx"> foreach ($ratings as $key => $rating) :
</span><span class="cx"> $selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
</span><span class="cx"> echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/options-permalink.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><del>- <th><label for="category_base"><?php _e('Category base'); ?></label></th>
</del><ins>+ <th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
</ins><span class="cx"> <td><?php if ( is_multisite() && !is_subdomain_install() && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) { echo "/blog"; $category_base = str_replace( "/blog", "", $category_base ); }?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/options-reading.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> </label>
</span><span class="cx"> </p>
</span><span class="cx"> <ul>
</span><del>- <li><?php printf("<label for='page_on_front'>" . __('Front page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('- Select -'), 'selected' => get_option('page_on_front') ) ) ); ?></li>
- <li><?php printf("<label for='page_for_posts'>". __('Posts page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_for_posts','echo' => 0, 'show_option_none' => __('- Select -'), 'selected' => get_option('page_for_posts') ) ) ); ?></li>
</del><ins>+ <li><?php printf("<label for='page_on_front'>" . __('Front page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'selected' => get_option('page_on_front') ) ) ); ?></li>
+ <li><?php printf("<label for='page_for_posts'>". __('Posts page: %s') . "</label>", wp_dropdown_pages( array( 'name' => 'page_for_posts','echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'selected' => get_option('page_for_posts') ) ) ); ?></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> <?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
</span><span class="cx"> <div id="front-page-warning" class="updated">
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/options.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !isset( $whitelist_options[ $option_page ] ) )
</span><del>- wp_die( __( 'Error! Options page not found.' ) );
</del><ins>+ wp_die( __( 'Error: options page not found.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( 'options' == $option_page ) {
</span><span class="cx"> $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/plugins.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -183,7 +183,8 @@
</span><span class="cx"> <ul class="ul-disc">
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( $plugin_info as $plugin )
</span><del>- echo '<li>', sprintf(__('<strong>%s</strong> by <em>%s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
</del><ins>+ /* translators: 1: plugin name, 2: plugin author */
+ echo '<li>', sprintf(__('<strong>%1$s</strong> by <em>%2$s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
</ins><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <p><?php _e('Are you sure you wish to delete these files?') ?></p>
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/press-this.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="posting">
</span><span class="cx"> <?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
</span><del>- <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
</del><ins>+ <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div id="titlediv">
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/themes.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> else if ( empty($update['package']) )
</span><span class="cx"> printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> <em>automatic upgrade unavailable for this theme</em>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
</span><span class="cx"> else
</span><del>- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s >upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
</del><ins>+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/update.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> $submenu_file = 'theme-install.php';
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><del>- $title = sprintf( __('Installing theme: %s'), $api->name . ' ' . $api->version );
</del><ins>+ $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
</ins><span class="cx"> $nonce = 'install-theme_' . $theme;
</span><span class="cx"> $url = 'update.php?action=install-theme&theme=' . $theme;
</span><span class="cx"> $type = 'web'; //Install theme type, From Web or an Upload.
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/user-edit.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -232,12 +232,12 @@
</span><span class="cx"> <?php endif; //!IS_PROFILE_PAGE ?>
</span><span class="cx">
</span><span class="cx"> <tr>
</span><del>- <th><label for="first_name"><?php _e('First name') ?></label></th>
</del><ins>+ <th><label for="first_name"><?php _e('First Name') ?></label></th>
</ins><span class="cx"> <td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr>
</span><del>- <th><label for="last_name"><?php _e('Last name') ?></label></th>
</del><ins>+ <th><label for="last_name"><?php _e('Last Name') ?></label></th>
</ins><span class="cx"> <td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/user-new.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php if ( apply_filters('show_password_fields', true) ) : ?>
</span><span class="cx"> <tr class="form-field form-required">
</span><del>- <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php _e('(twice, required)'); ?></span></label></th>
</del><ins>+ <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(twice, required)'); ?></span></label></th>
</ins><span class="cx"> <td><input name="pass1" type="password" id="pass1" autocomplete="off" />
</span><span class="cx"> <br />
</span><span class="cx"> <input name="pass2" type="password" id="pass2" autocomplete="off" />
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-admin/widgets.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> }
</span><span class="cx"> $selected = '';
</span><span class="cx"> echo "\t\t<select name='{$sbname}_position'>\n";
</span><del>- echo "\t\t<option value=''>" . __('-- select --') . "</option>\n";
</del><ins>+ echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
</ins><span class="cx"> for ( $i = 1; $i <= $j; $i++ ) {
</span><span class="cx"> if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
</span><span class="cx"> $selected = selected( $i, $key + 1, false );
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/comment-template.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -962,7 +962,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( post_password_required() ) {
</span><del>- echo __('Enter your password to view comments');
</del><ins>+ echo __('Enter your password to view comments.');
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1282,7 +1282,12 @@
</span><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','') ?></div>
</del><ins>+ <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
+ <?php
+ /* translators: 1: date, 2: time */
+ printf( __('%1$s at %2$s'), get_comment_date(), get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),'&nbsp;&nbsp;','' );
+ ?>
+ </div>
</ins><span class="cx">
</span><span class="cx"> <?php comment_text() ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/default-widgets.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> <textarea class="widefat" rows="16" cols="20" id="<?php echo $this->get_field_id('text'); ?>" name="<?php echo $this->get_field_name('text'); ?>"><?php echo $text; ?></textarea>
</span><span class="cx">
</span><del>- <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs.'); ?></label></p>
</del><ins>+ <p><input id="<?php echo $this->get_field_id('filter'); ?>" name="<?php echo $this->get_field_name('filter'); ?>" type="checkbox" <?php checked(isset($instance['filter']) ? $instance['filter'] : 0); ?> />&nbsp;<label for="<?php echo $this->get_field_id('filter'); ?>"><?php _e('Automatically add paragraphs'); ?></label></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed-atom-comments.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed-atom-comments.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/feed-atom-comments.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> >
</span><span class="cx"> <title type="text"><?php
</span><span class="cx"> if ( is_singular() )
</span><del>- printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
</del><ins>+ printf(ent2ncr(__('Comments on %s')), get_the_title_rss());
</ins><span class="cx"> elseif ( is_search() )
</span><span class="cx"> printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), esc_attr(get_search_query()));
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/formatting.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -1770,6 +1770,7 @@
</span><span class="cx"> if ($mins <= 1) {
</span><span class="cx"> $mins = 1;
</span><span class="cx"> }
</span><ins>+ /* translators: min=minute */
</ins><span class="cx"> $since = sprintf(_n('%s min', '%s mins', $mins), $mins);
</span><span class="cx"> } else if (($diff <= 86400) && ($diff > 3600)) {
</span><span class="cx"> $hours = round($diff / 3600);
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/functions.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -1641,7 +1641,7 @@
</span><span class="cx">
</span><span class="cx"> $hook = 'do_feed_' . $feed;
</span><span class="cx"> if ( !has_action($hook) ) {
</span><del>- $message = sprintf( __( 'ERROR: %s is not a valid feed template' ), esc_html($feed));
</del><ins>+ $message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
</ins><span class="cx"> wp_die($message);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -39,15 +39,15 @@
</span><span class="cx"> more_colors:"' . mce_escape( __('More colors') ) . '"
</span><span class="cx"> },
</span><span class="cx"> contextmenu:{
</span><del>-align:"' . mce_escape( __('Alignment') ) . '",
-left:"' . mce_escape( __('Left') ) . '",
-center:"' . mce_escape( __('Center') ) . '",
-right:"' . mce_escape( __('Right') ) . '",
-full:"' . mce_escape( __('Full') ) . '"
</del><ins>+align:"' . mce_escape( /* translators: alignment */ __('Alignment') ) . '",
+left:"' . mce_escape( /* translators: alignment */ __('Left') ) . '",
+center:"' . mce_escape( /* translators: alignment */ __('Center') ) . '",
+right:"' . mce_escape( /* translators: alignment */ __('Right') ) . '",
+full:"' . mce_escape( /* translators: alignment */ __('Full') ) . '"
</ins><span class="cx"> },
</span><span class="cx"> insertdatetime:{
</span><del>-date_fmt:"' . mce_escape( __('%Y-%m-%d') ) . '",
-time_fmt:"' . mce_escape( __('%H:%M:%S') ) . '",
</del><ins>+date_fmt:"' . mce_escape( /* translators: year, month, date */ __('%Y-%m-%d') ) . '",
+time_fmt:"' . mce_escape( /* translators: hours, minutes, seconds */ __('%H:%M:%S') ) . '",
</ins><span class="cx"> insertdate_desc:"' . mce_escape( __('Insert date') ) . '",
</span><span class="cx"> inserttime_desc:"' . mce_escape( __('Insert time') ) . '",
</span><span class="cx"> months_long:"' . mce_escape( __('January').','.__('February').','.__('March').','.__('April').','.__('May').','.__('June').','.__('July').','.__('August').','.__('September').','.__('October').','.__('November').','.__('December') ) . '",
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> no_mpell:"' . mce_escape( __('No misspellings found.') ) . '"
</span><span class="cx"> },
</span><span class="cx"> pagebreak:{
</span><del>-desc:"' . mce_escape( __('Insert page break.') ) . '"
</del><ins>+desc:"' . mce_escape( __('Insert Page Break') ) . '"
</ins><span class="cx"> }}});
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("' . $language . '.advanced",{
</span><span class="lines">@@ -202,10 +202,10 @@
</span><span class="cx"> italic_desc:"' . mce_escape( __('Italic') ) . ' (Ctrl / Alt+Shift + I)",
</span><span class="cx"> underline_desc:"' . mce_escape( __('Underline') ) . '",
</span><span class="cx"> striketrough_desc:"' . mce_escape( __('Strikethrough') ) . ' (Alt+Shift+D)",
</span><del>-justifyleft_desc:"' . mce_escape( __('Align left') ) . ' (Alt+Shift+L)",
-justifycenter_desc:"' . mce_escape( __('Align center') ) . ' (Alt+Shift+C)",
-justifyright_desc:"' . mce_escape( __('Align right') ) . ' (Alt+Shift+R)",
-justifyfull_desc:"' . mce_escape( __('Align full') ) . ' (Alt+Shift+J)",
</del><ins>+justifyleft_desc:"' . mce_escape( __('Align Left') ) . ' (Alt+Shift+L)",
+justifycenter_desc:"' . mce_escape( __('Align Center') ) . ' (Alt+Shift+C)",
+justifyright_desc:"' . mce_escape( __('Align Right') ) . ' (Alt+Shift+R)",
+justifyfull_desc:"' . mce_escape( __('Align Full') ) . ' (Alt+Shift+J)",
</ins><span class="cx"> bullist_desc:"' . mce_escape( __('Unordered list') ) . ' (Alt+Shift+U)",
</span><span class="cx"> numlist_desc:"' . mce_escape( __('Ordered list') ) . ' (Alt+Shift+O)",
</span><span class="cx"> outdent_desc:"' . mce_escape( __('Outdent') ) . '",
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> enablejavascript:"' . mce_escape( __('Enable JavaScript') ) . '",
</span><span class="cx"> starttime:"' . mce_escape( __('Start time') ) . '",
</span><span class="cx"> endtime:"' . mce_escape( __('End time') ) . '",
</span><del>-href:"' . mce_escape( __('Href') ) . '",
</del><ins>+href:"' . mce_escape( __('href') ) . '",
</ins><span class="cx"> qtsrcchokespeed:"' . mce_escape( __('Choke speed') ) . '",
</span><span class="cx"> target:"' . mce_escape( __('Target') ) . '",
</span><span class="cx"> volume:"' . mce_escape( __('Volume') ) . '",
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("' . $language . '.wordpress",{
</span><span class="cx"> wp_adv_desc:"' . mce_escape( __('Show/Hide Kitchen Sink') ) . ' (Alt+Shift+Z)",
</span><del>-wp_more_desc:"' . mce_escape( __('Insert More tag') ) . ' (Alt+Shift+T)",
</del><ins>+wp_more_desc:"' . mce_escape( __('Insert More Tag') ) . ' (Alt+Shift+T)",
</ins><span class="cx"> wp_page_desc:"' . mce_escape( __('Insert Page break') ) . ' (Alt+Shift+P)",
</span><span class="cx"> wp_help_desc:"' . mce_escape( __('Help') ) . ' (Alt+Shift+H)",
</span><span class="cx"> wp_more_alt:"' . mce_escape( __('More...') ) . '",
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -210,10 +210,10 @@
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> if ( ! tinymce.isWebKit )
</span><span class="cx"> document.write("<tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>"+
</span><del>- "<tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Header 1') ?></td></tr>"+
- "<tr><th>2</th><td><?php _e('Header 2') ?></td><th>3</th><td><?php _e('Header 3') ?></td></tr>"+
- "<tr><th>4</th><td><?php _e('Header 4') ?></td><th>5</th><td><?php _e('Header 5') ?></td></tr>"+
- "<tr><th>6</th><td><?php _e('Header 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>")
</del><ins>+ "<tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>"+
+ "<tr><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>"+
+ "<tr><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>"+
+ "<tr><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>")
</ins><span class="cx"> </script>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/link-template.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> if ( empty($link) )
</span><span class="cx"> $link = __('Edit This');
</span><span class="cx">
</span><del>- $link = '<a href="' . get_edit_tag_link( $tag->term_id ) . '" title="' . __( 'Edit tag' ) . '">' . $link . '</a>';
</del><ins>+ $link = '<a href="' . get_edit_tag_link( $tag->term_id ) . '" title="' . __( 'Edit Tag' ) . '">' . $link . '</a>';
</ins><span class="cx"> echo $before . apply_filters( 'edit_tag_link', $link, $tag->term_id ) . $after;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> if ( null === $link )
</span><span class="cx"> $link = __('Edit This');
</span><span class="cx">
</span><del>- $link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( __( 'Edit post' ) ) . '">' . $link . '</a>';
</del><ins>+ $link = '<a class="post-edit-link" href="' . $url . '" title="' . esc_attr( __( 'Edit Post' ) ) . '">' . $link . '</a>';
</ins><span class="cx"> echo $before . apply_filters( 'edit_post_link', $link, $post->ID ) . $after;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -841,7 +841,7 @@
</span><span class="cx"> if ( empty($link) )
</span><span class="cx"> $link = __('Edit This');
</span><span class="cx">
</span><del>- $link = '<a href="' . get_edit_bookmark_link( $link ) . '" title="' . __( 'Edit link' ) . '">' . $link . '</a>';
</del><ins>+ $link = '<a href="' . get_edit_bookmark_link( $link ) . '" title="' . __( 'Edit Link' ) . '">' . $link . '</a>';
</ins><span class="cx"> echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2010-01-21 20:31:21 UTC (rev 12788)
+++ trunk/wp-includes/locale.php 2010-01-21 21:37:43 UTC (rev 12789)
</span><span class="lines">@@ -105,65 +105,65 @@
</span><span class="cx"> */
</span><span class="cx"> function init() {
</span><span class="cx"> // The Weekdays
</span><del>- $this->weekday[0] = __('Sunday');
- $this->weekday[1] = __('Monday');
- $this->weekday[2] = __('Tuesday');
- $this->weekday[3] = __('Wednesday');
- $this->weekday[4] = __('Thursday');
- $this->weekday[5] = __('Friday');
- $this->weekday[6] = __('Saturday');
</del><ins>+ $this->weekday[0] = /* translators: weekday */ __('Sunday');
+ $this->weekday[1] = /* translators: weekday */ __('Monday');
+ $this->weekday[2] = /* translators: weekday */ __('Tuesday');
+ $this->weekday[3] = /* translators: weekday */ __('Wednesday');
+ $this->weekday[4] = /* translators: weekday */ __('Thursday');
+ $this->weekday[5] = /* translators: weekday */ __('Friday');
+ $this->weekday[6] = /* translators: weekday */ __('Saturday');
</ins><span class="cx">
</span><span class="cx"> // The first letter of each day. The _%day%_initial suffix is a hack to make
</span><span class="cx"> // sure the day initials are unique.
</span><del>- $this->weekday_initial[__('Sunday')] = __('S_Sunday_initial');
- $this->weekday_initial[__('Monday')] = __('M_Monday_initial');
- $this->weekday_initial[__('Tuesday')] = __('T_Tuesday_initial');
- $this->weekday_initial[__('Wednesday')] = __('W_Wednesday_initial');
- $this->weekday_initial[__('Thursday')] = __('T_Thursday_initial');
- $this->weekday_initial[__('Friday')] = __('F_Friday_initial');
- $this->weekday_initial[__('Saturday')] = __('S_Saturday_initial');
</del><ins>+ $this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial');
+ $this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial');
+ $this->weekday_initial[__('Tuesday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Tuesday_initial');
+ $this->weekday_initial[__('Wednesday')] = /* translators: one-letter abbreviation of the weekday */ __('W_Wednesday_initial');
+ $this->weekday_initial[__('Thursday')] = /* translators: one-letter abbreviation of the weekday */ __('T_Thursday_initial');
+ $this->weekday_initial[__('Friday')] = /* translators: one-letter abbreviation of the weekday */ __('F_Friday_initial');
+ $this->weekday_initial[__('Saturday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Saturday_initial');
</ins><span class="cx">
</span><span class="cx"> foreach ($this->weekday_initial as $weekday_ => $weekday_initial_) {
</span><span class="cx"> $this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Abbreviations for each day.
- $this->weekday_abbrev[__('Sunday')] = __('Sun');
- $this->weekday_abbrev[__('Monday')] = __('Mon');
- $this->weekday_abbrev[__('Tuesday')] = __('Tue');
- $this->weekday_abbrev[__('Wednesday')] = __('Wed');
- $this->weekday_abbrev[__('Thursday')] = __('Thu');
- $this->weekday_abbrev[__('Friday')] = __('Fri');
- $this->weekday_abbrev[__('Saturday')] = __('Sat');
</del><ins>+ // Abbreviations for each day.
+ $this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun');
+ $this->weekday_abbrev[__('Monday')] = /* translators: three-letter abbreviation of the weekday */ __('Mon');
+ $this->weekday_abbrev[__('Tuesday')] = /* translators: three-letter abbreviation of the weekday */ __('Tue');
+ $this->weekday_abbrev[__('Wednesday')] = /* translators: three-letter abbreviation of the weekday */ __('Wed');
+ $this->weekday_abbrev[__('Thursday')] = /* translators: three-letter abbreviation of the weekday */ __('Thu');
+ $this->weekday_abbrev[__('Friday')] = /* translators: three-letter abbreviation of the weekday */ __('Fri');
+ $this->weekday_abbrev[__('Saturday')] = /* translators: three-letter abbreviation of the weekday */ __('Sat');
</ins><span class="cx">
</span><span class="cx"> // The Months
</span><del>- $this->month['01'] = __('January');
- $this->month['02'] = __('February');
- $this->month['03'] = __('March');
- $this->month['04'] = __('April');
- $this->month['05'] = __('May');
- $this->month['06'] = __('June');
- $this->month['07'] = __('July');
- $this->month['08'] = __('August');
- $this->month['09'] = __('September');
- $this->month['10'] = __('October');
- $this->month['11'] = __('November');
- $this->month['12'] = __('December');
</del><ins>+ $this->month['01'] = /* translators: month name */ __('January');
+ $this->month['02'] = /* translators: month name */ __('February');
+ $this->month['03'] = /* translators: month name */ __('March');
+ $this->month['04'] = /* translators: month name */ __('April');
+ $this->month['05'] = /* translators: month name */ __('May');
+ $this->month['06'] = /* translators: month name */ __('June');
+ $this->month['07'] = /* translators: month name */ __('July');
+ $this->month['08'] = /* translators: month name */ __('August');
+ $this->month['09'] = /* translators: month name */ __('September');
+ $this->month['10'] = /* translators: month name */ __('October');
+ $this->month['11'] = /* translators: month name */ __('November');
+ $this->month['12'] = /* translators: month name */ __('December');
</ins><span class="cx">
</span><span class="cx"> // Abbreviations for each month. Uses the same hack as above to get around the
</span><span class="cx"> // 'May' duplication.
</span><del>- $this->month_abbrev[__('January')] = __('Jan_January_abbreviation');
- $this->month_abbrev[__('February')] = __('Feb_February_abbreviation');
- $this->month_abbrev[__('March')] = __('Mar_March_abbreviation');
- $this->month_abbrev[__('April')] = __('Apr_April_abbreviation');
- $this->month_abbrev[__('May')] = __('May_May_abbreviation');
- $this->month_abbrev[__('June')] = __('Jun_June_abbreviation');
- $this->month_abbrev[__('July')] = __('Jul_July_abbreviation');
- $this->month_abbrev[__('August')] = __('Aug_August_abbreviation');
- $this->month_abbrev[__('September')] = __('Sep_September_abbreviation');
- $this->month_abbrev[__('October')] = __('Oct_October_abbreviation');
- $this->month_abbrev[__('November')] = __('Nov_November_abbreviation');
- $this->month_abbrev[__('December')] = __('Dec_December_abbreviation');
</del><ins>+ $this->month_abbrev[__('January')] = /* translators: three-letter abbreviation of the month */ __('Jan_January_abbreviation');
+ $this->month_abbrev[__('February')] = /* translators: three-letter abbreviation of the month */ __('Feb_February_abbreviation');
+ $this->month_abbrev[__('March')] = /* translators: three-letter abbreviation of the month */ __('Mar_March_abbreviation');
+ $this->month_abbrev[__('April')] = /* translators: three-letter abbreviation of the month */ __('Apr_April_abbreviation');
+ $this->month_abbrev[__('May')] = /* translators: three-letter abbreviation of the month */ __('May_May_abbreviation');
+ $this->month_abbrev[__('June')] = /* translators: three-letter abbreviation of the month */ __('Jun_June_abbreviation');
+ $this->month_abbrev[__('July')] = /* translators: three-letter abbreviation of the month */ __('Jul_July_abbreviation');
+ $this->month_abbrev[__('August')] = /* translators: three-letter abbreviation of the month */ __('Aug_August_abbreviation');
+ $this->month_abbrev[__('September')] = /* translators: three-letter abbreviation of the month */ __('Sep_September_abbreviation');
+ $this->month_abbrev[__('October')] = /* translators: three-letter abbreviation of the month */ __('Oct_October_abbreviation');
+ $this->month_abbrev[__('November')] = /* translators: three-letter abbreviation of the month */ __('Nov_November_abbreviation');
+ $this->month_abbrev[__('December')] = /* translators: three-letter abbreviation of the month */ __('Dec_December_abbreviation');
</ins><span class="cx">
</span><span class="cx"> foreach ($this->month_abbrev as $month_ => $month_abbrev_) {
</span><span class="cx"> $this->month_abbrev[$month_] = preg_replace('/_.+_abbreviation$/', '', $month_abbrev_);
</span></span></pre>
</div>
</div>
</body>
</html>