<!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>[45926] trunk/src: I18N: Improve translator comments.</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 { white-space: pre-line; 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/45926">45926</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/45926","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>2019-09-01 17:12:43 +0000 (Sun, 01 Sep 2019)</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: Improve translator comments.
* Add missing translator comments.
* Fix placement of some translator comments. Translator comments should be on the line directly above the line containing the translation function call for optimal compatibility with various `.pot` file generation tools. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translator comments.
Includes minor code layout fixes.
Polyglots, rejoice! All WordPress core files now have translator comments for all strings with placeholders!
Props jrf, subrataemfluence, GaryJ, webdados, Dency, swissspidy, alvarogois, marcomartins, mihaiiceyro, vladwtz, niq1982, flipkeijzer, michielatyoast, chandrapatel, thrijith, joshuanoyce, FesoVik, tessak22, bhaktirajdev, cleancoded, dhavalkasvala, garrett-eclipse, bibliofille, socalchristina, priyankkpatel, 5hel2l2y, adamsilverstein, JeffPaul, pierlo, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/44360">#44360</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.php</a></li>
<li><a href="#trunksrcwpadminadminfooterphp">trunk/src/wp-admin/admin-footer.php</a></li>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditlinkformphp">trunk/src/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminfreedomsphp">trunk/src/wp-admin/freedoms.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkpluginupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkthemeupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderskinphp">trunk/src/wp-admin/includes/class-language-pack-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassplugininstallerskinphp">trunk/src/wp-admin/includes/class-plugin-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasspluginupgraderskinphp">trunk/src/wp-admin/includes/class-plugin-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeinstallerskinphp">trunk/src/wp-admin/includes/class-theme-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderskinphp">trunk/src/wp-admin/includes/class-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpprivacyrequeststablephp">trunk/src/wp-admin/includes/class-wp-privacy-requests-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.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="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworkmenuphp">trunk/src/wp-admin/network/menu.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesauthortemplatephp">trunk/src/wp-includes/author-template.php</a></li>
<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercommentphp">trunk/src/wp-includes/class-walker-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpdatequeryphp">trunk/src/wp-includes/class-wp-date-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludesrestapiclasswprestrequestphp">trunk/src/wp-includes/rest-api/class-wp-rest-request.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatcommentsphp">trunk/src/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatsidebarphp">trunk/src/wp-includes/theme-compat/sidebar.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp">trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphp">trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminaboutphp"></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/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/about.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_plugins' ) ) {
</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: link to /wp-admin/site-health.php 2: link to /wp-admin/site-health.php?tab=debug */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: link to /wp-admin/site-health.php, 2: link to /wp-admin/site-health.php?tab=debug */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( ' <a href="%1$s">Check your site status</a>, and <a href="%2$s">learn how to debug issues</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'site-health.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'site-health.php?tab=debug' )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,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: wp_body_open 2: <body> */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp_body_open, 2: <body> */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '5.2 introduces a %1$s hook, which lets themes support injecting code right at the beginning of the %2$s element.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_body_open</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code><body></code>'
</span></span></pre></div>
<a id="trunksrcwpadminadminfooterphp"></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-footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-footer.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/admin-footer.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="footer-left" class="alignleft">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: https://wordpress.org/ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( 'Thank you for creating with <a href="%s">WordPress</a>.' ), __( 'https://wordpress.org/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the "Thank you" text displayed in the admin footer.
</span></span></pre></div>
<a id="trunksrcwpadminadminphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/admin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,6 +258,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 ( ! ( file_exists( WP_PLUGIN_DIR . "/$plugin_page" ) && is_file( WP_PLUGIN_DIR . "/$plugin_page" ) ) && ! ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) && is_file( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Admin page generated by a plugin. */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'Cannot load %s.' ), htmlentities( $plugin_page ) ) );
</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="trunksrcwpadminasyncuploadphp"></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/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/async-upload.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,10 +92,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = media_handle_upload( 'async-upload', $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div class="error-div error">
- <button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __( 'Dismiss' ) . '</button>
- <strong>' . sprintf( __( '“%s” has failed to upload.' ), esc_html( $_FILES['async-upload']['name'] ) ) . '</strong><br />' .
- esc_html( $id->get_error_message() ) . '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<div class="error-div error">%s <strong>%s</strong><br />%s</div>',
+ sprintf(
+ '<button type="button" class="dismiss button-link" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">%s</button>',
+ __( 'Dismiss' )
+ ),
+ sprintf(
+ /* translators: %s: Name of the file that failed to upload. */
+ __( '“%s” has failed to upload.' ),
+ esc_html( $_FILES['async-upload']['name'] )
+ ),
+ esc_html( $id->get_error_message() )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</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="trunksrcwpadmincommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/comment.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,8 +204,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Submitted on' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</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: comment date, 2: comment time */
</del><span class="cx" style="display: block; padding: 0 10px"> $submitted = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: comment date, 2: comment time */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s at %2$s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: comment date format. See https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> get_comment_date( __( 'Y/m/d' ), $comment ),
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></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/customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/customize.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/customize.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,6 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="accordion-section-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="preview-notice">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site title */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
</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="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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/edit-comments.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,15 +152,15 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf(
</span><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"> __( 'Comments (%1$s) on “%2$s”' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $comments_count->moderated ),
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_or_post_title
</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">- /* translators: %s: post title */
</del><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf(
</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"> __( 'Comments on “%s”' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_or_post_title
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,8 +168,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_count = wp_count_comments();
</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: %s: comments count */
</del><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: comments count */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Comments (%s)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $comments_count->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="wp-heading-inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: link to post */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: link to post */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Comments on “%s”' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s">%2$s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,8 +243,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="subtitle">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: search keywords */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: search keywords */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Search results for “%s”' ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,34 +282,34 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $approved > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments approved */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
</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 ( $spammed > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments marked as spam */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
</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 ( $unspammed > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments restored from the spam */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
</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 ( $trashed > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments moved to the Trash */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
</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 ( $untrashed > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments restored from the Trash */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
</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 ( $deleted > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments permanently deleted */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
</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="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/edit-form-advanced.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,6 +180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 6 => __( 'Post published.' ) . $view_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 7 => __( 'Post saved.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 8 => __( 'Post submitted.' ) . $preview_post_link_html,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: scheduled date for the post */
</ins><span class="cx" style="display: block; padding: 0 10px"> 9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Post draft updated.' ) . $preview_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,6 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 6 => __( 'Page published.' ) . $view_page_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 7 => __( 'Page saved.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 8 => __( 'Page submitted.' ) . $preview_page_link_html,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: scheduled date for the page */
</ins><span class="cx" style="display: block; padding: 0 10px"> 9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Page draft updated.' ) . $preview_page_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +240,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice = sprintf(
+ /* translators: %s: URL to view the autosave */
+ __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ),
+ get_edit_post_link( $autosave->ID )
+ );
</ins><span class="cx" 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="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +298,11 @@
</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"> get_current_screen()->set_help_sidebar(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( 'You can also create posts with the <a href="%s">Press This bookmarklet</a>.' ), 'tools.php' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: %s: URL to Press This bookmarklet */
+ __( 'You can also create posts with the <a href="%s">Press This bookmarklet</a>.' ),
+ 'tools.php'
+ ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/article/wordpress-editor/">Documentation on Writing and Editing Posts</a>' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,8 +369,11 @@
</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 ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Featured Image */
- $publish_box .= '<li>' . sprintf( __( '<strong>%s</strong> — This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $publish_box .= '<li>' . sprintf(
+ /* translators: %s: Featured Image */
+ __( '<strong>%s</strong> — This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ),
+ esc_html( $post_type_object->labels->featured_image )
+ ) . '</li>';
</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"> $publish_box .= '</ul>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +590,15 @@
</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"> <table id="post-status-info"><tbody><tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td id="wp-word-count" class="hide-if-no-js"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td id="wp-word-count" class="hide-if-no-js">
+ <?php
+ printf(
+ /* translators: %s: Number of words */
+ __( 'Word count: %s' ),
+ '<span class="word-count">0</span>'
+ );
+ ?>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="autosave-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="autosave-message"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadmineditlinkformphp"></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-link-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-link-form.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/edit-link-form.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,11 +12,13 @@
</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( $link_id ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to Links screen */
</ins><span class="cx" style="display: block; padding: 0 10px"> $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submit_text = __( 'Update Link' );
</span><span class="cx" style="display: block; padding: 0 10px"> $form_name = 'editlink';
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce_action = 'update-bookmark_' . $link_id;
</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: %s: URL to Links screen */
</ins><span class="cx" style="display: block; padding: 0 10px"> $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submit_text = __( 'Add Link' );
</span><span class="cx" style="display: block; padding: 0 10px"> $form_name = 'addlink';
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></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-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/edit-tags.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $help = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'category' == $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $help = '<p>' . sprintf( __( 'You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your <a href="%s">writing settings</a>.' ), 'options-writing.php' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $help = '<p>' . sprintf(
+ /* translators: %s: URL to Writing Settings screen */
+ __( 'You can use categories to define sections of your site and group related posts. The default category is “Uncategorized” until you change it in your <a href="%s">writing settings</a>.' ),
+ 'options-writing.php'
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'link_category' == $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,13 +600,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'import' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: %s: URL to Categories to Tags Converter tool */
+ __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ),
+ esc_url( $import_link )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="form-wrap edit-term-notes">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p>
+ <?php
+ printf(
+ /* translators: %s: URL to Categories to Tags Converter tool */
+ __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ),
+ esc_url( $import_link )
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/edit.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,26 +314,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['post'] = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['page'] = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['wp_block'] = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of blocks */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s block updated.', '%s blocks updated.', $bulk_counts['updated'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) : _n( '%s block not updated, somebody is editing it.', '%s blocks not updated, somebody is editing them.', $bulk_counts['locked'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 block not updated, somebody is editing it.' ) :
+ /* translators: %s: number of blocks */
+ _n( '%s block not updated, somebody is editing it.', '%s blocks not updated, somebody is editing them.', $bulk_counts['locked'] ),
+ /* translators: %s: number of blocks */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n( '%s block permanently deleted.', '%s blocks permanently deleted.', $bulk_counts['deleted'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of blocks */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => _n( '%s block moved to the Trash.', '%s blocks moved to the Trash.', $bulk_counts['trashed'] ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of blocks */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'untrashed' => _n( '%s block restored from the Trash.', '%s blocks restored from the Trash.', $bulk_counts['untrashed'] ),
</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="trunksrcwpadminfreedomsphp"></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/freedoms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/freedoms.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/freedoms.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
</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: %s: https://wordpress.org/about/license/ */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: URL to Plugins screen, 2: URL to Themes screen, 3: https://wordpress.org/about/license/ */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it’s GPL</a> first. If they don’t respect the WordPress license, we don’t recommend them.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_url,
</span><span class="cx" style="display: block; padding: 0 10px"> $themes_url,
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/import.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,11 @@
</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 ( current_user_can( 'install_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>' . sprintf( __( 'If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.' ), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . sprintf(
+ /* translators: %s: URL to Add Plugins screen */
+ __( 'If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.' ),
+ esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) )
+ ) . '</p>';
</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></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +314,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $users as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return[] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: user_login, 2: user_email */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user login, 2: user email address */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label' => sprintf( _x( '%1$s (%2$s)', 'user autocomplete result' ), $user->user_login, $user->user_email ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $user->$field,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,12 +454,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_comments_text' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments approved */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment', '%s Comments', $counts->approved ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->approved )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment in moderation', '%s Comments in moderation', $counts->moderated ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment in moderation', '%s Comments in moderation', $counts->moderated ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,8 +913,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %d: comment ID */
- 'id' => new WP_Error( 'invalid_comment', sprintf( __( 'Comment %d does not exist' ), $id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id' => new WP_Error(
+ 'invalid_comment',
+ /* translators: %d: comment ID */
+ sprintf( __( 'Comment %d does not exist' ), $id )
+ ),
</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"> $x->send();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,12 +1304,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response['supplemental'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_comments_text' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments approved */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment', '%s Comments', $counts->approved ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->approved )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment in moderation', '%s Comments in moderation', $counts->moderated ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1914,10 +1917,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
</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: %s: user who is currently editing the post */
</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"> $msg_template = __( 'Saving is disabled: %s is currently editing this post.' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $_POST['post_type'] == 'page' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: user who is currently editing the page */
</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"> $msg_template = __( 'Saving is disabled: %s is currently editing this page.' );
</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">@@ -2626,7 +2630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_id = get_post_meta( $post_id, '_edit_last', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: display_name of last user, 2: date of last edit, 3: time of last edit. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user's display name, 2: date of last edit, 3: time of last edit. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_edited = sprintf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), $last_date, $last_time );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: date of last edit, 2: time of last edit. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3480,7 +3484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'not-embeddable',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: URL which cannot be embedded, between code tags */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL that could not be embedded */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => sprintf( __( '%s failed to embed.' ), '<code>' . esc_html( $url ) . '</code>' ),
</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="trunksrcwpadminincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/bookmark.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = network_admin_url( 'plugin-install.php?tab=search&s=Link+Manager' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: URL of link manager plugin */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to install the Link Manager plugin */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
</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="trunksrcwpadminincludesclassbulkpluginupgraderskinphp"></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-plugin-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-plugin-upgrader-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-bulk-plugin-upgrader-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: name of plugin being updated, 2: number of updating plugin, 3: total number of plugins being updated */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin name, 2: number of the plugin, 3: total number of plugins being updated */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
</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">@@ -43,10 +43,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function bulk_footer() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::bulk_footer();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_actions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
- 'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugins_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'plugins.php' ),
+ __( 'Return to Plugins page' )
+ ),
+ 'updates_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'update-core.php' ),
+ __( 'Return to WordPress Updates page' )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'activate_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $update_actions['plugins_page'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkthemeupgraderskinphp"></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-theme-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-theme-upgrader-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-bulk-theme-upgrader-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_strings() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::add_strings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: name of theme being updated, 2: number of updating themes, 3: total number of themes being updated */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: number of the theme, 3: total number of themes being updated */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Theme %1$s (%2$d/%3$d)' );
</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">@@ -43,10 +43,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function bulk_footer() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::bulk_footer();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $update_actions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
- 'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'themes_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'themes.php' ),
+ __( 'Return to Themes page' )
+ ),
+ 'updates_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'update-core.php' ),
+ __( 'Return to WordPress Updates page' )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $update_actions['themes_page'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustombackgroundphp"></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-custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-custom-background.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -229,10 +229,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info hide-if-no-customize">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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">- printf(
- __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%1$s">Customizer</a>.' ),
- admin_url( 'customize.php?autofocus[control]=background_image' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: URL to background image configuration in Customizer */
+ __( 'You can now manage and live-preview Custom Backgrounds in the <a href="%s">Customizer</a>.' ),
+ admin_url( 'customize.php?autofocus[control]=background_image' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +241,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $this->updated ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ /* translators: %s: Home URL */
+ printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustomimageheaderphp"></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-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'set-header-text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Header Text' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: %s: URL to General Settings screen */
+ __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%s">General Settings</a> section.' ),
+ admin_url( 'options-general.php' )
+ ) .
+ '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Don’t forget to click “Save Changes” when you’re done!' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,10 +478,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-info hide-if-no-customize">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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">- printf(
- __( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
- admin_url( 'customize.php?autofocus[control]=header_image' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: URL to header image configuration in Customizer */
+ __( 'You can now manage and live-preview Custom Header in the <a href="%s">Customizer</a>.' ),
+ admin_url( 'customize.php?autofocus[control]=header_image' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +490,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $this->updated ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ /* translators: %s: Home URL */
+ printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,6 +551,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: image width in pixels, 2: image height in pixels */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Images of exactly <strong>%1$d × %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,6 +734,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $default_color ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Default text color */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
</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="trunksrcwpadminincludesclasslanguagepackupgraderskinphp"></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-skin.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-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="update-messages lp-show-latest">';
</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: name of project, 2: language */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: project name (plugin, theme, or WordPress), 2: language */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( '<h2>' . __( 'Updating translations for %1$s (%2$s)…' ) . '</h2>', $name, $this->language_update->language );
</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">@@ -70,9 +70,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function bulk_footer() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->decrement_update_count( 'translation' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions = array();
- $update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions = array(
+ 'updates_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'update-core.php' ),
+ __( 'Return to WordPress Updates page' )
+ ),
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the list of action links available following a translations update.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassplugininstallerskinphp"></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-plugin-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function before() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->api ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: name of API, 2: version of API */
- $this->upgrader->strings['process_success'] = sprintf( __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' ), $this->api->name, $this->api->version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->upgrader->strings['process_success'] = sprintf(
+ /* translators: 1: plugin name, 2: plugin version */
+ __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' ),
+ $this->api->name,
+ $this->api->version
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,26 +61,58 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'import' == $from ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin & Run Importer' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['activate_plugin'] = sprintf(
+ '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+ wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+ __( 'Activate Plugin & Run Importer' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'press-this' == $from ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&from=press-this&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin & Return to Press This' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['activate_plugin'] = sprintf(
+ '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+ wp_nonce_url( 'plugins.php?action=activate&from=press-this&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+ __( 'Activate Plugin & Return to Press This' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['activate_plugin'] = sprintf(
+ '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+ wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+ __( 'Activate Plugin' )
+ );
</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 ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['network_activate'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['network_activate'] = sprintf(
+ '<a class="button button-primary" href="%s" target="_parent">%s</a>',
+ wp_nonce_url( 'plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
+ __( 'Network Activate' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $install_actions['activate_plugin'] );
</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 ( 'import' == $from ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['importers_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ admin_url( 'import.php' ),
+ __( 'Return to Importers' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $this->type == 'web' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['plugins_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'plugin-install.php' ),
+ __( 'Return to Plugin Installer' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'upload' == $this->type && 'plugins' == $from ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '">' . __( 'Return to Plugin Installer' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['plugins_page'] = sprintf(
+ '<a href="%s">%s</a>',
+ self_admin_url( 'plugin-install.php' ),
+ __( 'Return to Plugin Installer' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['plugins_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'plugins.php' ),
+ __( 'Return to Plugins page' )
+ );
</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 ( ! $this->result || is_wp_error( $this->result ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasspluginupgraderskinphp"></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-plugin-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-plugin-upgrader-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,15 +46,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plugin = $this->upgrader->plugin_info();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->plugin ) && ! is_wp_error( $this->result ) && $this->plugin_active ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Currently used only when JS is off for a single plugin update?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<iframe title="' . esc_attr__( 'Update progress' ) . '" style="border:0;overflow:hidden" width="100%" height="170" src="' . wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '"></iframe>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<iframe title="%s" style="border:0;overflow:hidden" width="100%" height="170" src="%s"></iframe>',
+ esc_attr__( 'Update progress' ),
+ wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin )
+ );
</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"> $this->decrement_update_count( 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_actions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
- 'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'activate_plugin' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ),
+ __( 'Activate Plugin' )
+ ),
+ 'plugins_page' => sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'plugins.php' ),
+ __( 'Return to Plugins page' )
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugin', $this->plugin ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $update_actions['activate_plugin'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeinstallerskinphp"></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-theme-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-installer-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function before() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->api ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->upgrader->strings['process_success'] = sprintf(
+ $this->upgrader->strings['process_success_specific'],
+ $this->api->name,
+ $this->api->version
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $install_actions = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $customize_url = add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $customize_url = add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme' => urlencode( $stylesheet ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,24 +86,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'customize.php' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
- $install_actions['preview'] .= '<span aria-hidden="true">' . __( 'Live Preview' ) . '</span>';
- /* translators: %s: theme name */
- $install_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $install_actions['preview'] = sprintf(
+ '<a href="%s" class="hide-if-no-customize load-customize">' .
+ '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ esc_url( $customize_url ),
+ __( 'Live Preview' ),
+ /* translators: %s: theme name */
+ sprintf( __( 'Live Preview “%s”' ), $name )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink">';
- $install_actions['activate'] .= '<span aria-hidden="true">' . __( 'Activate' ) . '</span>';
- /* translators: %s: theme name */
- $install_actions['activate'] .= '<span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['activate'] = sprintf(
+ '<a href="%s" class="activatelink">' .
+ '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ esc_url( $activate_link ),
+ __( 'Activate' ),
+ /* translators: %s: theme name */
+ sprintf( __( 'Activate “%s”' ), $name )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['network_enable'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ esc_url( wp_nonce_url( 'themes.php?action=enable&theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ),
+ __( 'Network Enable' )
+ );
</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 ( $this->type == 'web' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['themes_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'theme-install.php' ),
+ __( 'Return to Theme Installer' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $install_actions['themes_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'themes.php' ),
+ __( 'Return to Themes page' )
+ );
</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 ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderskinphp"></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-theme-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-theme-upgrader-skin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,24 +64,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'customize.php' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_stylesheet() == $stylesheet ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
- $update_actions['preview'] .= '<span aria-hidden="true">' . __( 'Customize' ) . '</span>';
- /* translators: %s: theme name */
- $update_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Customize “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['preview'] = sprintf(
+ '<a href="%s" class="hide-if-no-customize load-customize">' .
+ '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ esc_url( $customize_url ),
+ __( 'Customize' ),
+ /* translators: %s: theme name */
+ sprintf( __( 'Customize “%s”' ), $name )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'switch_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize">';
- $update_actions['preview'] .= '<span aria-hidden="true">' . __( 'Live Preview' ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['preview'] = sprintf(
+ '<a href="%s" class="hide-if-no-customize load-customize">' .
+ '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ esc_url( $customize_url ),
+ __( 'Live Preview' ),
+ /* translators: %s: theme name */
+ sprintf( __( 'Live Preview “%s”' ), $name )
+ );
+ }
+
+ $update_actions['activate'] = sprintf(
+ '<a href="%s" class="activatelink">' .
+ '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ esc_url( $activate_link ),
+ __( 'Activate' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['preview'] .= '<span class="screen-reader-text">' . sprintf( __( 'Live Preview “%s”' ), $name ) . '</span></a>';
- }
- $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink">';
- $update_actions['activate'] .= '<span aria-hidden="true">' . __( 'Activate' ) . '</span>';
- /* translators: %s: theme name */
- $update_actions['activate'] .= '<span class="screen-reader-text">' . sprintf( __( 'Activate “%s”' ), $name ) . '</span></a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sprintf( __( 'Activate “%s”' ), $name )
+ );
</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 ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +103,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_actions['themes_page'] = sprintf(
+ '<a href="%s" target="_parent">%s</a>',
+ self_admin_url( 'themes.php' ),
+ __( 'Return to Themes page' )
+ );
</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 list of action links available following a single theme update.
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></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-walker-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,11 +99,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $item->_invalid ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'menu-item-invalid';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: title of menu item which is invalid */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: title of an invalid menu item */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%s (Invalid)' ), $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'pending';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: title of menu item in draft status */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: title of a menu item in draft status */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%s (Pending)' ), $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'custom' !== $item->type && false !== $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: %s: original title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: link to menu item's original object */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $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="trunksrcwpadminincludesclasswpautomaticupdaterphp"></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-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,9 +336,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'translation':
</span><span class="cx" style="display: block; padding: 0 10px"> $language_item_name = $upgrader->get_name_for_update( $item );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Name of language item */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Project name (plugin, theme, or WordPress) */
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Name of language item, 2: Language */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Project name (plugin, theme, or WordPress), 2: Language */
</ins><span class="cx" style="display: block; padding: 0 10px"> $skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)…' ), $language_item_name, $item->language ) );
</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">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_relaxed_file_ownership = true;
</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">- // Boom, This sites about to get a whole new splash of paint!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Boom, this site's about to get a whole new splash of paint!
</ins><span class="cx" style="display: block; padding: 0 10px"> $upgrade_result = $upgrader->upgrade(
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader_item,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,13 +649,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'success': // We updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Site updated notification email subject. 1: Site title, 2: WordPress version number. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Site updated notification email subject. 1: Site title, 2: WordPress version. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
</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 'fail': // We tried to update but couldn't.
</span><span class="cx" style="display: block; padding: 0 10px"> case 'manual': // We can't update (and made no attempt).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Update available notification email subject. 1: Site title, 2: WordPress version number. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Update available notification email subject. 1: Site title, 2: WordPress version. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
</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">@@ -676,8 +676,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'success':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Home URL, 2: WordPress version */
- $body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= sprintf(
+ /* translators: 1: Home URL, 2: WordPress version */
+ __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ),
+ home_url(),
+ $core_update->current
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $newer_version_available ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'No further action is needed on your part.' ) . ' ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,12 +689,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Can only reference the About screen if their update was successful.
</span><span class="cx" style="display: block; padding: 0 10px"> list( $about_version ) = explode( '-', $core_update->current, 2 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: WordPress core version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . admin_url( 'about.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newer_version_available ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: WordPress core latest version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress latest version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'Updating is easy and only takes a few moments:' );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . network_admin_url( 'update-core.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,8 +704,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'fail':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'manual':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Home URL, 2: WordPress core latest version */
- $body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= sprintf(
+ /* translators: 1: Home URL, 2: WordPress version */
+ __( 'Please update your site at %1$s to WordPress %2$s.' ),
+ home_url(),
+ $next_user_core_update->current
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,11 +725,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'critical':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $newer_version_available ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Home URL, 2: WordPress core latest version */
- $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= sprintf(
+ /* translators: 1: Home URL, 2: WordPress version */
+ __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ),
+ home_url(),
+ $core_update->current
+ );
</ins><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: Home URL, 2: Core update version */
- $body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= sprintf(
+ /* translators: 1: Home URL, 2: WordPress latest version */
+ __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ),
+ home_url(),
+ $core_update->current
+ );
</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"> $body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -734,8 +750,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $critical_support = 'critical' === $type && ! empty( $core_update->support_email );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $critical_support ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Support offer if available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Support e-mail */
- $body .= "\n\n" . sprintf( __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ), $core_update->support_email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body .= "\n\n" . sprintf(
+ /* translators: %s: Support email address */
+ __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ),
+ $core_update->support_email
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a note about the support forums.
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,10 +864,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->update_results['core'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->update_results['core'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $result->result && ! is_wp_error( $result->result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: WordPress core version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = sprintf( __( 'SUCCESS: WordPress was successfully updated to %s' ), $result->name );
</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: %s: WordPress core version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = sprintf( __( 'FAILED: WordPress failed to update to %s' ), $result->name );
</span><span class="cx" style="display: block; padding: 0 10px"> $failures++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,7 +889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = $messages[ $type ];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_list_pluck( $success_items, 'name' ) as $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: name of plugin / theme / translations */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: name of plugin / theme / translation */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = ' * ' . sprintf( __( 'SUCCESS: %s' ), $name );
</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">@@ -885,7 +904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $body[] = $messages[ $type ];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->update_results[ $type ] as $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $item->result || is_wp_error( $item->result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: name of plugin / theme / translations */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: name of plugin / theme / translation */
</ins><span class="cx" style="display: block; padding: 0 10px"> $body[] = ' * ' . sprintf( __( 'FAILED: %s' ), $item->name );
</span><span class="cx" style="display: block; padding: 0 10px"> $failures++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></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-comments-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-comments-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,8 +785,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Comment $comment The comment object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_date( $comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: comment date, 2: comment time */
</del><span class="cx" style="display: block; padding: 0 10px"> $submitted = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: comment date, 2: comment time */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s at %2$s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: comment date format. See https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> get_comment_date( __( 'Y/m/d' ), $comment ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpextphp"></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-filesystem-ftpext.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +92,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'connect',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: hostname:port */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: hostname:port */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Failed to connect to FTP Server %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['hostname'] . ':' . $this->options['port']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,8 +104,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! @ftp_login( $this->link, $this->options['username'], $this->options['password'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: username */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: username */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Username/Password incorrect for %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['username']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></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-filesystem-ftpsockets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'connect',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: hostname:port */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: hostname:port */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Failed to connect to FTP Server %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['hostname'] . ':' . $this->options['port']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,8 +93,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->ftp->connect() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'connect',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: hostname:port */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: hostname:port */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Failed to connect to FTP Server %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['hostname'] . ':' . $this->options['port']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,8 +105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: username */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: username */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Username/Password incorrect for %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['username']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></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-filesystem-ssh2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,8 +137,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'connect',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: hostname:port */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: hostname:port */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Failed to connect to SSH2 Server %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['hostname'] . ':' . $this->options['port']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,8 +150,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! @ssh2_auth_password( $this->link, $this->options['username'], $this->options['password'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: username */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: username */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Username/Password incorrect for %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['username']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,8 +162,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! @ssh2_auth_pubkey_file( $this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'auth',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: username */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: username */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Public and Private keys incorrect for %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['username']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,8 +176,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->sftp_link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'connect',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: hostname:port */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: hostname:port */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->options['hostname'] . ':' . $this->options['port']
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $stream ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'command',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: command */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: command */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Unable to perform command: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $command
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></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-links-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-links-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Select %s' ), $link->link_name ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: link name */
+ printf( __( 'Select %s' ), $link->link_name );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +325,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ) . "' ) ) { return true;}return false;\">" . __( 'Delete' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['delete'] = sprintf(
+ '<a class="submitdelete" href="%s" onclick="return confirm( \'%s\' );">%s</a>',
+ wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ),
+ /* translators: %s: link name */
+ esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ),
+ __( 'Delete' )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->row_actions( $actions );
</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="trunksrcwpadminincludesclasswplisttablephp"></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-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-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,10 +661,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $approved_comments_number = number_format_i18n( $approved_comments );
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_comments_number = number_format_i18n( $pending_comments );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
- $approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
- $pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $approved_only_phrase = sprintf(
+ /* translators: %s: number of comments */
+ _n( '%s comment', '%s comments', $approved_comments ),
+ $approved_comments_number
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $approved_phrase = sprintf(
+ /* translators: %s: number of comments */
+ _n( '%s approved comment', '%s approved comments', $approved_comments ),
+ $approved_comments_number
+ );
+
+ $pending_phrase = sprintf(
+ /* translators: %s: number of comments */
+ _n( '%s pending comment', '%s pending comments', $pending_comments ),
+ $pending_comments_number
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // No comments at all.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $approved_comments && ! $pending_comments ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -790,7 +804,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->screen->render_screen_reader_content( 'heading_pagination' );
</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">- $output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = '<span class="displaying-num">' . sprintf(
+ /* translators: %s: number of items */
+ _n( '%s item', '%s items', $total_items ),
+ number_format_i18n( $total_items )
+ ) . '</span>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current = $this->get_pagenum();
</span><span class="cx" style="display: block; padding: 0 10px"> $removable_query_args = wp_removable_query_args();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +876,12 @@
</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"> $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_links[] = $total_pages_before . sprintf(
+ /* translators: 1: current page, 2: total pages */
+ _x( '%1$s of %2$s', 'paging' ),
+ $html_current_page,
+ $html_total_pages
+ ) . $total_pages_after;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $disable_next ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">›</span>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1374,6 +1397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->_pagination_args['total_items'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $response['total_items_i18n'] = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: number of items */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s item', '%s items', $this->_pagination_args['total_items'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $this->_pagination_args['total_items'] )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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-media-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-media-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +356,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Select %s' ), _draft_or_post_title() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: attachment title */
+ printf( __( 'Select %s' ), _draft_or_post_title() );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,8 +457,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $t_diff = time() - $time;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( abs( $t_diff ) ) < DAY_IN_SECONDS ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $t_diff < 0 ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
</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: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-ms-sites-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-ms-sites-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Select %s' ), $blogname ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: site URL */
+ printf( __( 'Select %s' ), $blogname );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></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-ms-themes-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-ms-themes-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,19 +300,49 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'all':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of themes */
+ $text = _nx(
+ 'All <span class="count">(%s)</span>',
+ 'All <span class="count">(%s)</span>',
+ $count,
+ 'themes'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enabled':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _nx( 'Enabled <span class="count">(%s)</span>', 'Enabled <span class="count">(%s)</span>', $count, 'themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of themes */
+ $text = _nx(
+ 'Enabled <span class="count">(%s)</span>',
+ 'Enabled <span class="count">(%s)</span>',
+ $count,
+ 'themes'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'disabled':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _nx( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count, 'themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of themes */
+ $text = _nx(
+ 'Disabled <span class="count">(%s)</span>',
+ 'Disabled <span class="count">(%s)</span>',
+ $count,
+ 'themes'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrade':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _nx( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count, 'themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of themes */
+ $text = _nx(
+ 'Update Available <span class="count">(%s)</span>',
+ 'Update Available <span class="count">(%s)</span>',
+ $count,
+ 'themes'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'broken':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = _nx( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count, 'themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of themes */
+ $text = _nx(
+ 'Broken <span class="count">(%s)</span>',
+ 'Broken <span class="count">(%s)</span>',
+ $count,
+ 'themes'
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,8 +602,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_meta = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->get( 'Version' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: theme version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_meta[] = sprintf( __( 'Version %s' ), $theme->display( 'Version' ) );
</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 author */
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_meta[] = sprintf( __( 'By %s' ), $theme->display( 'Author' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->get( 'ThemeURI' ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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-ms-users-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-ms-users-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,9 +139,36 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['all'] = "<a href='" . network_admin_url( 'users.php' ) . "'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = sprintf(
+ '<a href="%s"%s>%s</a>',
+ network_admin_url( 'users.php' ),
+ $current_link_attributes,
+ sprintf(
+ /* translators: number of users */
+ _nx(
+ 'All <span class="count">(%s)</span>',
+ 'All <span class="count">(%s)</span>',
+ $total_users,
+ 'users'
+ ),
+ number_format_i18n( $total_users )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['super'] = "<a href='" . network_admin_url( 'users.php?role=super' ) . "'$current_link_attributes>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['super'] = sprintf(
+ '<a href="%s"%s>%s</a>',
+ network_admin_url( 'users.php?role=super' ),
+ $current_link_attributes,
+ sprintf(
+ /* translators: number of users */
+ _n(
+ 'Super Admin <span class="count">(%s)</span>',
+ 'Super Admins <span class="count">(%s)</span>',
+ $total_admins
+ ),
+ number_format_i18n( $total_admins )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $role_links;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +236,10 @@
</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"> <label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Select %s' ), $user->user_login ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: user login */
+ printf( __( 'Select %s' ), $user->user_login );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" id="blog_<?php echo $user->ID; ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,6 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = wp_kses( $plugin['author'], $plugins_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $author ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: plugin author */
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
</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">@@ -723,7 +724,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="column-updated">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php _e( 'Last Updated:' ); ?></strong>
+ <?php
+ /* translators: %s: Human-readable time difference */
+ printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="column-downloaded">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -730,6 +735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin['active_installs'] >= 1000000 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_millions = floor( $plugin['active_installs'] / 1000000 );
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_text = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of millions */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $active_installs_millions )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -738,6 +744,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
</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: number of installations */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( '%s Active Installations' ), $active_installs_text );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></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-plugins-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-plugins-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -429,36 +429,69 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'all':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _nx(
+ 'All <span class="count">(%s)</span>',
+ 'All <span class="count">(%s)</span>',
+ $count,
+ 'plugins'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'active':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Active <span class="count">(%s)</span>',
+ 'Active <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'recently_activated':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Recently Active <span class="count">(%s)</span>',
+ 'Recently Active <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'inactive':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Inactive <span class="count">(%s)</span>',
+ 'Inactive <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'mustuse':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Must-Use <span class="count">(%s)</span>',
+ 'Must-Use <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'dropins':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Drop-in <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Drop-in <span class="count">(%s)</span>',
+ 'Drop-ins <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'paused':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Paused <span class="count">(%s)</span>', 'Paused <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Paused <span class="count">(%s)</span>',
+ 'Paused <span class="count">(%s)</span>',
+ $count
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrade':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: plugin count */
- $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
+ $text = _n(
+ 'Update Available <span class="count">(%s)</span>',
+ 'Update Available <span class="count">(%s)</span>',
+ $count
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,9 +801,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) || ! $compatible_php ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox = '';
</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: %s: plugin name */
- $checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . '</label>'
- . "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checkbox = sprintf(
+ '<label class="screen-reader-text" for="%1$s">%2$s</label>' .
+ '<input type="checkbox" name="checked[]" value="%3$s" id="%1$s" />',
+ $checkbox_id,
+ /* translators: %s: plugin name */
+ sprintf( __( 'Select %s' ), $plugin_data['Name'] ),
+ esc_attr( $plugin_file )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'dropins' != $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : ' ' ) . '</p>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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-posts-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-posts-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,6 +305,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"> $mine_inner_html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mine <span class="count">(%s)</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Mine <span class="count">(%s)</span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,6 +326,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"> $all_inner_html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx(
</span><span class="cx" style="display: block; padding: 0 10px"> 'All <span class="count">(%s)</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'All <span class="count">(%s)</span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,6 +376,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"> $sticky_inner_html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sticky <span class="count">(%s)</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Sticky <span class="count">(%s)</span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +920,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'Select %s' ), _draft_or_post_title() ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ /* translators: %s: post title */
+ printf( __( 'Select %s' ), _draft_or_post_title() );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="locked-indicator">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,7 +999,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lock_holder ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lock_holder = get_userdata( $lock_holder );
</span><span class="cx" style="display: block; padding: 0 10px"> $locked_avatar = get_avatar( $lock_holder->ID, 18 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: user's display name */
+ $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $locked_avatar = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $locked_text = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,6 +1073,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time_diff = time() - $time;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> $h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $h_time = mysql2date( __( 'Y/m/d' ), $m_time );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></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-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array The privacy policy text/informtion added by core and plugins.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return array The privacy policy text/information added by core and plugins.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_suggested_policy_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,14 +386,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $section['removed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-removed';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $date_format, $section['removed'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Removed %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: date of plugin deactivation */
+ $meta = sprintf( __( 'Removed %s.' ), $date );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: date of plugin deactivation */
</ins><span class="cx" style="display: block; padding: 0 10px"> $removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $removed = '<div class="error inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $section['updated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-updated';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $date_format, $section['updated'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Updated %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: date of privacy policy text update */
+ $meta = sprintf( __( 'Updated %s.' ), $date );
</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 ( $meta ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +420,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<div class="privacy-text-actions">';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<button type="button" class="privacy-text-copy button">';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= $copy;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<span class="screen-reader-text">' . sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<span class="screen-reader-text">';
+ /* translators: %s: plugin name */
+ $content .= sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name );
+ $content .= '</span>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= '</button>';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacyrequeststablephp"></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-privacy-requests-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-privacy-requests-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-privacy-requests-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,7 +380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time_diff = time() - $timestamp;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $time_diff >= 0 && $time_diff < DAY_IN_SECONDS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: human readable timestamp */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( '%s ago' ), human_time_diff( $timestamp ) );
</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="trunksrcwpadminincludesclasswpscreenphp"></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-screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-screen.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1162,17 +1162,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset class='columns-prefs'>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-layout"><?php _e( 'Layout' ); ?></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- for ( $i = 1; $i <= $num; ++$i ) :
- ?>
- <label class="columns-prefs-<?php echo $i; ?>">
- <input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>'
- <?php checked( $screen_layout_columns, $i ); ?> />
- <?php printf( _n( '%s column', '%s columns', $i ), number_format_i18n( $i ) ); ?>
- </label>
- <?php
- endfor;
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php for ( $i = 1; $i <= $num; ++$i ) : ?>
+ <label class="columns-prefs-<?php echo $i; ?>">
+ <input type='radio' name='screen_columns' value='<?php echo esc_attr( $i ); ?>' <?php checked( $screen_layout_columns, $i ); ?> />
+ <?php
+ printf(
+ /* translators: %s: number of columns on the page */
+ _n( '%s column', '%s columns', $i ),
+ number_format_i18n( $i )
+ );
+ ?>
+ </label>
+ <?php endfor; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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-terms-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-terms-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,8 +355,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_cb( $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'delete_term', $tag->term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
- . '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sprintf(
+ '<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .
+ '<input type="checkbox" name="delete_tags[]" value="%1$s" id="cb-select-%1$s" />',
+ $tag->term_id,
+ /* translators: %s: term name */
+ sprintf( __( 'Select %s' ), $tag->name )
+ );
</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 ' ';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></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-themes-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-themes-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,11 +97,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = get_current_blog_id();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ), network_admin_url( 'theme-install.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: 1: URL to Themes tab on Edit Site screen, 2: URL to Add Themes screen */
+ __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ),
+ network_admin_url( 'site-themes.php?id=' . $blog_id ),
+ network_admin_url( 'theme-install.php' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'manage_network_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: URL to Themes tab on Edit Site screen */
+ __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%s">enable</a> more themes.' ),
+ network_admin_url( 'site-themes.php?id=' . $blog_id )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,13 +117,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Else, fallthrough. install_themes doesn't help if you can't enable it.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'install_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: URL to Add Themes screen */
+ __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ),
+ admin_url( 'theme-install.php' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> // Fallthrough.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: network title */
+ __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ),
+ get_site_option( 'site_name' )
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,18 +203,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_link = wp_nonce_url( 'themes.php?action=activate&template=' . urlencode( $template ) . '&stylesheet=' . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="'
- . esc_attr( sprintf( __( 'Activate “%s”' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['activate'] = sprintf(
+ '<a href="%s" class="activatelink" title="%s">%s</a>',
+ $activate_link,
+ /* translators: %s: theme name */
+ esc_attr( sprintf( __( 'Activate “%s”' ), $title ) ),
+ __( 'Activate' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="load-customize hide-if-no-customize">'
- . __( 'Live Preview' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['preview'] .= sprintf(
+ '<a href="%s" class="load-customize hide-if-no-customize">%s</a>',
+ wp_customize_url( $stylesheet ),
+ __( 'Live 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"> if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
- . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $title ) )
- . "' );" . '">' . __( 'Delete' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['delete'] = sprintf(
+ '<a class="submitdelete deletion" href="%s" onclick="return confirm( \'%s\' );">%s</a>',
+ wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet ),
+ /* translators: %s: theme name */
+ esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $title ) ),
+ __( 'Delete' )
+ );
</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"> /** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +252,12 @@
</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 $title; ?></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"> <div class="action-links">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $actions as $action ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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-users-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-users-list-table.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,7 +194,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = sprintf(
+ '<a href="%s"%s>%s</a>',
+ $url,
+ $current_link_attributes,
+ sprintf(
+ /* translators: %s: number of users */
+ _nx(
+ 'All <span class="count">(%s)</span>',
+ 'All <span class="count">(%s)</span>',
+ $total_users,
+ 'users'
+ ),
+ number_format_i18n( $total_users )
+ )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_roles->get_names() as $this_role => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $avail_roles[ $this_role ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -463,12 +478,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the checkbox ( because the user is editable, otherwise it's empty )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
- . "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checkbox = sprintf(
+ '<label class="screen-reader-text" for="user_%1$s">%2$s</label>' .
+ '<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',
+ $user_object->ID,
+ /* translators: %s: user login */
+ sprintf( __( 'Select %s' ), $user_object->user_login ),
+ $role_classes
+ );
</ins><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"> $edit = "<strong>{$user_object->user_login}{$super_admin}</strong>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user_object->ID, 32 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Comma-separated list of user roles.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +533,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $user_object->last_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= $user_object->last_name;
</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">- $r .= '<span aria-hidden="true">—</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= sprintf(
+ '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>',
+ _x( 'Unknown', 'name' )
+ );
</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"> case 'email':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,10 +547,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'posts':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $numposts > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= "<a href='edit.php?author=$user_object->ID' class='edit'>";
- $r .= '<span aria-hidden="true">' . $numposts . '</span>';
- $r .= '<span class="screen-reader-text">' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . '</span>';
- $r .= '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= sprintf(
+ '<a href="%s" class="edit"><span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+ "edit.php?author={$user_object->ID}",
+ $numposts,
+ sprintf(
+ /* translators: %s: number of posts */
+ _n( '%s post by this author', '%s posts by this author', $numposts ),
+ number_format_i18n( $numposts )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/dashboard.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,8 +269,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $num_posts = wp_count_posts( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $num_posts && $num_posts->publish ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' == $post_type ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = _n( '%s Post', '%s Posts', $num_posts->publish );
</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: %s: number of pages */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = _n( '%s Page', '%s Pages', $num_posts->publish );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,12 +287,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Comments
</span><span class="cx" style="display: block; padding: 0 10px"> $num_comm = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $num_comm && ( $num_comm->approved || $num_comm->moderated ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $moderated_comments_count_i18n = number_format_i18n( $num_comm->moderated );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( _n( '%s Comment in moderation', '%s Comments in moderation', $num_comm->moderated ), $moderated_comments_count_i18n );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="comment-mod-count
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +583,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="drafts">';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $drafts ) > 3 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . __( 'View all drafts' ) . "</a></p>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<p class="view-all"><a href="%s">%s</a></p>' . "\n",
+ esc_url( admin_url( 'edit.php?post_status=draft' ) ),
+ __( 'View all drafts' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 class="hide-if-no-js">' . __( 'Your Recent Drafts' ) . "</h2>\n<ul>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,9 +599,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_edit_post_link( $draft->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = _draft_or_post_title( $draft->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<li>\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: post title */
- echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
- echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<div class="draft-title"><a href="%s" aria-label="%s">%s</a><time datetime="%s">%s</time></div>',
+ esc_url( $url ),
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ),
+ esc_html( $title ),
+ get_the_time( 'c', $draft ),
+ get_the_time( __( 'F j, Y' ), $draft )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_content = wp_trim_words( $draft->post_content, $draft_length );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $the_content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . $the_content . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1495,14 +1508,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $response['insecure'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: browser name and link */
</del><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: browser name and link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
</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">- /* translators: %s: browser name and link */
</del><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: browser name and link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,7 +1536,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
</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">- $notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notice .= '<p>' . sprintf(
+ /* translators: 1: browser update URL, 2: browser name, 3: Browse Happy URL */
+ __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ),
+ esc_attr( $response['update_url'] ),
+ esc_html( $response['name'] ),
+ esc_url( $browsehappy )
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $notice .= '<div class="clear"></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1697,7 +1716,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $themes_link = current_user_can( 'customize' ) ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $themes_link ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="hide-if-no-customize">
+ <?php
+ /* translators: %s: URL to Themes panel in Customizer or Themes screen */
+ printf( __( 'or, <a href="%s">change your theme completely</a>' ), $themes_link );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="welcome-panel-column">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1725,6 +1749,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $widgets_menus_link = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: URL to Widgets screen, 2: URL to Menus screen */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'widgets.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'nav-menus.php' )
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/deprecated.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/deprecated.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_args' => $args
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->paging_text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s–%s of %s' ) . '</span>%s',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->paging_text = sprintf(
+ /* translators: 1: starting number of users on the current page, 2: ending number of users, 3: total number of users */
+ '<span class="displaying-num">' . __( 'Displaying %1$s–%2$s of %3$s' ) . '</span>%s',
</ins><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $this->total_users_for_query ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/file.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $template_data = implode( '', file( $file_path ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: template name */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
</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">@@ -871,7 +872,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $upload_error_handler( $file, sprintf( __( 'The uploaded file could not be moved to %s.' ), $error_path ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $upload_error_handler(
+ $file,
+ sprintf(
+ /* translators: %s: destination file path */
+ __( 'The uploaded file could not be moved to %s.' ),
+ $error_path
+ )
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1154,7 +1162,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'md5_mismatch',
+ sprintf(
+ /* translators: 1: file checksum, 2: expected checksum value */
+ __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ),
+ bin2hex( $file_md5 ),
+ bin2hex( $expected_raw_md5 )
+ )
+ );
</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></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></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/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/image-edit.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'Original dimensions %s' ), $meta['width'] . ' × ' . $meta['height'] ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ printf(
+ /* translators: %s: image width and height in pixels */
+ __( 'Original dimensions %s' ),
+ $meta['width'] . ' × ' . $meta['height']
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-submit">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,14 +93,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-help">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
- _e( 'Discard any changes and restore the original image.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ _e( 'Discard any changes and restore the original image.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
- echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
- }
-
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
+ echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="imgedit-submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/media.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of attachments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['gallery'] = sprintf( __( 'Gallery (%s)' ), "<span id='attachments-count'>$attachments</span>" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio track title, 2: artist name */
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: audio track title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: audio track title */
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%s".' ), $title );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $meta['album'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1601,7 +1602,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
</span><span class="cx" style="display: block; padding: 0 10px"> <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tr><td colspan='2'><p class='media-types media-types-required-info'>" . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . "</p></td></tr>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr><td colspan='2'><p class='media-types media-types-required-info'>" .
+ /* translators: %s: an asterisk symbol (*) */
+ sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+ "</p></td></tr>\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => 'text',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1906,8 +1910,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item = '<p class="media-types media-types-required-info">' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
- <table class="compat-attachment-fields">' . $item . '</table>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: an asterisk symbol (*) */
+ sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+ '</p>' .
+ '<table class="compat-attachment-fields">' . $item . '</table>';
</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"> foreach ( $hidden_fields as $hidden_field => $value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1956,7 +1962,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $type, $tab, $is_IE, $is_opera;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! _device_can_upload() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>' . sprintf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . sprintf(
+ /* translators: %s: https://apps.wordpress.org/ */
+ __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ),
+ 'https://apps.wordpress.org/'
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">@@ -2130,8 +2140,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="max-upload-size">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: maximum allowed file size */
+ printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
+ ?>
+</p>
+ <?php
</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"> * Fires on the post upload UI screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2775,7 +2790,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return '
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="media-types media-types-required-info">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="media-types media-types-required-info">' .
+ /* translators: %s: an asterisk symbol (*) */
+ sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
+ '</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="describe ' . $table_class . '"><tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row" class="label" style="width:130px;">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2862,7 +2880,14 @@
</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"> <p class="upload-flash-bypass">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.' ), $browser_uploader, '_blank' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: 1: URL to browser uploader, 2: additional link attributes */
+ __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" %2$s>browser uploader</a> instead.' ),
+ $browser_uploader,
+ 'target="_blank"'
+ );
+ ?>
</ins><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"> }
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1026,9 +1026,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <a class="submitdelete deletion" href="<?php echo wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ); ?>" onclick="if ( confirm('<?php echo esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ); ?>') ) {return true;}return false;"><?php _e( 'Delete' ); ?></a>
-<?php } ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<a class="submitdelete deletion" href="%s" onclick="return confirm( \'%s\' );">%s</a>',
+ wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ),
+ /* translators: %s: link name */
+ esc_js( sprintf( __( "You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete." ), $link->link_name ) ),
+ __( 'Delete' )
+ );
+ }
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="publishing-action">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></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/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/misc.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1013,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user && current_user_can( 'edit_post', $post_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send = array(
+ /* translators: %s: user's display name */
+ 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ),
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar = get_avatar( $user->ID, 18 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $avatar && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1061,6 +1064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = array(
</span><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"> 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ),
</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">@@ -1186,9 +1190,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: draft saved date format, see https://secure.php.net/date */
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_saved_date_format = __( 'g:i:s a' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: date and time */
</del><span class="cx" style="display: block; padding: 0 10px"> $response['wp_autosave'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: date and time */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ),
</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">@@ -1341,8 +1345,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', home_url(), $content );
</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: New admin email address notification email subject. %s: Site title */
- wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail(
+ $value,
+ sprintf(
+ /* translators: New admin email address notification email subject. %s: Site title */
+ __( '[%s] New Admin Email Address' ),
+ wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
+ ),
+ $content
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/ms.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,10 +579,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_name = get_bloginfo( 'name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $blogs ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: 1: Site title */
+ __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ),
+ $blog_name
+ ),
+ 403
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = '<p>' . sprintf(
+ /* translators: 1: Site title */
+ __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ),
+ $blog_name
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<h3>' . __( 'Your Sites' ) . '</h3>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,7 +701,11 @@
</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 ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo "<div class='update-nag'>" . sprintf(
+ /* translators: %s: URL to Upgrade Network screen */
+ __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ),
+ esc_url( network_admin_url( 'upgrade.php' ) )
+ ) . '</div>';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,7 +759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table" role="presentation">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php /* translators: My sites label */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* translators: My Sites label */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,11 +877,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: user login */
+ __( 'Warning! User %s cannot be deleted.' ),
+ $delete_user->user_login
+ )
+ );
</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 ( in_array( $delete_user->user_login, $site_admins ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: user login */
+ __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ),
+ '<em>' . $delete_user->user_login . '</em>'
+ )
+ );
</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"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,7 +939,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_dropdown .= "</select>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul style="list-style:none;">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li>
+ <?php
+ /* translators: %s: link to user's site */
+ printf( __( 'Site: %s' ), $user_site );
+ ?>
+ </li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" checked="checked" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Delete all content.' ); ?></label></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,7 +1131,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Info</strong> — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Users</strong> — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( '<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: %s: URL to Network Themes screen */
+ __( '<strong>Themes</strong> — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ),
+ network_admin_url( 'themes.php' )
+ ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<strong>Settings</strong> — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/nav-menu.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1024,8 +1024,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_walker_not_exist',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: walker class name */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: walker class name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The Walker class named %s does not exist.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . $walker_class_name . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1202,8 +1202,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: nav menu title */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: nav menu title */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%s has been updated.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . $nav_menu_selected_title . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p></div>';
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/network.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,8 +190,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $got_mod_rewrite = got_mod_rewrite();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $got_mod_rewrite ) { // dangerous assumptions
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: mod_rewrite */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: mod_rewrite */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>mod_rewrite</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,8 +198,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_apache ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: mod_rewrite */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: mod_rewrite */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'It looks like the Apache %s module is not installed.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>mod_rewrite</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,8 +208,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache)
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>mod_rewrite</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://httpd.apache.org/docs/mod/mod_rewrite.html',
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/plugin-install.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_dashboard() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%1$s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ), __( 'https://wordpress.org/plugins/' ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ printf(
+ /* translators: %s: https://wordpress.org/plugins/ */
+ __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ),
+ __( 'https://wordpress.org/plugins/' )
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php display_plugins_table(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +300,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_generate_tag_cloud(
</span><span class="cx" style="display: block; padding: 0 10px"> $tags,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'single_text' => __( '%s plugin' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of plugins */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'multiple_text' => __( '%s plugins' ),
</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">@@ -390,6 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install_plugins_beta':
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to "Features as Plugins" page */
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } if ( ! empty( $api->last_updated ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><strong><?php _e( 'Last Updated:' ); ?></strong>
</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: %s: Time since the last update */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( '%s ago' ), human_time_diff( strtotime( $api->last_updated ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -667,6 +678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $api->active_installs >= 1000000 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_installs_millions = floor( $api->active_installs / 1000000 );
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of millions */
</ins><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $active_installs_millions )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,7 +708,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p aria-hidden="true" class="fyi-description">
+ <?php
+ printf(
+ /* translators: %s: number of ratings */
+ _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ),
+ number_format_i18n( $api->num_ratings )
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -707,11 +727,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $api->ratings as $key => $ratecount ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Avoid div-by-zero.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
- /* translators: 1: number of stars (used to determine singular/plural), 2: number of reviews */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $aria_label = esc_attr(
</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">- _n( 'Reviews with %1$d star: %2$s. Opens in a new tab.', 'Reviews with %1$d stars: %2$s. Opens in a new tab.', $key ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: number of stars (used to determine singular/plural), 2: number of reviews */
+ _n(
+ 'Reviews with %1$d star: %2$s. Opens in a new tab.',
+ 'Reviews with %1$d stars: %2$s. Opens in a new tab.',
+ $key
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $key,
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $ratecount )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,8 +743,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="counter-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="counter-label">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="https://wordpress.org/support/plugin/<?php echo $api->slug; ?>/reviews/?filter=<?php echo $key; ?>"
- target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ '<a href="%s" target="_blank" aria-label="%s">%s</a>',
+ "https://wordpress.org/support/plugin/{$api->slug}/reviews/?filter={$key}",
+ $aria_label,
+ /* translators: %s: number of stars */
+ sprintf( _n( '%d star', '%d stars', $key ), $key )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="counter-back">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/plugin.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_data['Author'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data['Description'] .= ' <cite>' . sprintf( __( 'By %s.' ), $plugin_data['Author'] ) . '</cite>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data['Description'] .= sprintf(
+ /* translators: %s: plugin author */
+ ' <cite>' . __( 'By %s.' ) . '</cite>',
+ $plugin_data['Author']
+ );
</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></pre></div>
<a id="trunksrcwpadminincludesrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/revision.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/revision.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,6 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => $authors[ $revision->post_author ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dateShort' => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeAgo' => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave' => $autosave,
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => $current,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,6 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'author' => $authors[ $post->post_author ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dateShort' => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Human-readable time difference */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'timeAgo' => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'autosave' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'current' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,6 +399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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"> __( 'Autosave by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</span>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,6 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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"> __( 'Current Revision by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</span>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,6 +419,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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"> __( 'Revision by %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author-name">{{ data.attributes.author.name }}</span>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,10 +531,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_comment_trashnotice() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="hidden" id="trash-undo-holder">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="trash-undo-inside"><?php printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' ); ?> <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="trash-undo-inside">
+ <?php
+ /* translators: %s: comment author, filled by AJAX */
+ printf( __( 'Comment by %s moved to the trash.' ), '<strong></strong>' );
+ ?>
+ <span class="undo untrash"><a href="#"><?php _e( 'Undo' ); ?></a></span>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="hidden" id="spam-undo-holder">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="spam-undo-inside"><?php printf( __( 'Comment by %s marked as spam.' ), '<strong></strong>' ); ?> <span class="undo unspam"><a href="#"><?php _e( 'Undo' ); ?></a></span></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="spam-undo-inside">
+ <?php
+ /* translators: %s: comment author, filled by AJAX */
+ printf( __( 'Comment by %s marked as spam.' ), '<strong></strong>' );
+ ?>
+ <span class="undo unspam"><a href="#"><?php _e( 'Undo' ); ?></a></span>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,7 +967,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __( 'Maximum size: %s' ), $size ); ?>)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ '<label for="upload">%s</label> (%s)',
+ __( 'Choose a file from your computer:' ),
+ /* translators: %s: maximum allowed file size */
+ sprintf( __( 'Maximum size: %s' ), $size )
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="file" id="upload" name="import" size="25" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="action" value="save" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,7 +1308,11 @@
</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"> echo '<button type="button" class="handlediv" aria-expanded="true">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $widget_title ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<span class="screen-reader-text">' . sprintf(
+ /* translators: meta box title */
+ __( 'Toggle panel: %s' ),
+ $widget_title
+ ) . '</span>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="toggle-indicator" aria-hidden="true"></span>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</button>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1489,8 +1512,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: misc */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: misc */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'misc'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,8 +1525,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: privacy */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: privacy */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'privacy'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1560,8 +1583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: misc */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: misc */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'misc'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1573,8 +1596,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: privacy */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: privacy */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'privacy'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/theme.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = $wp_filesystem->delete( $theme_dir, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $deleted ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'could_not_remove_theme',
+ /* translators: %s: Theme name */
+ sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet )
+ );
</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"> $theme_translations = wp_get_installed_translations( 'themes' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,8 +199,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,8 +212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update['new_version']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $update['package'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,8 +225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update['new_version']
</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">- /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</del><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,8 +721,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.active ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
- <h3 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="theme-name">{{{ data.name }}}<span class="theme-version">
+ <?php
+ /* translators: %s: theme version */
+ printf( __( 'Version: %s' ), '{{ data.version }}' );
+ ?>
+ </span></h2>
+ <h3 class="theme-author">
+ <?php
+ /* translators: %s: theme author link */
+ printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' );
+ ?>
+ </h3>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.stars && 0 != data.num_ratings ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-rating">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +759,15 @@
</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 ( data.parent ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="parent-theme">
+ <?php
+ printf(
+ /* translators: %s: theme name */
+ __( 'This is a child theme of %s.' ),
+ '<strong>{{{ data.parent }}}</strong>'
+ );
+ ?>
+ </p>
</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"> <p class="theme-description">{{{ data.description }}}</p>
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/update-core.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -961,11 +961,40 @@
</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 ( ! $mysql_compat && ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'php_mysql_not_compatible',
+ sprintf(
+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
+ __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ),
+ $wp_version,
+ $required_php_version,
+ $required_mysql_version,
+ $php_version,
+ $mysql_version
+ ) . $php_update_message
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) . $php_update_message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'php_not_compatible',
+ sprintf(
+ /* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
+ __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ),
+ $wp_version,
+ $required_php_version,
+ $php_version
+ ) . $php_update_message
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $mysql_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'mysql_not_compatible',
+ sprintf(
+ /* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
+ __( 'The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ),
+ $wp_version,
+ $required_mysql_version,
+ $mysql_version
+ )
+ );
</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"> /** This filter is documented in wp-admin/includes/update-core.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1354,8 +1383,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> show_message( __( 'WordPress updated successfully' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );
- show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ show_message(
+ '<span class="hide-if-no-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen */
+ __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ),
+ $new_version,
+ 'about.php?updated'
+ ) . '</span>'
+ );
+ show_message(
+ '<span class="hide-if-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen */
+ __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ),
+ $new_version,
+ 'about.php?updated'
+ ) . '</span>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/update.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,6 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function core_update_footer( $msg = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_core' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
</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">@@ -231,14 +232,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $cur->response ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'development':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
- return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sprintf(
+ /* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
+ __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ),
+ get_bloginfo( 'version', 'display' ),
+ network_admin_url( 'update-core.php' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrade':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sprintf(
+ '<strong><a href="%s">%s</a></strong>',
+ network_admin_url( 'update-core.php' ),
+ /* translators: %s: WordPress version */
+ sprintf( __( 'Get Version %s' ), $cur->current )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'latest':
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
</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">@@ -303,7 +314,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cur = get_preferred_from_update_core();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg .= sprintf(
+ '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
+ network_admin_url( 'update-core.php' ),
+ /* translators: %s: WordPress version number, or 'Latest' string */
+ sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) )
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,11 +422,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compatible_php = is_php_version_compatible( $requires_php );
</span><span class="cx" style="display: block; padding: 0 10px"> $notice_type = $compatible_php ? 'notice-warning' : 'notice-error';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $response->slug . '-update' ) . '" data-slug="' . esc_attr( $response->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message notice inline ' . $notice_type . ' notice-alt"><p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<tr class="plugin-update-tr%s" id="%s" data-slug="%s" data-plugin="%s">' .
+ '<td colspan="%s" class="plugin-update colspanchange">' .
+ '<div class="update-message notice inline %s notice-alt"><p>',
+ $active_class,
+ esc_attr( $response->slug . '-update' ),
+ esc_attr( $response->slug ),
+ esc_attr( $file ),
+ esc_attr( $wp_list_table->get_column_count() ),
+ $notice_type
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,8 +448,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $response->new_version )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $response->package ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,8 +462,8 @@
</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"> if ( $compatible_php ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,8 +481,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"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number 5: Update PHP page URL */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number 5: Update PHP page URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available, but it doesn’t work with your version of PHP. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s">learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,10 +606,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $active = $theme->is_allowed( 'network' ) ? ' active' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ '<tr class="plugin-update-tr%s" id="%s" data-slug="%s">' .
+ '<td colspan="%s" class="plugin-update colspanchange">' .
+ '<div class="update-message notice inline notice-warning notice-alt"><p>',
+ $active,
+ esc_attr( $theme->get_stylesheet() . '-update' ),
+ esc_attr( $theme->get_stylesheet() ),
+ $wp_list_table->get_column_count()
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme['Name'],
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,8 +630,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response['new_version']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $response['package'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme['Name'],
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,8 +643,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response['new_version']
</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">- /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme['Name'],
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $details_url ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,7 +717,11 @@
</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 ( current_user_can( 'update_core' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $msg = sprintf( __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ), 'update-core.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $msg = sprintf(
+ /* translators: %s: URL to WordPress Updates screen */
+ __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ),
+ 'update-core.php'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/upgrade.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,8 +583,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email = $user->user_email;
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $user->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> $login_url = wp_login_url();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Your new WordPress site has been successfully set up at:
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/user.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,6 +563,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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since MU (3.0.0)
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $text
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,8 +571,9 @@
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf(
</span><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"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Hi,
</span><span class="cx" style="display: block; padding: 0 10px"> You\'ve been invited to join \'%1$s\' at
</span></span></pre></div>
<a id="trunksrcwpadminincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/includes/widgets.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,8 +244,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-top">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-title-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="screen-reader-text edit"><?php printf( __( 'Edit widget: %s' ), $widget_title ); ?></span>
- <span class="screen-reader-text add"><?php printf( __( 'Add widget: %s' ), $widget_title ); ?></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="screen-reader-text edit">
+ <?php
+ /* translators: %s: widget title */
+ printf( __( 'Edit widget: %s' ), $widget_title );
+ ?>
+ </span>
+ <span class="screen-reader-text add">
+ <?php
+ /* translators: %s: widget title */
+ printf( __( 'Add widget: %s' ), $widget_title );
+ ?>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="toggle-indicator" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="widget-control-edit hide-if-js" href="<?php echo esc_url( add_query_arg( $query_arg ) ); ?>">
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></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/link-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/link-manager.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Overview' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( 'You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.' ), 'widgets.php' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: %s: URL to Widgets screen */
+ __( 'You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.' ),
+ 'widgets.php'
+ ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Links may be separated into Link Categories; these are different than the categories used on your posts.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,6 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['deleted'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = (int) $_REQUEST['deleted'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of links */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( _n( '%s link deleted.', '%s links deleted.', $deleted ), $deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/maint/repair.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,11 @@
</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 ( $problems ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( '<p>' . __( 'Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.' ) . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: URL to "Fixing WordPress" forum */
+ '<p>' . __( 'Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.' ) . '</p>',
+ __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $problem_output = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $problems as $table => $problem ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $problem_output .= "$table: $problem\n";
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/menu.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +42,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'update_languages';
</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: %s: number of pending updates */
- $submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . '</span></span>' ), $cap, 'update-core.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submenu['index.php'][10] = array(
+ sprintf(
+ /* translators: %s: number of pending updates */
+ __( 'Updates %s' ),
+ sprintf(
+ '<span class="update-plugins count-%s"><span class="update-count">%s</span></span>',
+ $update_data['counts']['total'],
+ number_format_i18n( $update_data['counts']['total'] )
+ )
+ ),
+ $cap,
+ 'update-core.php',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $cap );
</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">@@ -78,11 +89,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod = $awaiting_mod->moderated;
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod_i18n = number_format_i18n( $awaiting_mod );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod_text = sprintf( _n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_mod ), $awaiting_mod_i18n );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu[25] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Comments %s' ), '<span class="awaiting-mod count-' . absint( $awaiting_mod ) . '"><span class="pending-count" aria-hidden="true">' . $awaiting_mod_i18n . '</span><span class="comments-in-moderation-text screen-reader-text">' . $awaiting_mod_text . '</span></span>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_posts',
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit-comments.php',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +228,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $update_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $update_data = wp_get_update_data();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . '</span></span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = sprintf(
+ '<span class="update-plugins count-%s"><span class="plugin-count">%s</span></span>',
+ $update_data['counts']['plugins'],
+ number_format_i18n( $update_data['counts']['plugins'] )
+ );
</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"> /* translators: %s: number of pending plugin updates */
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></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/ms-delete-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/ms-delete-site.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/ms-delete-site.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( get_current_blog_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), get_network()->site_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: Network name */
+ __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ),
+ get_network()->site_name
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, the link you clicked is stale. Please select another option.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +104,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.' ), get_network()->site_name ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ printf(
+ /* translators: %s: Network name */
+ __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.' ),
+ get_network()->site_name
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Remember, once deleted your site cannot be restored.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="post" name="deletedirect">
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/nav-menus.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,13 +529,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_initial_nav_menu_meta_boxes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a “Navigation Menu” widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $messages[] = '<div id="message" class="updated"><p>' . sprintf(
+ /* translators: URL to Widgets screen */
+ __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a “Navigation Menu” widget on the <a href="%s">Widgets</a> screen.' ),
+ admin_url( 'widgets.php' )
+ ) . '</p></div>';
</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 ( ! $locations_screen ) : // Main tab
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
- /* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
- $overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Seventeen', 'Twenty Nineteen' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
+ $overview .= '<p>' . sprintf(
+ /* translators: 1: Widgets admin screen URL, 2 and 3: The names of the default themes */
+ __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a “Navigation Menu” widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ),
+ admin_url( 'widgets.php' ),
+ 'Twenty Seventeen',
+ 'Twenty Nineteen'
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> $overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,7 +664,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $num_locations ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
</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">- echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . sprintf(
+ /* translators: %s: number of menus */
+ _n(
+ 'Your theme supports %s menu. Select which menu appears in each location.',
+ 'Your theme supports %s menus. Select which menu appears in each location.',
+ $num_locations
+ ),
+ number_format_i18n( $num_locations )
+ ) . '</p>';
</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"> <div id="menu-locations-wrap">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,6 +772,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-edit-menu-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to create a new menu */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Edit your menu below, or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,6 +834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-new-menu-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to create a new menu */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'or <a href="%s">create a new menu</a>. Don’t forget to save your changes!' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span></span></pre></div>
<a id="trunksrcwpadminnetworkmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/menu.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/menu.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_data = wp_get_update_data();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update_data['counts']['total'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . '</span></span>' ), $cap, 'update-core.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submenu['index.php'][10] = array(
+ sprintf(
+ /* translators: %s: number of available updates */
+ __( 'Updates %s' ),
+ sprintf(
+ '<span class="update-plugins count-%s"><span class="update-count">%s</span></span>',
+ $update_data['counts']['total'],
+ number_format_i18n( $update_data['counts']['total'] )
+ )
+ ),
+ $cap,
+ 'update-core.php',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['index.php'][10] = array( __( 'Updates' ), $cap, 'update-core.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +57,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu[15] = array( sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . '</span></span>' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu[15] = array(
+ sprintf(
+ /* translators: %s: number of available theme updates */
+ __( 'Themes %s' ),
+ sprintf(
+ '<span class="update-plugins count-%s"><span class="theme-count">%s</span></span>',
+ $update_data['counts']['themes'],
+ number_format_i18n( $update_data['counts']['themes'] )
+ )
+ ),
+ 'manage_network_themes',
+ 'themes.php',
+ '',
+ 'menu-top menu-icon-appearance',
+ 'menu-appearance',
+ 'dashicons-admin-appearance',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +82,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['themes.php'][15] = array( __( 'Theme Editor' ), 'edit_themes', 'theme-editor.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . '</span></span>' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu[20] = array(
+ sprintf(
+ /* translators: %s: number of available plugin updates */
+ __( 'Plugins %s' ),
+ sprintf(
+ '<span class="update-plugins count-%s"><span class="plugin-count">%s</span></span>',
+ $update_data['counts']['plugins'],
+ number_format_i18n( $update_data['counts']['plugins'] )
+ )
+ ),
+ 'manage_network_plugins',
+ 'plugins.php',
+ '',
+ 'menu-top menu-icon-plugins',
+ 'menu-plugins',
+ 'dashicons-admin-plugins',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/settings.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,8 +207,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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"> __( '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 class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Site upload space' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option( 'blog_upload_space', 100 ) ) . '" />' ); ?></label><br />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?>/>
+ <?php
+ printf(
+ /* translators: %s: number of megabytes to limit uploads to */
+ __( 'Limit total size of files uploaded to %s MB' ),
+ '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option( 'blog_upload_space', 100 ) ) . '" />'
+ );
+ ?>
+ </label><br />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="screen-reader-text" id="blog-upload-space-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Size in megabytes' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></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/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/site-new.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,8 +54,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $domain, $subdirectory_reserved_names ) ) {
</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: %s: reserved names list */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: reserved names list */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,12 +147,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_mail(
</span><span class="cx" style="display: block; padding: 0 10px"> get_site_option( 'admin_email' ),
</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: %s: network name */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email subject. %s: Network name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '[%s] New Site Created' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_network()->site_name
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</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: user login, 2: site url, 3: site name/title */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: User login, 2: Site URL, 3: Site title */
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'New site created by %1$s
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></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/site-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/site-themes.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,6 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $enabled ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme enabled.' );
</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: %s: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,6 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $disabled ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme disabled.' );
</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: %s: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></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/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/sites.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,14 +61,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A list of valid actions and their associated messaging for confirmation output.
</span><span class="cx" style="display: block; padding: 0 10px"> $manage_actions = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'activateblog' => __( 'You are about to activate the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deactivateblog' => __( 'You are about to deactivate the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unarchiveblog' => __( 'You are about to unarchive the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'archiveblog' => __( 'You are about to archive the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unspamblog' => __( 'You are about to unspam the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'spamblog' => __( 'You are about to mark the site %s as spam.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleteblog' => __( 'You are about to delete the site %s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'unmatureblog' => __( 'You are about to mark the site %s as mature.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'matureblog' => __( 'You are about to mark the site %s as not mature.' ),
</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">@@ -152,7 +161,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site = get_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $site_address = untrailingslashit( $site->domain . $site->path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Sorry, you are not allowed to delete the site %s.' ), $site_address ), 403 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: Site URL */
+ __( 'Sorry, you are not allowed to delete the site %s.' ),
+ $site_address
+ ),
+ 403
+ );
</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"> $updated_action = 'all_delete';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/themes.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,6 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $enabled ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme enabled.' );
</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: %s: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,6 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $disabled ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme disabled.' );
</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: %s: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,6 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $deleted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Theme deleted.' );
</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: %s: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusernewphp"></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/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/user-new.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,11 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'User added.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $edit_link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message .= sprintf(
- ' <a href="%s">%s</a>',
- $edit_link,
- __( 'Edit user' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message .= sprintf( ' <a href="%s">%s</a>', $edit_link, __( 'Edit user' ) );
</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"> $messages[] = $message;
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network/users.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'spam':
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_super_admin( $user->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: user login */
+ __( 'Warning! User cannot be modified. The user %s is a network administrator.' ),
+ esc_html( $user->user_login )
+ )
+ );
</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"> $userfunction = 'all_spam';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/network.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</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_ALLOW_MULTISITE 2: wp-config.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: WP_ALLOW_MULTISITE, 2: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>WP_ALLOW_MULTISITE</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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/options-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/options-discussion.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +79,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of days */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Automatically close comments on posts older than %s days' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '</label> <label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr( get_option( 'close_comments_days_old' ) ) . '" class="small-text" />'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $thread_comments_depth .= '</select>';
</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: number of levels */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Enable threaded (nested) comments %s levels deep' ), $thread_comments_depth );
</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">@@ -153,6 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_order .= '>' . __( 'newer' ) . '</option></select>';
</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: Form field control for 'older' or 'newer' comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Comments should be displayed with the %s comments at the top of each page' ), $comment_order );
</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">@@ -184,7 +187,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p><label for="comment_max_links"><?php printf( __( 'Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)' ), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr( get_option( 'comment_max_links' ) ) . '" class="small-text" />' ); ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p><label for="comment_max_links">
+<?php
+printf(
+ /* translators: %s: number of links */
+ __( 'Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)' ),
+ '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr( get_option( 'comment_max_links' ) ) . '" class="small-text" />'
+);
+?>
+</label></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="moderation_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so “press” will match “WordPress”.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></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/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/options-general.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add note about deprecated WPLANG constant.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument(
+ 'define()',
+ '4.0.0',
+ /* translators: 1: WPLANG, 2: wp-config.php */
+ sprintf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), 'WPLANG', 'wp-config.php' )
+ );
</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"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,8 +233,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="timezone-info">
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="utc-time">
</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: UTC abbreviation, 2: UTC time */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: UTC abbreviation, 2: UTC time */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Universal time (%1$s) is %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<abbr>' . __( 'UTC' ) . '</abbr>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,8 +244,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span id="local-time">
</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: %s: local time */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: local time */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Local time is %s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . date_i18n( $timezone_format ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></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/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/options-permalink.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'permalink-settings',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Permalink Settings' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
- '<p>' . __( 'When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: '%' character */
+ __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by %s) will also appear in the custom structure field and your path can be further modified there.' ),
+ '<code>%</code>'
+ ) . '</p>' .
+ '<p>' . sprintf(
+ /* translators: 1: %category%, 2: %tag% */
+ __( 'When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %1$s or %2$s.' ),
+ '<code>%category%</code>',
+ '<code>%tag%</code>'
+ ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></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/options-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/options-reading.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Overview' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<p>' . __( 'This screen contains the settings that affect the display of your content.' ) . '</p>' .
</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: %s: URL to Pages screen */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: URL to create a new page */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You can choose what’s displayed on the homepage of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static homepage, you first need to create two <a href="%s">Pages</a>. One will become the homepage, and the other will be where your posts are displayed.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post-new.php?post_type=page'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="show_on_front" type="radio" value="page" class="tog" <?php checked( 'page', get_option( 'show_on_front' ) ); ?> />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( 'A <a href="%s">static page</a> (select below)' ), 'edit.php?post_type=page' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ printf(
+ /* translators: %s: URL to Pages screen */
+ __( 'A <a href="%s">static page</a> (select below)' ),
+ 'edit.php?post_type=page'
+ );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,6 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label for="page_on_front">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: select field to choose the front page */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Homepage: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,6 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><label for="page_for_posts">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: select field to choose the page for posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Posts page: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_pages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/plugin-install.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Overview' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( 'Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . sprintf(
+ /* translators: %s: https://wordpress.org/plugins/ */
+ __( 'Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ),
+ __( 'https://wordpress.org/plugins/' )
+ ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/plugins.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['main'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['charsout'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errmsg = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errmsg = sprintf(
+ /* translators: %d: number of characters */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> 'The plugin generated %d character of <strong>unexpected output</strong> during activation.',
</span><span class="cx" style="display: block; padding: 0 10px"> 'The plugin generated %d characters of <strong>unexpected output</strong> during activation.',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,7 +542,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $delete_result ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="message" class="error notice is-dismissible"><p><?php printf( __( 'Plugin could not be deleted due to an error: %s' ), $delete_result->get_error_message() ); ?></p></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="message" class="error notice is-dismissible">
+ <p>
+ <?php
+ printf(
+ /* translators: %s: error message */
+ __( 'Plugin could not be deleted due to an error: %s' ),
+ $delete_result->get_error_message()
+ );
+ ?>
+ </p>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/post.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,6 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_check_post_lock( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><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"> wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
</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="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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/setup-config.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,8 +169,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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: %s: wp-config.php */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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’re going to use this information to create a %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">@@ -177,8 +177,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong>
</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: wp-config-sample.php, 2: wp-config.php */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: wp-config-sample.php, 2: wp-config.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open %1$s in a text editor, fill in your information, and save it as %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config-sample.php</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,8 +186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </strong>
</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: %s: Documentation URL */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Need more help? <a href="%s">We got it</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/editing-wp-config-php/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></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/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/theme-editor.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,8 +251,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ( $has_templates || $theme->parent() ) && $theme->parent() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="howto">
</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: %s: link to edit parent theme */
- echo sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: link to edit parent theme */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'This child theme inherits templates from a parent theme, %s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s">%s</a>',
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/theme-install.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,6 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/forums/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'tryAgain' => __( 'Try Again' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themesFound' => __( 'Number of Themes found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noThemesFound' => __( 'No themes found. Try a different search.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'collapseSidebar' => __( 'Collapse Sidebar' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $help_overview =
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme Directory URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/themes/' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: /wp-content/themes */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme’s folder via FTP into your %s directory.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '<code>/wp-content/themes</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/themes.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $help_install = '<p>' . __( 'Installing themes on Multisite can only be done from the Network Admin section.' ) . '</p>';
</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">- $help_install = '<p>' . sprintf( __( 'If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ), __( 'https://wordpress.org/themes/' ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $help_install = '<p>' . sprintf(
+ /* translators: %s: https://wordpress.org/themes/ */
+ __( 'If you would like to see more themes to choose from, click on the “Add New” button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they’re free!' ),
+ __( 'https://wordpress.org/themes/' )
+ ) . '</p>';
</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"> get_current_screen()->add_help_tab(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'addNew' => __( 'Add New Theme' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'search' => __( 'Search Installed Themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: number of themes */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'themesFound' => __( 'Number of Themes found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noThemesFound' => __( 'No themes found. Try a different search.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,13 +332,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="theme-author"><?php printf( __( 'By %s' ), $theme['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 name */
+ printf( __( 'By %s' ), $theme['author'] );
+ ?>
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="theme-id-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $theme['active'] ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="theme-name" id="<?php echo $aria_name; ?>">
</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: %s: theme name */
</del><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"> printf( __( '<span>Active:</span> %s' ), $theme['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,8 +556,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.active ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
- <p class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="theme-name">{{{ data.name }}}<span class="theme-version">
+ <?php
+ /* translators: %s: Theme version */
+ printf( __( 'Version: %s' ), '{{ data.version }}' );
+ ?>
+ </span></h2>
+ <p class="theme-author">
+ <?php
+ /* translators: %s: Theme author link */
+ printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.hasUpdate ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-warning notice-alt notice-large">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,7 +578,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="theme-description">{{{ data.description }}}</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.parent ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="parent-theme">
+ <?php
+ /* translators: %s: Theme name */
+ printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' );
+ ?>
+ </p>
</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 ( data.tags ) { #>
</span></span></pre></div>
<a id="trunksrcwpadmintoolsphp"></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/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/tools.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/tools.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="card">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="title"><?php _e( 'Categories and Tags Converter' ); ?></h2>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php printf( __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ), 'import.php' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p>
+ <?php
+ printf(
+ /* translators: URL to Import screen */
+ __( 'If you want to convert your categories to tags (or vice versa), use the <a href="%s">Categories and Tags Converter</a> available from the Import screen.' ),
+ 'import.php'
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/update-core.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,6 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
</span><span class="cx" style="display: block; padding: 0 10px"> $submit = __( 'Re-install Now' );
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action = 'update-core.php?action=do-core-reinstall';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,8 +79,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sanitize_title( $update->current )
</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: %s: Update PHP page URL */
- $php_update_message = '</p><p>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $php_update_message = '</p><p>' . sprintf(
+ /* translators: %s: Update PHP page URL */
+ __( '<a href="%s">Learn more about updating PHP</a>.' ),
+ esc_url( wp_get_update_php_url() )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $annotation = wp_get_update_php_annotation();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $annotation ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,17 +91,41 @@
</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 ( ! $mysql_compat && ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ) . $php_update_message;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ),
+ $version_url,
+ $update->current,
+ $update->php_version,
+ $update->mysql_version,
+ $php_version,
+ $mysql_version
+ ) . $php_update_message;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version ) . $php_update_message;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $update->current,
+ $update->php_version,
+ $php_version
+ ) . $php_update_message;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $mysql_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $update->current,
+ $update->mysql_version,
+ $mysql_version
+ );
</ins><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: URL to WordPress release notes, 2: WordPress version number including locale if necessary */
- $message = sprintf( __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ), $version_url, $version_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number including locale if necessary */
+ __( 'You can update to <a href="%1$s">WordPress %2$s</a> automatically:' ),
+ $version_url,
+ $version_string
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mysql_compat || ! $php_compat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $show_buttons = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +161,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Partial builds don't need language-specific warnings.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p class="hint">' . sprintf( __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), $update->response != 'development' ? $update->current : '' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p class="hint">' . sprintf(
+ /* translators: %s: WordPress version */
+ __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ),
+ $update->response != 'development' ? $update->current : ''
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</form>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +272,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $updates ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $normalized_version ) = explode( '-', $wp_version );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<p>' . sprintf( __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<p>' . sprintf(
+ /* translators: 1: URL to About screen, 2: WordPress version */
+ __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ),
+ esc_url( self_admin_url( 'about.php' ) ),
+ $normalized_version
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> dismissed_updates();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,16 +336,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get plugin compat for running version of WordPress.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $cur_wp_version, '>=' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $cur_wp_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $cur_wp_version );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $cur_wp_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
+ $compat = '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $cur_wp_version );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Get plugin compat for updated version of WordPress.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $core_update_version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: 100%% (according to its author)' ), $core_update_version );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: Unknown' ), $core_update_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: WordPress version */
+ $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %s: Unknown' ), $core_update_version );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,8 +358,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $compatible_php && current_user_can( 'update_php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $compat .= '<br>' . __( 'This update doesn’t work with your version of PHP.' ) . ' ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Update PHP page URL */
</del><span class="cx" style="display: block; padding: 0 10px"> $compat .= sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Update PHP page URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%s">Learn more about updating PHP</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_get_update_php_url() )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,13 +395,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $compatible_php ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: plugin name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- __( 'Select %s' ),
- $plugin_data->Name
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Select %s' ), $plugin_data->Name );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,8 +406,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $icon; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php echo $plugin_data->Name; ?></strong>
</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: plugin version, 2: new version */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: plugin version, 2: new version */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You have version %1$s installed. Update to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data->Version,
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data->update->new_version
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,13 +477,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="check-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: theme name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- __( 'Select %s' ),
- $theme->display( 'Name' )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( __( 'Select %s' ), $theme->display( 'Name' ) );
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="plugin-title"><p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,8 +487,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <strong><?php echo $theme->display( 'Name' ); ?></strong>
</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: theme version, 2: new version */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: theme version, 2: new version */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You have version %1$s installed. Update to %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->display( 'Version' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->update['new_version']
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,8 +619,22 @@
</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"> show_message( __( 'WordPress updated successfully' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
- show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ show_message(
+ '<span class="hide-if-no-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen */
+ __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ),
+ $result,
+ esc_url( self_admin_url( 'about.php?updated' ) )
+ ) . '</span>'
+ );
+ show_message(
+ '<span class="hide-if-js">' . sprintf(
+ /* translators: 1: WordPress version, 2: URL to About screen */
+ __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ),
+ $result,
+ esc_url( self_admin_url( 'about.php?updated' ) )
+ ) . '</span>'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span></span></pre></div>
<a id="trunksrcwpadminupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/update.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,6 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'plugin-install.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</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: plugin name and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Installing Plugin: %s' ), $api->name . ' ' . $api->version );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = 'install-plugin_' . $plugin;
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'plugin-install.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</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: file name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Installing Plugin from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = 'plugin-upload';
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-plugin' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,6 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'themes.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</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 and version */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Installing Theme: %s' ), $api->name . ' ' . $api->version );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = 'install-theme_' . $theme;
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,6 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</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: file name */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( 'Installing Theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = 'theme-upload';
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-theme' );
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/upgrade.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,14 +93,34 @@
</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 ( ! $mysql_compat && ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ),
+ $version_url,
+ $wp_version,
+ $required_php_version,
+ $required_mysql_version,
+ $php_version,
+ $mysql_version
+ ) . $php_update_message;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $php_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ) . $php_update_message;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $wp_version,
+ $required_php_version,
+ $php_version
+ ) . $php_update_message;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $mysql_compat ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
- $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = sprintf(
+ /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
+ __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ),
+ $version_url,
+ $wp_version,
+ $required_mysql_version,
+ $mysql_version
+ );
</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"> echo '<p>' . $message . '</p>';
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/user-edit.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-rich-editing-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Visual Editor' ); ?></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td>
+ <label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked( 'false', $profileuser->rich_editing ); ?> />
+ <?php _e( 'Disable the visual editor when writing' ); ?>
+ </label>
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,18 +278,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> user_can( $profileuser, 'edit_themes' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $show_syntax_highlighting_preference ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="user-syntax-highlighting-wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="false" <?php checked( 'false', $profileuser->syntax_highlighting ); ?> /> <?php _e( 'Disable syntax highlighting when editing code' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="syntax_highlighting"><input name="syntax_highlighting" type="checkbox" id="syntax_highlighting" value="false" <?php checked( 'false', $profileuser->syntax_highlighting ); ?> />
+ <?php _e( 'Disable syntax highlighting when editing code' ); ?>
+ </label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( count( $_wp_admin_css_colors ) > 1 && has_action( 'admin_color_scheme_picker' ) ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="user-admin-color-wrap">
-<th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
-<td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="user-admin-color-wrap">
+ <th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
+ <td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires in the 'Admin Color Scheme' section of the user editing screen.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,36 +308,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_color_scheme_picker', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</td>
-</tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // $_wp_admin_css_colors
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="user-comment-shortcuts-wrap">
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?></label> <?php _e( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/" target="_blank">More information</a>' ); ?></td>
-</tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="user-comment-shortcuts-wrap">
+ <th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
+ <td>
+ <label for="comment_shortcuts">
+ <input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profileuser->comment_shortcuts ); ?> />
+ <?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?>
+ </label>
+ <?php _e( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/" target="_blank">More information</a>' ); ?>
+ </td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><?php _e( 'Toolbar' ); ?></th>
-<td>
-<label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
- <?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
-</td>
-</tr>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="show-admin-bar user-admin-bar-front-wrap">
+ <th scope="row"><?php _e( 'Toolbar' ); ?></th>
+ <td>
+ <label for="admin_bar_front">
+ <input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
+ <?php _e( 'Show Toolbar when viewing site' ); ?>
+ </label><br />
+ </td>
+ </tr>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $languages = get_available_languages();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $languages ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<tr class="user-language-wrap">
- <th scope="row">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <tr class="user-language-wrap">
+ <th scope="row">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php /* translators: The user language selection field label */ ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label for="locale"><?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span></label>
- </th>
- <td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="locale"><?php _e( 'Language' ); ?><span class="dashicons dashicons-translation" aria-hidden="true"></span></label>
+ </th>
+ <td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $user_locale = $profileuser->locale;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,8 +366,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"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </td>
-</tr>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </td>
+ </tr>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,8 +582,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( IS_PROFILE_PAGE ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Gravatar URL */
</del><span class="cx" style="display: block; padding: 0 10px"> $description = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Gravatar URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<a href="%s">You can change your profile picture on Gravatar</a>.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://en.gravatar.com/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +756,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != $output ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= ', ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $value ) {
+ $output .= $value;
+ } else {
+ /* translators: %s: capability name */
+ $output .= sprintf( __( 'Denied: %s' ), $cap );
+ }
</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"> echo $output;
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></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-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/user-new.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,8 +123,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> %4$s'
</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: Joining confirmation notification email subject. %s: Site title */
- wp_mail( $new_user_email, sprintf( __( '[%s] Joining Confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail(
+ $new_user_email,
+ sprintf(
+ /* translators: Joining confirmation notification email subject. %s: Site title */
+ __( '[%s] Joining Confirmation' ),
+ wp_specialchars_decode( get_option( 'blogname' ) )
+ ),
+ sprintf(
+ $message,
+ get_option( 'blogname' ),
+ home_url(),
+ wp_specialchars_decode( translate_user_role( $role['name'] ) ),
+ home_url( "/newbloguser/$newuser_key/" )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,11 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'User has been added to your site.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $edit_link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message .= sprintf(
- ' <a href="%s">%s</a>',
- $edit_link,
- __( 'Edit user' )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message .= sprintf( ' <a href="%s">%s</a>', $edit_link, __( 'Edit user' ) );
</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"> $messages[] = $message;
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/users.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,10 +289,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_userids as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $id == $current_user->ID ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: user id, 2: user login */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user ID, 2: user login */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\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: 1: user id, 2: user login */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user ID, 2: user login */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $go_delete++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,10 +427,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = (int) $id;
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'remove_user', $id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: user id, 2: user login */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user ID, 2: user login */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\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: 1: user id, 2: user login */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: user ID, 2: user login */
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $go_remove = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,6 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $delete_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'User deleted.' );
</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: %s: number of users */
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-admin/widgets.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php echo esc_html( $title ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="editwidget"<?php echo $width; ?>>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php printf( __( 'Widget %s' ), $name ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2>
+ <?php
+ /* translators: %s: widget name */
+ printf( __( 'Widget %s' ), $name );
+ ?>
+ </h2>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="widgets.php" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-inside">
</span></span></pre></div>
<a id="trunksrcwpincludesadminbarphp"></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/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/admin-bar.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,7 +896,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_mod = $awaiting_mod->moderated;
</span><span class="cx" style="display: block; padding: 0 10px"> $awaiting_text = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: number of comments in moderation */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_mod ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $awaiting_mod )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesauthortemplatephp"></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/author-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/author-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/author-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '1.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: get_the_author() */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: get_the_author() */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead if you do not want the value echoed.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>get_the_author()</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesbookmarktemplatephp"></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/bookmark-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/bookmark-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title .= ' (';
</span><span class="cx" style="display: block; padding: 0 10px"> $title .= sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: date and time of last update */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Last updated: %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> gmdate(
</span><span class="cx" style="display: block; padding: 0 10px"> get_option( 'links_updated_date_format' ),
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/category-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,8 +355,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>type => link</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>taxonomy => link_category</code>'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,6 +831,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $args['topic_count_text_callback'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Look for the alternative callback style. Ignore the previous default.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of items (tags) */
</ins><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = _n_noop( '%s item', '%s items' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,6 +842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = _n_noop( $args['single_text'], $args['multiple_text'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // This is the default for when no callback, plural, or argument is passed in.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of items (tags) */
</ins><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = _n_noop( '%s item', '%s items' );
</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="trunksrcwpincludescategoryphp"></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/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/category.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,8 +42,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: "type => link", 2: "taxonomy => link_category" */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>type => link</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>taxonomy => link_category</code>'
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercommentphp"></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-walker-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-comment.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-walker-comment.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,8 +282,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo get_avatar( $comment, $args['avatar_size'] );}
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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: %s: comment author link */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: comment author link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%s <span class="says">says:</span>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<cite class="fn">%s</cite>', get_comment_author_link( $comment ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,11 +368,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $args['avatar_size'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo get_avatar( $comment, $args['avatar_size'] );}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo get_avatar( $comment, $args['avatar_size'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</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: %s: comment author link */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: comment author link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%s <span class="says">says:</span>' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3820,8 +3820,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_panel( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Removing core components this way is _doing_it_wrong().
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $id, $this->components, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
</del><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $id,
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'invalidTitleTpl' => __( '%s (Invalid)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: title of menu item in draft status */
</span><span class="cx" style="display: block; padding: 0 10px"> 'pendingTitleTpl' => __( '%s (Pending)' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: number of menu items found */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'itemsFound' => __( 'Number of items found: %d' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: number of additional menu items found */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'itemsFoundMore' => __( 'Additional items found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'itemsLoadingMore' => __( 'Loading more results... please wait.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'reorderModeOn' => __( 'Reorder mode enabled' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,8 +592,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a panel for Menus.
</span><span class="cx" style="display: block; padding: 0 10px"> $description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'widgets' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: URL to the widgets panel of the customizer */
- $description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “Navigation Menu” widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $description .= '<p>' . sprintf(
+ /* translators: %s: URL to the widgets panel of the customizer */
+ __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a “Navigation Menu” widget.' ),
+ "javascript:wp.customize.panel( 'widgets' ).focus();"
+ ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdatequeryphp"></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-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-date-query.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-wp-date-query.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,8 +425,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $day_exists && $month_exists && $year_exists ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 1. Checking day, month, year combination.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_checkdate( $date_query['month'], $date_query['day'], $date_query['year'], sprintf( '%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day'] ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: year, 2: month, 3: day of month */
</del><span class="cx" style="display: block; padding: 0 10px"> $day_month_year_error_msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: year, 2: month, 3: day of month */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $date_query['year'] ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $date_query['month'] ) . '</code>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -441,8 +441,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * We use 2012 because, as a leap year, it's the most permissive.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_checkdate( $date_query['month'], $date_query['day'], 2012, sprintf( '2012-%s-%s', $date_query['month'], $date_query['day'] ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: month, 2: day of month */
</del><span class="cx" style="display: block; padding: 0 10px"> $day_month_year_error_msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: month, 2: day of month */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The following values do not describe a valid date: month %1$s, day %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $date_query['month'] ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . esc_html( $date_query['day'] ) . '</code>'
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-wp-query.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1788,8 +1788,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_Query',
</span><span class="cx" style="display: block; padding: 0 10px"> '3.1.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. Use %2$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>caller_get_posts</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>ignore_sticky_posts</code>'
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></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-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/class-wp-theme.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->headers['Name'] = $this->stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors = new WP_Error(
+ 'theme_not_found',
+ sprintf(
+ /* translators: %s: theme directory name */
+ __( 'The theme directory "%s" does not exist.' ),
+ esc_html( $this->stylesheet )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,8 +278,14 @@
</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 ( ! $this->template && $this->stylesheet === $this->headers['Template'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Template */
- $this->errors = new WP_Error( 'theme_child_invalid', sprintf( __( 'The theme defines itself as its parent theme. Please check the %s header.' ), '<code>Template</code>' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors = new WP_Error(
+ 'theme_child_invalid',
+ sprintf(
+ /* translators: %s: Template */
+ __( 'The theme defines itself as its parent theme. Please check the %s header.' ),
+ '<code>Template</code>'
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +341,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root_template = $directories[ $this->template ]['theme_root'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Parent theme is missing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors = new WP_Error(
+ 'theme_no_parent',
+ sprintf(
+ /* translators: %s: theme directory name */
+ __( 'The parent theme is missing. Please install the "%s" parent theme.' ),
+ esc_html( $this->template )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +368,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_child->parent = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_child->errors = new WP_Error(
+ 'theme_parent_invalid',
+ sprintf(
+ /* translators: %s: theme directory name */
+ __( 'The "%s" theme is not a valid parent theme.' ),
+ esc_html( $_child->template )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $_child->cache_add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +387,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> // The two themes actually reference each other with the Template header.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_child->stylesheet == $this->template ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->errors = new WP_Error(
+ 'theme_parent_invalid',
+ sprintf(
+ /* translators: %s: theme directory name */
+ __( 'The "%s" theme is not a valid parent theme.' ),
+ esc_html( $this->template )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/comment-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1151,8 +1151,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '2.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: get_trackback_url() */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: get_trackback_url() */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Use %s instead if you do not want the value echoed.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>get_trackback_url()</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1934,6 +1934,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $noreplytext = __( 'Leave a Reply' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $replytext ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: author of the comment being replied to */
</ins><span class="cx" style="display: block; padding: 0 10px"> $replytext = __( 'Leave a Reply to %s' );
</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">@@ -2292,7 +2293,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $required_text = sprintf(
+ /* translators: %s: an asterisk symbol (*) */
+ ' ' . __( 'Required fields are marked %s' ),
+ '<span class="required">*</span>'
+ );
</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 default comment form fields.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2308,16 +2313,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/link-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_log_in' => '<p class="must-log-in">' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: login URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/link-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'logged_in_as' => '<p class="logged-in-as">' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> get_edit_user_link(),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: user name */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_identity,
</span><span class="cx" style="display: block; padding: 0 10px"> wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2330,6 +2335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'class_submit' => 'submit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'name_submit' => 'submit',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply' => __( 'Leave a Reply' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: author of the comment being replied to */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_to' => __( 'Leave a Reply to %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_before' => '<h3 id="reply-title" class="comment-reply-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title_reply_after' => '</h3>',
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></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/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/embed.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,6 +1084,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="dashicons dashicons-admin-comments"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of comments */
</ins><span class="cx" style="display: block; padding: 0 10px"> _n(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s <span class="screen-reader-text">Comment</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> '%s <span class="screen-reader-text">Comments</span>',
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/functions.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2525,7 +2525,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ifp = @fopen( $new_file, 'wb' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ifp ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array(
+ /* translators: %s: file name */
+ 'error' => sprintf( __( 'Could not write file %s' ), $new_file ),
+ );
</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"> fwrite( $ifp, $bits );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4630,9 +4633,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( '__' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $parent_class ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
</del><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $class,
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_class,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4641,9 +4644,9 @@
</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"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: PHP class name, 2: version number, 3: __construct() method */
</del><span class="cx" style="display: block; padding: 0 10px"> trigger_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: PHP class name, 2: version number, 3: __construct() method */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $class,
</span><span class="cx" style="display: block; padding: 0 10px"> $version,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4901,8 +4904,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: version number */
</span><span class="cx" style="display: block; padding: 0 10px"> $version = sprintf( __( '(This message was added in version %s.)' ), $version );
</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: %s: Documentation URL */
</del><span class="cx" style="display: block; padding: 0 10px"> $message .= ' ' . sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/debugging-in-wordpress/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6756,6 +6759,7 @@
</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 class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // get site name
</span><span class="cx" style="display: block; padding: 0 10px"> $site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/general-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,6 +1097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a page number if necessary.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: page number */
</ins><span class="cx" style="display: block; padding: 0 10px"> $title['page'] = sprintf( __( 'Page %s' ), max( $paged, $page ) );
</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="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/link-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1711,7 +1711,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Back-compat, $excluded_terms used to be $excluded_categories with IDs separated by " and ".
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $excluded_terms, ' and ' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_argument( __FUNCTION__, '3.3.0', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_argument(
+ __FUNCTION__,
+ '3.3.0',
+ sprintf(
+ /* translators: %s: the word 'and' */
+ __( 'Use commas instead of %s to separate excluded terms.' ),
+ "'and'"
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> $excluded_terms = explode( ' and ', $excluded_terms );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $excluded_terms = explode( ',', $excluded_terms );
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/load.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,8 +489,8 @@
</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><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><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"> __( '<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 class="cx" style="display: block; padding: 0 10px"> '<code>wp-config.php</code>'
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></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/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/media-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,8 +222,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! _device_can_upload() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="upload-ui">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="upload-instructions"><?php _e( 'Your browseer cannot upload files' ); ?></h2>
- <p><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2 class="upload-instructions"><?php _e( 'Your browser cannot upload files' ); ?></h2>
+ <p>
+ <?php
+ printf(
+ /* translators: %s: https://apps.wordpress.org/ */
+ __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ),
+ 'https://apps.wordpress.org/'
+ );
+ ?>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="upload-ui">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +274,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="max-upload-size">
</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">- printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: maximum allowed file size */
+ __( 'Maximum upload file size: %s.' ),
+ esc_html( size_format( $max_upload_size ) )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/media.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3705,7 +3705,12 @@
</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"> foreach ( $months as $month_year ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $month_year->text = sprintf(
+ /* translators: 1: month, 2: year */
+ __( '%1$s %2$d' ),
+ $wp_locale->get_month( $month_year->month ),
+ $month_year->year
+ );
</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"> $settings = array(
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/ms-functions.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,6 +944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_blog_notification_email',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: Activation URL, 2: New site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( "To activate your blog, please click the following link:\n\n%1\$s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%2\$s" ),
</span><span class="cx" style="display: block; padding: 0 10px"> $domain,
</span><span class="cx" style="display: block; padding: 0 10px"> $path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,6 +958,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( "http://{$domain}{$path}" ),
</span><span class="cx" style="display: block; padding: 0 10px"> $key
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // TODO: Don't hard code activation link.
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,6 +990,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'http://' . $domain . $path )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1060,6 +1063,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> apply_filters(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpmu_signup_user_notification_email',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user notification email. %s: Activation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login,
</span><span class="cx" style="display: block; padding: 0 10px"> $user_email,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1068,6 +1072,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( "wp-activate.php?key=$key" )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // TODO: Don't hard code activation link.
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,6 +1098,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name,
</span><span class="cx" style="display: block; padding: 0 10px"> $user_login
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1378,8 +1384,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $siteurl = site_url();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</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: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
</del><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'New Site: %1$s
</span><span class="cx" style="display: block; padding: 0 10px"> URL: %2$s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1402,7 +1408,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
</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: New site notification email subject. %s: New site URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -1431,8 +1439,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options_site_url = esc_url( network_admin_url( 'settings.php' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg = sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'New User: %1$s
</span><span class="cx" style="display: block; padding: 0 10px"> Remote IP address: %2$s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,7 +1463,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $user WP_User instance of the new user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* translators: New user notification email subject. %s: User login */
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $email, sprintf( __( 'New User Registration: %s' ), $user->user_login ), $msg );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -1613,6 +1625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = apply_filters( 'update_welcome_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,6 +1717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the email.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2075,10 +2089,25 @@
</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( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ), home_url() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: Home URL */
+ __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ),
+ home_url()
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%1$s">homepage</a> or <a href="%2$s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress › Success' ), array( 'response' => 200 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: 1: Home URL, 2: Admin URL */
+ __( 'You have been added to this site. Please visit the <a href="%1$s">homepage</a> or <a href="%2$s">log in</a> using your username and password.' ),
+ home_url(),
+ admin_url()
+ ),
+ __( 'WordPress › Success' ),
+ array( 'response' => 200 )
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2651,8 +2680,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITEURL###', network_home_url(), $content );
</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: Email change notification email subject. %s: Network title */
- wp_mail( $value, sprintf( __( '[%s] Network Admin Email Change Request' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_mail(
+ $value,
+ sprintf(
+ /* translators: Email change notification email subject. %s: Network title */
+ __( '[%s] Network Admin Email Change Request' ),
+ wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES )
+ ),
+ $content
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $switched_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></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-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/ms-load.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,8 +106,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
</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: %s: admin email link */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: admin email link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="mailto:%1$s">%1$s</a>', $admin_email )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,8 +489,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Documentation URL */
</del><span class="cx" style="display: block; padding: 0 10px"> $msg .= sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/debugging-a-wordpress-network/' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/nav-menu.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,8 +327,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_exists',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: menu name */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: menu name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The menu name %s conflicts with another menu name. Please try another.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,8 +342,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $menu_exists ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_exists',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: menu name */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: menu name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The menu name %s conflicts with another menu name. Please try another.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></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/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/option.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_protect_special_option( $option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'alloptions' === $option || 'notoptions' === $option ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die(
+ sprintf(
+ /* translators: %s: option name */
+ __( '%s is a protected WP option and may not be modified' ),
+ esc_html( $option )
+ )
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2136,8 +2142,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: misc */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: misc */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'misc'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2149,8 +2155,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: privacy */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: privacy */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'privacy'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2189,8 +2195,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: misc */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: misc */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'misc'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2202,8 +2208,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: privacy */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: privacy */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The "%s" options group has been removed. Use another settings group.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'privacy'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2219,8 +2225,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '4.7.0',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: $sanitize_callback, 2: register_setting() */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: $sanitize_callback, 2: register_setting() */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is deprecated. The callback from %2$s is used instead.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>$sanitize_callback</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>register_setting()</code>'
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/pluggable.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1582,6 +1582,7 @@
</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"> $notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: comment URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1767,8 +1768,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Comment moderation. %s: Comment action URL */
</span><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. %s: Number of comments awaiting approval */
</del><span class="cx" style="display: block; padding: 0 10px"> $notify_message .= sprintf(
</span><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"> _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 class="cx" style="display: block; padding: 0 10px"> 'Currently %s comments are waiting for approval. Please visit the moderation panel:',
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></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/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/post-template.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,6 +123,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post->post_password ) ) {
</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: protected post title */
+ $prepend = __( 'Protected: %s' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the text prepended to the post title for protected posts.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,10 +137,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'Protected: %s'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Current post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $protected_title_format = apply_filters( 'protected_title_format', $prepend, $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $protected_title_format, $title );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
</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: private post title */
+ $prepend = __( 'Private: %s' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the text prepended to the post title of private posts.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'Private: %s'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post Current post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $private_title_format = apply_filters( 'private_title_format', $prepend, $post );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $private_title_format, $title );
</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="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/post.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Published', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of published posts */
+ 'label_count' => _n_noop(
+ 'Published <span class="count">(%s)</span>',
+ 'Published <span class="count">(%s)</span>'
+ ),
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +326,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Scheduled', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of scheduled posts */
+ 'label_count' => _n_noop(
+ 'Scheduled <span class="count">(%s)</span>',
+ 'Scheduled <span class="count">(%s)</span>'
+ ),
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +340,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Draft', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of draft posts */
+ 'label_count' => _n_noop(
+ 'Draft <span class="count">(%s)</span>',
+ 'Drafts <span class="count">(%s)</span>'
+ ),
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +354,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Pending', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pending posts */
+ 'label_count' => _n_noop(
+ 'Pending <span class="count">(%s)</span>',
+ 'Pending <span class="count">(%s)</span>'
+ ),
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +368,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Private', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'private' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of private posts */
+ 'label_count' => _n_noop(
+ 'Private <span class="count">(%s)</span>',
+ 'Private <span class="count">(%s)</span>'
+ ),
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +382,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Trash', 'post status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of trashed posts */
+ 'label_count' => _n_noop(
+ 'Trash <span class="count">(%s)</span>',
+ 'Trash <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_status_list' => true,
</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">@@ -392,7 +416,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Pending', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of pending requests */
+ 'label_count' => _n_noop(
+ 'Pending <span class="count">(%s)</span>',
+ 'Pending <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude_from_search' => false,
</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">@@ -403,7 +431,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Confirmed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Confirmed <span class="count">(%s)</span>', 'Confirmed <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of confirmed requests */
+ 'label_count' => _n_noop(
+ 'Confirmed <span class="count">(%s)</span>',
+ 'Confirmed <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude_from_search' => false,
</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">@@ -414,7 +446,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Failed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of failed requests */
+ 'label_count' => _n_noop(
+ 'Failed <span class="count">(%s)</span>',
+ 'Failed <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude_from_search' => false,
</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">@@ -425,7 +461,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Completed', 'request status' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'internal' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => true, /* internal use only. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label_count' => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of completed requests */
+ 'label_count' => _n_noop(
+ 'Completed <span class="count">(%s)</span>',
+ 'Completed <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exclude_from_search' => false,
</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">@@ -2650,32 +2690,56 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'image' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Images' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Images' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of images */
+ _n_noop(
+ 'Image <span class="count">(%s)</span>',
+ 'Images <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'audio' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Audio' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Audio' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of audio files */
+ _n_noop(
+ 'Audio <span class="count">(%s)</span>',
+ 'Audio <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'video' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Video' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Video' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of video files */
+ _n_noop(
+ 'Video <span class="count">(%s)</span>',
+ 'Video <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'document' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Documents' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Documents' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Document <span class="count">(%s)</span>', 'Documents <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of documents */
+ _n_noop(
+ 'Document <span class="count">(%s)</span>',
+ 'Documents <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'spreadsheet' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Spreadsheets' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Spreadsheets' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Spreadsheet <span class="count">(%s)</span>', 'Spreadsheets <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of spreadsheets */
+ _n_noop(
+ 'Spreadsheet <span class="count">(%s)</span>',
+ 'Spreadsheets <span class="count">(%s)</span>'
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'archive' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Archives' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Manage Archives' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n_noop( 'Archive <span class="count">(%s)</span>', 'Archives <span class="count">(%s)</span>' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: number of archives */
+ _n_noop(
+ 'Archive <span class="count">(%s)</span>',
+ 'Archives <span class="count">(%s)</span>'
+ ),
</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></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/query.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -863,7 +863,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function is_main_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'pre_get_posts' === current_filter() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: pre_get_posts 2: WP_Query->is_main_query() 3: is_main_query() 4: link to codex is_main_query() page. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: pre_get_posts, 2: WP_Query->is_main_query(), 3: is_main_query(), 4: link to codex is_main_query() page. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'In %1$s, use the %2$s method, not the %3$s function. See %4$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>pre_get_posts</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>WP_Query->is_main_query()</code>',
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiclasswprestrequestphp"></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/rest-api/class-wp-rest-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -805,6 +805,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $invalid_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_invalid_param',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: list of invalid parameters */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,6 +851,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $required ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_missing_callback_param',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: list of required parameters */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -885,6 +887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $invalid_params ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_invalid_param',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: list of invalid parameters */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400,
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestcommentscontrollerphp"></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/rest-api/endpoints/class-wp-rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,12 @@
</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( $forbidden_params ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new WP_Error( 'rest_forbidden_param', sprintf( __( 'Query parameter not permitted: %s' ), implode( ', ', $forbidden_params ) ), array( 'status' => rest_authorization_required_code() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new WP_Error(
+ 'rest_forbidden_param',
+ /* translators: %s: list of forbidden parameters */
+ sprintf( __( 'Query parameter not permitted: %s' ), implode( ', ', $forbidden_params ) ),
+ array( 'status' => rest_authorization_required_code() )
+ );
</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></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestsettingscontrollerphp"></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/rest-api/endpoints/class-wp-rest-settings-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,6 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( rest_validate_value_from_schema( get_option( $args['option_name'], false ), $args['schema'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_invalid_stored_value',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: property name */
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( __( 'The %s property has an invalid stored value, and cannot be updated to null.' ), $name ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'status' => 500 )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiphp"></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/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/rest-api.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,6 +1177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $args['additionalProperties'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $args['additionalProperties'] ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: property of an object */
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not a valid property of Object.' ), $property ) );
</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="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/script-loader.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1115,6 +1115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Error messages for Plupload.
</span><span class="cx" style="display: block; padding: 0 10px"> $uploader_l10n = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'queue_limit_exceeded' => __( 'You have attempted to queue too many files.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: File name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'file_exceeds_size_limit' => __( '%s exceeds the maximum upload size for this site.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'zero_byte_file' => __( 'This file is empty. Please try another.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'invalid_filetype' => __( 'Sorry, this file type is not permitted for security reasons.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1128,6 +1129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'upload_failed' => __( 'Upload failed.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Opening link tag, 2: Closing link tag */
</span><span class="cx" style="display: block; padding: 0 10px"> 'big_upload_failed' => __( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: File name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'big_upload_queued' => __( '%s exceeds the maximum upload size for the multi-file uploader when used in your browser.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'io_error' => __( 'IO error.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'security_error' => __( 'Security error.' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1136,6 +1138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'dismiss' => __( 'Dismiss' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'crunching' => __( 'Crunching…' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => __( 'moved to the trash.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: File name */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'error_uploading' => __( '“%s” has failed to upload.' ),
</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">@@ -1780,6 +1783,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'unknownError' => __( 'Something went wrong.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'connectionError' => __( 'Connection lost or the server is busy. Please try again later.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonceError' => __( 'An error has occurred. Please reload the page and try again.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Number of plugins */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'pluginsFound' => __( 'Number of plugins found: %d' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPluginsFound' => __( 'No plugins found. Try a different search.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatcommentsphp"></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-compat/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/theme-compat/comments.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,11 +33,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 id="comments">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == get_comments_number() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: post title */
- printf( __( 'One response to %s' ), '“' . get_the_title() . '”' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: %s: post title */
+ __( 'One response to %s' ),
+ '“' . get_the_title() . '”'
+ );
</ins><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: number of comments, 2: post title */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><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"> _n( '%1$s response to %2$s', '%1$s responses to %2$s', get_comments_number() ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( get_comments_number() ),
</span><span class="cx" style="display: block; padding: 0 10px"> '“' . get_the_title() . '”'
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatsidebarphp"></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-compat/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/sidebar.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/theme-compat/sidebar.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_category() ) : /* If this is a category archive */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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: %s: category name */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: category name */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You are currently browsing the archives for the %s category.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> single_cat_title( '', false )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,8 +52,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_day() ) : /* If this is a daily archive */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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 link, 2: archive date */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site link, 2: archive date */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You are currently browsing the %1$s blog archives for the day %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_time( __( 'l, F jS, Y' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,8 +64,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_month() ) : /* If this is a monthly archive */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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 link, 2: archive month */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site link, 2: archive month */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You are currently browsing the %1$s blog archives for %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_time( __( 'F, Y' ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( is_year() ) : /* If this is a yearly archive */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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 link, 2: archive year */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site link, 2: archive year */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You are currently browsing the %1$s blog archives for the year %2$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_the_time( 'Y' )
</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"> <?php elseif ( is_search() ) : /* If this is a search result */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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 link, 2: search query */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: site link, 2: search query */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You have searched the %1$s blog archives for <strong>‘%2$s’</strong>. If you are unable to find anything in these search results, you can try one of these links.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_html( get_search_query() )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,8 +100,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) : /* If this set is paginated */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</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: %s: site link */
</del><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: site link */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'You are currently browsing the %s blog archives.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) )
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/theme.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2564,10 +2564,10 @@
</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: title-tag, 2: wp_loaded */
</del><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' )",
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><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"> __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>title-tag</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>wp_loaded</code>'
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/user.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2557,7 +2557,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_pass = wp_generate_password( 12, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user_id || is_wp_error( $user_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $errors->add(
+ 'registerfail',
+ sprintf(
+ /* translators: %s: admin email address */
+ __( '<strong>ERROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ),
+ get_option( 'admin_email' )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> return $errors;
</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="trunksrcwpincludeswidgetsclasswpnavmenuwidgetphp"></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-nav-menu-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/widgets/class-wp-nav-menu-widget.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,8 +142,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = admin_url( 'nav-menus.php' );
</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: URL to create a new menu */
+ printf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo sprintf( __( 'No menus have been created yet. <a href="%s">Create some</a>.' ), esc_attr( $url ) ); ?>
</del><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="nav-menu-widget-form-controls" <?php echo $empty_menus_style; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetrecentcommentsphp"></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-recent-comments.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-recent-comments.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/widgets/class-wp-widget-recent-comments.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,8 +120,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $comments as $comment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<li class="recentcomments">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: comments widget: 1: comment author, 2: post link */
</del><span class="cx" style="display: block; padding: 0 10px"> $output .= sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: comments widget: 1: comment author, 2: post link */
</ins><span class="cx" style="display: block; padding: 0 10px"> _x( '%1$s on %2$s', 'widgets' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/widgets.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_args = $args;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $number > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_args['name'] = isset( $args['name'] ) ? sprintf( $args['name'], $i ) : sprintf( __( 'Sidebar %d' ), $i );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['name'] ) ) {
+ $_args['name'] = sprintf( $args['name'], $i );
+ } else {
+ /* translators: %d: Sidebar number */
+ $_args['name'] = sprintf( __( 'Sidebar %d' ), $i );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,6 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id_is_empty = empty( $args['id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %d: Sidebar number */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => sprintf( __( 'Sidebar %d' ), $i ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => "sidebar-$i",
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,8 +266,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $id_is_empty ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
- _doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _doing_it_wrong(
+ __FUNCTION__,
+ sprintf(
+ /* translators: 1: the id argument, 2: sidebar name, 3: recommended id value */
+ __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ),
+ '<code>id</code>',
+ $sidebar['name'],
+ $sidebar['id']
+ ),
+ '4.2.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"> $wp_registered_sidebars[ $sidebar['id'] ] = $sidebar;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1104,8 +1119,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_widget_factory;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $wp_widget_factory->widgets[ $widget ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: register_widget() */
- _doing_it_wrong( __FUNCTION__, sprintf( __( 'Widgets need to be registered using %s, before they can be displayed.' ), '<code>register_widget()</code>' ), '4.9.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _doing_it_wrong(
+ __FUNCTION__,
+ sprintf(
+ /* translators: %s: register_widget() */
+ __( 'Widgets need to be registered using %s, before they can be displayed.' ),
+ '<code>register_widget()</code>'
+ ),
+ '4.9.0'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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="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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-includes/wp-db.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1307,7 +1307,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // This is not meant to be foolproof -- but it will catch obviously incorrect usage.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $query, '%' ) === false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _doing_it_wrong(
+ 'wpdb::prepare',
+ sprintf(
+ /* translators: %s: wpdb::prepare() */
+ __( 'The query argument of %s must have a placeholder.' ),
+ 'wpdb::prepare()'
+ ),
+ '3.9.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"> // If args were passed as an array (as in vsprintf), move them up.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1320,7 +1328,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args as $arg ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_scalar( $arg ) && ! is_null( $arg ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'Unsupported value type (%s).' ), gettype( $arg ) ), '4.8.2' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _doing_it_wrong(
+ 'wpdb::prepare',
+ sprintf(
+ /* translators: %s: value type */
+ __( 'Unsupported value type (%s).' ),
+ gettype( $arg )
+ ),
+ '4.8.2'
+ );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1373,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === $placeholders && $passed_as_array ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the passed query only expected one argument, but the wrong number of arguments were sent as an array, bail.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _doing_it_wrong( 'wpdb::prepare', __( 'The query only expected one placeholder, but an array of multiple placeholders was sent.' ), '4.9.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _doing_it_wrong(
+ 'wpdb::prepare',
+ __( 'The query only expected one placeholder, but an array of multiple placeholders was sent.' ),
+ '4.9.0'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1368,8 +1388,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpdb::prepare',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: number of placeholders, 2: number of arguments passed */
</del><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: number of placeholders, 2: number of arguments passed */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $placeholders,
</span><span class="cx" style="display: block; padding: 0 10px"> count( $args )
</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 2019-09-01 15:17:37 UTC (rev 45925)
+++ trunk/src/wp-login.php 2019-09-01 17:12:43 UTC (rev 45926)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,13 +444,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $message && ! wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: URL to support page for resetting your password */
- $support = __( 'https://wordpress.org/support/article/resetting-your-password/' );
</del><span class="cx" style="display: block; padding: 0 10px"> $errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'retrieve_password_email_failure',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Documentation URL */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>ERROR</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url( $support )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
</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 $errors;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,8 +652,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Current administration email: <strong>%s</strong>' ),
- esc_html( $admin_email )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: admin email address */
+ __( 'Current administration email: %s' ),
+ '<strong>' . esc_html( $admin_email ) . '</strong>'
</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></pre>
</div>
</div>
</body>
</html>