<!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>[42827] trunk/src: I18N: Use the actual placeholder instead of a number in translator comments if the corresponding string does not use numbered placeholders.</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/42827">42827</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/42827","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-11 16:43:59 +0000 (Sun, 11 Mar 2018)</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: Use the actual placeholder instead of a number in translator comments if the corresponding string does not use numbered placeholders.
Add missing translator comments in `WP_Theme_Install_List_Table` and `wp_notify_postauthor()`.
Add missing commas in some translator comments.
Fixes <a href="https://core.trac.wordpress.org/ticket/43523">#43523</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.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="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcurlphp">trunk/src/wp-includes/class-wp-http-curl.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.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="#trunksrcwpincludesfeedatomcommentsphp">trunk/src/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunksrcwpincludesfeedrss2commentsphp">trunk/src/wp-includes/feed-rss2-comments.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="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.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="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.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="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.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>
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/admin-header.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,18 +35,18 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Network admin screen title. 1: Network name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Network admin screen title. %s: 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><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_user_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: User dashboard screen title. 1: Network name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User dashboard screen title. %s: 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><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_title = get_bloginfo( 'name' );
</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 ( $admin_title == $title ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Admin screen title. 1: Admin screen name */
- $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Admin screen title. %s: Admin screen name */
+ $admin_title = sprintf( __( '%s — WordPress' ), $title );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></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-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/edit-comments.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_count = wp_count_comments( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comments_count->moderated > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comments count 2: post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: comments count, 2: post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Comments (%1$s) on “%2$s”' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $comments_count->moderated ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkupgraderskinphp"></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/class-bulk-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,10 +41,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Title of an update, 2: Error message */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_failed'] = __( 'The update of %1$s failed.' );
- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Title of an update */
+ $this->upgrader->strings['skin_update_failed'] = __( 'The update of %s failed.' );
+ /* translators: %s: Title of an update */
+ $this->upgrader->strings['skin_update_successful'] = __( '%s updated successfully.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_upgrade_end'] = __( 'All updates have been completed.' );
</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="trunksrcwpadminincludesclasslanguagepackupgraderphp"></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/class-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mo || ! $po ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: .po 2: .mo */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: .po, 2: .mo */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'The language pack is missing either the %1$s or %2$s files.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.po</code>',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,25 +504,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $status['status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $status['url'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Plugin name and version. */
- $action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = sprintf(
+ '<a class="install-now button" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>',
+ esc_attr( $plugin['slug'] ),
+ esc_url( $status['url'] ),
+ /* translators: %s: plugin name and version */
+ esc_attr( sprintf( __( 'Install %s now' ), $name ) ),
+ esc_attr( $name ),
+ __( 'Install Now' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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"> case 'update_available':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $status['url'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Plugin name and version */
- $action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = sprintf(
+ '<a class="update-now button aria-button-if-js" data-plugin="%s" data-slug="%s" href="%s" aria-label="%s" data-name="%s">%s</a>',
+ esc_attr( $status['file'] ),
+ esc_attr( $plugin['slug'] ),
+ esc_url( $status['url'] ),
+ /* translators: %s: plugin name and version */
+ esc_attr( sprintf( __( 'Update %s now' ), $name ) ),
+ esc_attr( $name ),
+ __( 'Update Now' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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"> case 'latest_installed':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'newer_installed':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_plugin_active( $status['file'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = sprintf(
+ '<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
+ _x( 'Active', 'plugin' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $button_text = __( 'Activate' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Plugin name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: plugin name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $button_label = _x( 'Activate %s', 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $button_text = __( 'Network Activate' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Plugin name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: plugin name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $button_label = _x( 'Network Activate %s', 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +564,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $button_text
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Installed', 'plugin' ) . '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = sprintf(
+ '<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
+ _x( 'Installed', 'plugin' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,8 +578,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '&TB_iframe=true&width=600&height=550'
</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">- /* translators: 1: Plugin name and version. */
- $action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $action_links[] = sprintf(
+ '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+ esc_url( $details_link ),
+ /* translators: %s: plugin name and version */
+ esc_attr( sprintf( __( 'More information about %s' ), $name ) ),
+ esc_attr( $name ),
+ __( 'More Details' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $plugin['icons']['svg'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_icon_url = $plugin['icons']['svg'];
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></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/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,6 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $name = wp_kses( $theme->name, $themes_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> $author = wp_kses( $theme->author, $themes_allowedtags );
</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: %s: theme name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_title = sprintf( __( 'Preview “%s”' ), $name );
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,19 +293,41 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update_available':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions[] = sprintf(
+ '<a class="install-now" href="%s" title="%s">%s</a>',
+ esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+ /* translators: %s: theme version */
+ esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
+ __( 'Update' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'newer_installed':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'latest_installed':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions[] = sprintf(
+ '<span class="install-now" title="%s">%s</span>',
+ esc_attr__( 'This theme is already installed and is up to date' ),
+ _x( 'Installed', 'theme' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions[] = sprintf(
+ '<a class="install-now" href="%s" title="%s">%s</a>',
+ esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+ /* translators: %s: theme name */
+ esc_attr( sprintf( __( 'Install %s' ), $name ) ),
+ __( 'Install Now' )
+ );
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions[] = sprintf(
+ '<a class="install-theme-preview" href="%s" title="%s">%s</a>',
+ esc_url( $preview_url ),
+ /* translators: %s: theme name */
+ esc_attr( sprintf( __( 'Preview %s' ), $name ) ),
+ __( 'Preview' )
+ );
</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 install action links for a theme in the Install Themes list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +346,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php echo $name; ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="theme-author"><?php
+ /* translators: %s: theme author */
+ printf( __( 'By %s' ), $author );
+ ?></div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="action-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,20 +447,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update_available':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<a class="theme-install button button-primary" href="%s" title="%s">%s</a>',
+ esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ),
+ /* translators: %s: theme version */
+ esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ),
+ __( 'Update' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'newer_installed':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'latest_installed':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<span class="theme-install" title="%s">%s</span>',
+ esc_attr__( 'This theme is already installed and is up to date' ),
+ _x( 'Installed', 'theme' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<a class="theme-install button button-primary" href="%s">%s</a>',
+ esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
+ __( 'Install' )
+ );
</ins><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><span class="cx" style="display: block; padding: 0 10px"> <h3 class="theme-name"><?php echo $name; ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="theme-by"><?php
+ /* translators: %s: theme author */
+ printf( __( 'By %s' ), $author );
+ ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $theme->screenshot_url ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/media.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</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 ( ! empty( $meta['year'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Audio file track information. 1: Year of audio track release */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Audio file track information. %d: Year of audio track release */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
</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">@@ -358,13 +358,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks */
</span><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><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Audio file track information. 1: Audio track number */
- $content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Audio file track information. %s: Audio track number */
+ $content .= ' ' . sprintf( __( 'Track %s.' ), number_format_i18n( $track_number[0] ) );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['genre'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Audio file genre information. 1: Audio genre name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Audio file genre information. %s: Audio genre name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
</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="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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,19 +198,19 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post date information. 1: Date on which the post is currently scheduled to be published */
- $stamp = __( 'Scheduled for: <b>%1$s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. %s: Date on which the post is currently scheduled to be published */
+ $stamp = __( 'Scheduled for: <b>%s</b>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post date information. 1: Date on which the post was published */
- $stamp = __( 'Published on: <b>%1$s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. %s: Date on which the post was published */
+ $stamp = __( 'Published on: <b>%s</b>' );
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post date information. 1: Date on which the post is to be published */
- $stamp = __( 'Schedule for: <b>%1$s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. %s: Date on which the post is to be published */
+ $stamp = __( 'Schedule for: <b>%s</b>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else { // draft, 1 or more saves, date specified
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post date information. 1: Date on which the post is to be published */
- $stamp = __( 'Publish on: <b>%1$s</b>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post date information. %s: Date on which the post is to be published */
+ $stamp = __( 'Publish on: <b>%s</b>' );
</ins><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="cx" style="display: block; padding: 0 10px"> } else { // draft (no saves, and thus no date specified)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="misc-pub-section misc-pub-revisions">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post revisions heading. 1: The number of available revisions */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post revisions heading. %s: The number of available revisions */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><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></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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/ms.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,13 +32,13 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Required disk space in kilobytes */
- $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: required disk space in kilobytes */
+ $file['error'] = sprintf( __( 'Not enough space to upload. %s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
</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"> if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Maximum allowed file size in kilobytes */
- $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: maximum allowed file size in kilobytes */
+ $file['error'] = sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
</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"> if ( upload_is_user_over_quota( false ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/network.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: site url 2: host name 3. www */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site url, 2: host name, 3: www */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . substr( $hostname, 4 ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $hostname . '</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: localhost 2: localhost.localdomain */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: localhost, 2: localhost.localdomain */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>localhost</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>localhost.localdomain</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,7 +436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $home_path . '.htaccess' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<strong>' . __( 'Caution:' ) . '</strong> ';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php 2: .htaccess */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: .htaccess */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'We recommend you back up your existing %1$s and %2$s files.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.htaccess</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( file_exists( $home_path . 'web.config' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<strong>' . __( 'Caution:' ) . '</strong> ';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php 2: web.config */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: web.config */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'We recommend you back up your existing %1$s and %2$s files.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<strong>' . __( 'Caution:' ) . '</strong> ';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'We recommend you back up your existing %s file.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $location_of_wp_config . '</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,13 +523,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $num_keys_salts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'This unique authentication key is also missing from your %s file.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'These unique authentication keys are also missing from your %s file.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: a filename like .htaccess. 2: a file path. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: a filename like .htaccess, 2: a file path */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $home_path . '</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +640,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: a filename like .htaccess. 2: a file path. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: a filename like .htaccess, 2: a file path */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>.htaccess</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . $home_path . '</code>'
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/template.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2202,7 +2202,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> 'convert_to_screen(), add_meta_box()',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-admin/includes/template.php 2: add_meta_box() 3: add_meta_boxes */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-admin/includes/template.php, 2: add_meta_box(), 3: add_meta_boxes */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Likely direct inclusion of %1$s in order to use %2$s. This is very wrong. Hook the %2$s call into the %3$s action instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-admin/includes/template.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>add_meta_box()</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2285,11 +2285,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $empty_stars = 5 - $full_stars - $half_stars;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['number'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: The rating, 2: The number of ratings */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: the rating, 2: the number of ratings */
</ins><span class="cx" style="display: block; padding: 0 10px"> $format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: The rating */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: the rating */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
</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="trunksrcwpadminincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/includes/user.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_created_user_email( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $roles = get_editable_roles();
</span><span class="cx" style="display: block; padding: 0 10px"> $role = $roles[ $_REQUEST['role'] ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Site name, 2: site URL, 3: role */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site name, 2: site URL, 3: role */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Hi,
</span></span></pre></div>
<a id="trunksrcwpadminmaintrepairphp"></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/maint/repair.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/maint/repair.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/maint/repair.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Translators: 1: wp-config.php; 2: Secret key service URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: secret key service URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['repair'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></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/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/network/settings.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="description">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: NOBLOGREDIRECT, 2: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>NOBLOGREDIRECT</code>',
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/plugins.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,7 +463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $invalid as $plugin_file => $error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="error"><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin file 2: error message */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin file, 2: error message */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $plugin_file ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> $error->get_error_message()
</span></span></pre></div>
<a id="trunksrcwpadminrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/revision.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/revision.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,8 +88,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_edit_link = get_edit_post_link();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_title = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
- $h1 = sprintf( __( 'Compare Revisions of “%1$s”' ), $post_title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: post title */
+ $h1 = sprintf( __( 'Compare Revisions of “%s”' ), $post_title );
</ins><span class="cx" style="display: block; padding: 0 10px"> $return_to_post = '<a href="' . $post_edit_link . '">' . __( '← Return to editor' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Revisions' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/setup-config.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php 2: install.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: install.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The file %1$s already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'install.php'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php 2: install.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: install.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The file %1$s already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'install.php'
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-admin/user-edit.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -675,7 +675,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><button type="button" class="button" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: User's display name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: user's display name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,7 +947,7 @@
</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"> $data = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %1$s is the post type name and %2$s is the error message. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: post type name, 2: error message */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => sprintf( __( '%1$s could not be created: %2$s' ), $singular_name, $error->get_error_message() ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,7 +981,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button-link item-add">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="screen-reader-text">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Title of a menu item, 2: Type of a menu item */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: title of a menu item, 2: type of a menu item */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcurlphp"></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/class-wp-http-curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-curl.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/class-wp-http-curl.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->stream_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http_request_failed', sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: fopen() 2: file name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: fopen(), 2: file name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not open handle for %1$s to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fopen()',
</span><span class="cx" style="display: block; padding: 0 10px"> $r['filename']
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpstreamsphp"></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/class-wp-http-streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-streams.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $stream_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'http_request_failed', sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: fopen() 2: file name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: fopen(), 2: file name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Could not open handle for %1$s to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'fopen()',
</span><span class="cx" style="display: block; padding: 0 10px"> $r['filename']
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/comment-template.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,7 +1540,7 @@
</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 ( false === $more ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Number of comments 2: post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: number of comments, 2: post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
</span><span class="cx" style="display: block; padding: 0 10px"> $more = sprintf( $more, number_format_i18n( $number ), $title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1629,7 +1629,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment reply button text. 1: Comment author name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment reply button text. %s: 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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-control.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Nav menu item original title. 1: Original title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Nav menu item original title. %s: Original title */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Original: %s' ), '<a class="original-link" href="{{ data.url }}">{{ data.original_title }}</a>' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpincludesfeedatomcommentsphp"></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/feed-atom-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom-comments.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/feed-atom-comments.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <title type="text">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comments feed title. 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comments feed title. %s: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_search() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Comments feed title. 1: Site name, 2: Search query */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comments feed title. 1: Site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comments feed title. %s: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
</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">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Individual comment title. 1: Post title, 2: Comment author name */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment author title. 1: Comment author name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment author title. %s: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
</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="trunksrcwpincludesfeedrss2commentsphp"></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/feed-rss2-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2-comments.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/feed-rss2-comments.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,13 +35,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <title>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comments feed title. 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comments feed title. %s: Post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_search() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Comments feed title. 1: Site name, 2: Search query */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comments feed title. 1: Site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comments feed title. %s: Site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
</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">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Individual comment title. 1: Post title, 2: Comment author name */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment author title. 1: Comment author name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment author title. %s: Comment author name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
</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="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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/formatting.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3558,42 +3558,42 @@
</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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in minutes (min=minute). %s: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in hours. 1: Number of hours */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in hours. %s: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in days. 1: Number of days */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in days. %s: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in weeks. 1: Number of weeks */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in weeks. %s: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in months. 1: Number of months */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in months. %s: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Time difference between two dates, in years. 1: Number of years */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Time difference between two dates, in years. %s: 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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/general-template.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1490,22 +1490,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Category archive title. 1: Category name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Category archive title. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Tag archive title. 1: Tag name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Tag archive title. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Author archive title. 1: Author name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Author archive title. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Yearly archive title. 1: Year */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Yearly archive title. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Monthly archive title. 1: Month name and year */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Monthly archive title. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Daily archive title. 1: Date */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Daily archive title. %s: 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">@@ -1528,7 +1528,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post type archive title. 1: Post type name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post type archive title. %s: 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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2140,7 +2140,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Post calendar label. 1: Date */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Post calendar label. %s: 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="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/load.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,7 +487,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $prefix ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: $table_prefix 2: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: $table_prefix, 2: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>$table_prefix</code>',
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></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/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/ms-functions.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2161,7 +2161,8 @@
</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 ( strlen( $upload['bits'] ) > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: maximum allowed file size in kilobytes */
+ return sprintf( __( 'This file is too big. Files must be less than %s KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
</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"> return $upload;
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/pluggable.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,33 +1523,41 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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: Trackback/pingback website name, 2: website IP address, 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 address, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP address: %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: %s: 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: %s: 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"> $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: blog name, 2: post title */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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: Trackback/pingback website name, 2: website IP address, 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 address, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP address: %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: %s: 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: %s: 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"> $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: blog name, 2: post title */
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf( __( '[%1$s] Pingback: "%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"> default: // Comments
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: post title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
</span><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Author: %1$s (IP address: %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: %s: comment author email */
</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: %s: 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: %s: 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"> $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: blog name, 2: post title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1561,10 +1569,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( EMPTY_TRASH_DAYS ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: 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->comment_ID}#wpbody-content" ) ) . "\r\n";
</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: Comment moderation. %s: 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->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. %s: 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->comment_ID}#wpbody-content" ) ) . "\r\n";
</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">@@ -1687,55 +1698,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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: Trackback/pingback website name, 2: website IP address, 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 address, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Trackback/pingback/comment author URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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: Trackback/pingback website name, 2: website IP address, 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 address, 3: website hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Trackback/pingback/comment author URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Post title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: comment author name, 2: comment author's IP address, 3: comment author's hostname */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Comment author URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: comment author email */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Trackback/pingback/comment author URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Comment text */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment moderation. 1: Comment action URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: 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><span class="cx" style="display: block; padding: 0 10px"> if ( EMPTY_TRASH_DAYS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment moderation. 1: Comment action URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: 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><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment moderation. 1: Comment action URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: 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><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">- /* translators: Comment moderation. 1: Comment action URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Comment moderation. 1: Number of comments awaiting approval */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Comment moderation. %s: Number of comments awaiting approval */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Currently %s comment is waiting for approval. Please visit the moderation panel:',
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/taxonomy.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2849,7 +2849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $empty_slug || ( $parent != $term['parent'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = wp_unique_term_slug( $slug, (object) $args );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Taxonomy term slug */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: 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><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="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/theme.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2537,7 +2537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'title-tag':
</span><span class="cx" style="display: block; padding: 0 10px"> // Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( did_action( 'wp_loaded' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Theme support 2: hook name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: title-tag, 2: wp_loaded */
</ins><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> "add_theme_support( 'title-tag' )", sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/update.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,15 +665,15 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( $counts['wordpress'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Number of updates available to WordPress */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $counts['plugins'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Number of updates available to plugins */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $counts['themes'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Number of updates available to themes */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: 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><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $counts['translations'] ) {
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/user.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1952,7 +1952,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: User password change notification email subject. 1: Site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User password change notification email subject. %s: 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">@@ -2009,7 +2009,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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: User email change notification email subject. 1: Site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: User email change notification email subject. %s: 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="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></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/widgets/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ! data.alt && data.currentFilename ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="hidden" id="{{ describedById }}">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: placeholder is image filename */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: image filename */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( __( 'Current image: %s' ), '{{ data.currentFilename }}' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></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/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-includes/wp-db.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1648,7 +1648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = '<h1>' . __( 'Error establishing a database connection' ) . "</h1>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message .= '<p>' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: wp-config.php. 2: database host */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config.php, 2: database host */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'This either means that the username and password information in your %1$s file is incorrect or we can’t contact the database server at %2$s. This could mean your host’s database server is down.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-links-opml.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><span class="cx" style="display: block; padding: 0 10px"> <title>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Site name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site name */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Links for %s' ), esc_attr( get_bloginfo( 'name', 'display' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </title>
</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 2018-03-11 10:34:10 UTC (rev 42826)
+++ trunk/src/wp-login.php 2018-03-11 16:43:59 UTC (rev 42827)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,7 +954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If cookies are disabled we can't log in even with a valid user+pass
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Browser cookie documentation URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Browser cookie documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'test_cookie', sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
</span></span></pre>
</div>
</div>
</body>
</html>