<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[39326] trunk/src: I18n: Introduce more translator comments for strings that contain placeholders but don't have an accompanying translator comment.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39326">39326</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39326","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-21 02:45:53 +0000 (Mon, 21 Nov 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>I18n: Introduce more translator comments for strings that contain placeholders but don't have an accompanying translator comment.
See <a href="https://core.trac.wordpress.org/ticket/38882">#38882</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemcontrolphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizethemecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-theme-control.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwplinksopmlphp">trunk/src/wp-links-opml.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcwpmailphp">trunk/src/wp-mail.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/admin-header.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,17 +32,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_admin_page_title();
</span><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html( strip_tags( $title ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_network_admin() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_network_admin() ) {
+ /* translators: Network admin screen title. 1: Network name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-elseif ( is_user_admin() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( is_user_admin() ) {
+ /* translators: User dashboard screen title. 1: Network name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_title = get_bloginfo( 'name' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $admin_title == $title )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $admin_title == $title ) {
+ /* translators: Admin screen title. 1: Admin screen name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
+ /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the title tag content for an admin page.
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/edit-form-advanced.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,8 +639,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'auto-draft' != $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span id="last-edit">';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post edited date, 2: Post edited time */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</span>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1248,6 +1248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_type'] = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</span><span class="cx" style="display: block; padding: 0 10px"> $now = current_time('timestamp', 1);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post creation date, 2: Post creation time */
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pid = edit_post( $post_data );
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/includes/dashboard.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,9 +392,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $c_users = get_user_count();
</span><span class="cx" style="display: block; padding: 0 10px"> $c_blogs = get_blog_count();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Number of users on the network */
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Number of sites on the network */
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Text indicating the number of sites on the network, 2: Text indicating the number of users on the network */
</ins><span class="cx" style="display: block; padding: 0 10px"> $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $actions ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/includes/media.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,6 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio track title, 2: artist name */
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: audio track title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%s".' ), $title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,19 +332,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta['year'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta['year'] ) ) {
+ /* translators: Audio file track information. 1: Year of audio track release */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['track_number'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $track_number = explode( '/', $meta['track_number'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $track_number[1] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $track_number[1] ) ) {
+ /* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Audio file track information. 1: Audio track number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta['genre'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta['genre'] ) ) {
+ /* translators: Audio file genre information. 1: Audio genre name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use image exif/iptc data for title and caption defaults if possible.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,14 +175,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $datef = __( 'M j, Y @ H:i' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $post->ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. 1: Date on which the post is currently scheduled to be published */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Scheduled for: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. 1: Date on which the post was published */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Published on: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Publish <b>immediately</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. 1: Date on which the post is to be published */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Schedule for: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // draft, 1 or more saves, date specified
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. 1: Date on which the post is to be published */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Publish on: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $datef, strtotime( $post->post_date ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +197,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['args']['revisions_count'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-revisions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: Post revisions heading. 1: The number of available revisions */
+ printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,6 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Publish box date format, see https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> $datef = __( 'M j, Y @ H:i' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Attachment information. 1: Date the attachment was uploaded */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Uploaded on: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $datef, strtotime( $post->post_date ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-admin/includes/ms.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,10 +29,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file_size = filesize( $file['tmp_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $space_left < $file_size ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Required disk space in kilobytes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Maximum allowed file size in kilobytes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +476,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $space .= __( 'MB' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space ); ?></strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php
+ /* translators: Storage space that's been used. 1: Percentage of used space, 2: Total space allowed in megabytes or gigabytes */
+ printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space );
+ ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/comment-template.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1592,6 +1592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_below' => 'comment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'respond_id' => 'respond',
</span><span class="cx" style="display: block; padding: 0 10px"> 'reply_text' => __( 'Reply' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment reply button text. 1: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'reply_to_text' => __( 'Reply to %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'login_text' => __( 'Log in to Reply' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'max_depth' => 0,
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemcontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-actions description-thin submitbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ( 'post_type' === data.item_type || 'taxonomy' === data.item_type ) && '' !== data.original_title ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="link-to-original">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{ data.original_title }}</a>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: Nav menu item original title. 1: Original title */
+ printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{ data.original_title }}</a>' );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizethemecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-theme-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-theme-control.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/customize/class-wp-customize-theme-control.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="more-details" id="{{ data.theme.id }}-action"><?php _e( 'Live Preview' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.theme.author }}' ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="theme-author"><?php
+ /* translators: Theme author name */
+ printf( _x( 'By %s', 'theme author' ), '{{ data.theme.author }}' );
+ ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.theme.isActiveTheme ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="theme-name" id="{{ data.theme.id }}-name">
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/formatting.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3217,32 +3217,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mins = round( $diff / MINUTE_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $mins <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $mins = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: min=minute */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hours = round( $diff / HOUR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $hours <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $hours = 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in hours. 1: Number of hours */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $days = round( $diff / DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $days <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $days = 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in days. 1: Number of days */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s day', '%s days', $days ), $days );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $weeks = round( $diff / WEEK_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $weeks <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $weeks = 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in weeks. 1: Number of weeks */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $months = round( $diff / MONTH_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $months <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $months = 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in months. 1: Number of months */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s month', '%s months', $months ), $months );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $diff >= YEAR_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $years = round( $diff / YEAR_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $years <= 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $years = 1;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in years. 1: Number of years */
</ins><span class="cx" style="display: block; padding: 0 10px"> $since = sprintf( _n( '%s year', '%s years', $years ), $years );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/general-template.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1461,16 +1461,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_the_archive_title() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_category() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Category archive title. 1: Category name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tag() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Tag archive title. 1: Tag name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_author() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Author archive title. 1: Author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_year() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Yearly archive title. 1: Year */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_month() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Monthly archive title. 1: Month name and year */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_day() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Daily archive title. 1: Date */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tax( 'post_format' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_tax( 'post_format', 'post-format-aside' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,10 +1499,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = _x( 'Chats', 'post format archive title' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_post_type_archive() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post type archive title. 1: Post type name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_tax() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = get_taxonomy( get_queried_object()->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Taxonomy singular name, 2: Current taxonomy term */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Taxonomy term archive title. 1: Taxonomy singular name, 2: Current taxonomy term */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Archives' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2051,6 +2058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $day, $daywithpost ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // any posts today?
</span><span class="cx" style="display: block; padding: 0 10px"> $date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post calendar label. 1: Date */
</ins><span class="cx" style="display: block; padding: 0 10px"> $label = sprintf( __( 'Posts published on %s' ), $date_format );
</span><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" aria-label="%s">%s</a>',
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/pluggable.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1430,8 +1430,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: website name, 2: website IP, 3: website hostname */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1440,8 +1441,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: website name, 2: website IP, 3: website hostname */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1588,40 +1590,55 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trackback':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: website name, 2: website IP, 3: website hostname */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback/comment author URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'pingback':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: website name, 2: website IP, 3: website hostname */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback/comment author URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default: // Comments
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Comment author URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Trackback/pingback/comment author URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Comment text */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. 1: Comment action URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( EMPTY_TRASH_DAYS )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( EMPTY_TRASH_DAYS ) {
+ /* translators: Comment moderation. 1: Comment action URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: Comment moderation. 1: Comment action URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. 1: Comment action URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. 1: Number of comments awaiting approval */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/taxonomy.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2655,10 +2655,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $duplicate && $duplicate->term_id != $term_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If an empty slug was passed or the parent changed, reset the slug to something unique.
</span><span class="cx" style="display: block; padding: 0 10px"> // Otherwise, bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $empty_slug || ( $parent != $term['parent']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $empty_slug || ( $parent != $term['parent']) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $slug = wp_unique_term_slug($slug, (object) $args);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ /* translators: 1: Taxonomy term slug */
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error('duplicate_term_slug', sprintf(__('The slug “%s” is already in use by another term'), $slug));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/update.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,14 +587,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
</span><span class="cx" style="display: block; padding: 0 10px"> $titles = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts['wordpress'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $counts['wordpress'] ) {
+ /* translators: 1: Number of updates available to WordPress */
</ins><span class="cx" style="display: block; padding: 0 10px"> $titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts['plugins'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( $counts['plugins'] ) {
+ /* translators: 1: Number of updates available to plugins */
</ins><span class="cx" style="display: block; padding: 0 10px"> $titles['plugins'] = sprintf( _n( '%d Plugin Update', '%d Plugin Updates', $counts['plugins'] ), $counts['plugins'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts['themes'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( $counts['themes'] ) {
+ /* translators: 1: Number of updates available to themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $titles['themes'] = sprintf( _n( '%d Theme Update', '%d Theme Updates', $counts['themes'] ), $counts['themes'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $counts['translations'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( $counts['translations'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $titles['translations'] = __( 'Translation Updates' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-includes/user.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1823,6 +1823,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pass_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $user['user_email'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User password change notification email subject. 1: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subject' => __( '[%s] Notice of Password Change' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $pass_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1878,6 +1879,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email_change_email = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'to' => $user['user_email'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User email change notification email subject. 1: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'subject' => __( '[%s] Notice of Email Change' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $email_change_text,
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => '',
</span></span></pre></div>
<a id="trunksrcwplinksopmlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-links-opml.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-links-opml.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-links-opml.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <opml version="1.0">
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <title><?php printf( __('Links for %s'), esc_attr(get_bloginfo('name', 'display')) ); ?></title>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <title><?php
+ /* translators: 1: Site name */
+ printf( __('Links for %s'), esc_attr(get_bloginfo('name', 'display')) );
+ ?></title>
</ins><span class="cx" style="display: block; padding: 0 10px"> <dateCreated><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</dateCreated>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-login.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,6 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Password reset email subject. 1: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __('[%s] Password Reset'), $blogname );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-mail.php 2016-11-21 01:51:39 UTC (rev 39325)
+++ trunk/src/wp-mail.php 2016-11-21 02:45:53 UTC (rev 39326)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,6 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $author = trim($line);
</span><span class="cx" style="display: block; padding: 0 10px"> $author = sanitize_email($author);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_email($author) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post author email address */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $userdata = get_user_by('email', $author);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $userdata ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>