<!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>[57714] trunk/src: Upgrade/Install: Improve localized strings related to plugin/theme installation and activation.</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/57714">57714</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/57714","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-26 20:33:46 +0000 (Mon, 26 Feb 2024)</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'>Upgrade/Install: Improve localized strings related to plugin/theme installation and activation.

Adds context to strings where applicable to disambiguate them, coherently throughout the admin. Also improves some of the strings introduced in <a href="https://core.trac.wordpress.org/changeset/57545">[57545]</a> to ease localization.

Props swissspidy, costdev.
Fixes <a href="https://core.trac.wordpress.org/ticket/60630">#60630</a>. See <a href="https://core.trac.wordpress.org/ticket/22316">#22316</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswpupdatesjs">trunk/src/js/_enqueues/wp/updates.js</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesclassplugininstallerskinphp">trunk/src/wp-admin/includes/class-plugin-installer-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="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-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="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-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="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludesthemeinstallphp">trunk/src/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunksrcwpadminpressthisphp">trunk/src/wp-admin/press-this.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswpupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/updates.js      2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/js/_enqueues/wp/updates.js        2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,7 +957,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $document.trigger( 'wp-check-plugin-dependencies-success', response );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'plugins-network' === pagenow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        buttonText = _x( 'Network Activate' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 buttonText = _x( 'Network Activate', 'plugin' );
</ins><span class="cx" style="display: block; padding: 0 10px">                         ariaLabel  = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                _x( 'Network Activate %s', 'plugin' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,7 +1013,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        wp.updates.checkPluginDependenciesError = function( response ) {
</span><span class="cx" style="display: block; padding: 0 10px">                var $message = $( '.plugin-card-' + response.slug + ', #plugin-information-footer' ).find( '.install-now' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        buttonText = __( 'Activate' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 buttonText = _x( 'Activate', 'plugin' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         ariaLabel = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: 1: Plugin name, 2. The reason the plugin cannot be activated. */
</span><span class="cx" style="display: block; padding: 0 10px">                                _x( 'Cannot activate %1$s. %2$s', 'plugin' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1087,7 +1087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        slug: args.slug,
</span><span class="cx" style="display: block; padding: 0 10px">                                        removeClasses: 'installed updated-message button-primary',
</span><span class="cx" style="display: block; padding: 0 10px">                                        addClasses: 'activating-message',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        text: _x( 'Activating...', 'plugin' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 text: __( 'Activating...' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                         ariaLabel: sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                _x( 'Activating %s', 'plugin' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,7 +1300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        pluginName
</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">-                        .text( __( 'Install Now' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 .text( _x( 'Install Now', 'plugin' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                wp.a11y.speak( errorMessage, 'assertive' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,7 +1454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $itemsCount.text(
</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %s: The remaining number of plugins. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                _nx( '%s item', '%s items', 'plugin/plugins', remainingCount ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         _nx( '%s item', '%s items', remainingCount, 'plugin/plugins'  ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 remainingCount
</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">@@ -1803,7 +1803,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                                response.themeName
</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">-                                                .text( __( 'Activate' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         .text( _x( 'Activate', 'theme' ) );
</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">@@ -2625,7 +2625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        $message
</span><span class="cx" style="display: block; padding: 0 10px">                                                .removeClass( 'updating-message' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                .text( __( 'Install Now' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         .text( _x( 'Install Now', 'plugin' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        wp.a11y.speak( __( 'Update canceled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2663,7 +2663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                $activateButton.data( 'name' )
</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">-                                .text( _x( 'Activating...', 'plugin' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         .text( __( 'Activating...' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        wp.updates.activatePlugin(
</span><span class="cx" style="display: block; padding: 0 10px">                                {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2706,7 +2706,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                                pluginName
</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">-                                                .text( __( 'Install Now' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         .text( _x( 'Install Now', 'plugin' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        wp.a11y.speak( __( 'Update canceled.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">                                } );
</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     2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/import.php       2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                esc_attr( $data[0] ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                /* translators: %s: Importer name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $data[0] ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                __( 'Install Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         _x( 'Install Now', 'plugin' )
</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">                                        $action = sprintf(
</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       2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $install_actions['network_activate'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                '<a class="button button-primary" href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px">                                wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                __( 'Network Activate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         _x( 'Network Activate', 'plugin' )
</ins><span class="cx" style="display: block; padding: 0 10px">                         );
</span><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></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        2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php  2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        '<a href="%s" class="activatelink">' .
</span><span class="cx" style="display: block; padding: 0 10px">                        '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px">                        esc_url( $activate_link ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        __( 'Activate' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 _x( 'Activate', 'theme' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         /* translators: Hidden accessibility text. %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px">                        sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $name )
</span><span class="cx" style="display: block; padding: 0 10px">                );
</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 2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-theme-upgrader-skin.php   2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        '<a href="%s" class="activatelink">' .
</span><span class="cx" style="display: block; padding: 0 10px">                                        '<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        esc_url( $activate_link ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        __( 'Activate' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 _x( 'Activate', 'theme' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                         /* translators: Hidden accessibility text. %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                        sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $name )
</span><span class="cx" style="display: block; padding: 0 10px">                                );
</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      2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php        2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,7 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'activateblog_' . $blog['blog_id']
</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">-                                        __( 'Activate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 _x( 'Activate', 'site' )
</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">                                $actions['deactivate'] = sprintf(
</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       2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,11 +607,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'active' !== $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? _x( 'Network Activate', 'plugin' ) : _x( '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 ( 'inactive' !== $status && 'recent' !== $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? _x( 'Network Deactivate', 'plugin' ) : _x( 'Deactivate', '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() || $this->screen->in_admin( 'network' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -820,7 +820,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                                esc_attr( $plugin_id_attr ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                __( 'Network Deactivate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         _x( 'Network Deactivate', '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">                                        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +828,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( current_user_can( 'manage_network_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( $compatible_php && $compatible_wp ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( $has_unmet_dependencies ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                $actions['activate'] = __( 'Network Activate' ) .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         $actions['activate'] = _x( 'Network Activate', 'plugin' ) .
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         '<span class="screen-reader-text">' .
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        __( 'You cannot activate this plugin as it has unmet requirements.' ) .
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        '</span>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,7 +845,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        esc_attr( $plugin_id_attr ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        esc_attr( sprintf( _x( 'Network Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        __( 'Network Activate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 _x( 'Network 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">                                                } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -934,7 +934,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( current_user_can( 'activate_plugin', $plugin_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                if ( $compatible_php && $compatible_wp ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                        if ( $has_unmet_dependencies ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                $actions['activate'] = __( 'Activate' ) .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         $actions['activate'] = _x( 'Activate', 'plugin' ) .
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                         '<span class="screen-reader-text">' .
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        __( 'You cannot activate this plugin as it has unmet requirements.' ) .
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        '</span>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -951,7 +951,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        esc_attr( $plugin_id_attr ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                                        esc_attr( sprintf( _x( 'Activate %s', 'plugin' ), $plugin_data['Name'] ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        __( 'Activate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 _x( '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">                                                } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1532,11 +1532,18 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $dependency_note = __( 'Note: this plugin cannot be deactivated or deleted until the plugins that require it are deactivated or deleted.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $dependency_note = __( 'Note: This plugin cannot be deactivated or deleted until the plugins that require it are deactivated or deleted.' );
+
+               $comma       = wp_get_list_item_separator();
+               $required_by = sprintf(
+                       /* translators: %s: List of dependencies. */
+                       __( '<strong>Required by:</strong> %s' ),
+                       implode( $comma, $dependent_names )
+               );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        '<div class="required-by"><p><strong>%1$s</strong> %2$s</p><p>%3$s</p></div>',
-                       __( 'Required by:' ),
-                       esc_html( implode( ' | ', $dependent_names ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '<div class="required-by"><p>%1$s</p><p>%2$s</p></div>',
+                       $required_by,
</ins><span class="cx" style="display: block; padding: 0 10px">                         $dependency_note
</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">@@ -1560,12 +1567,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $links[] = $this->get_dependency_view_details_link( $name, $slug );
</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">-                $dependency_note = __( 'Note: this plugin cannot be activated until the plugins that are required by it are activated.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $dependency_note = __( 'Note: This plugin cannot be activated until the plugins that are required by it are activated.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $comma    = wp_get_list_item_separator();
+               $requires = sprintf(
+                       /* translators: %s: List of dependency names. */
+                       __( '<strong>Requires:</strong> %s' ),
+                       implode( $comma, $links )
+               );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        '<div class="requires"><p><strong>%1$s</strong> %2$s</p><p>%3$s</p></div>',
-                       __( 'Requires:' ),
-                       implode( ' | ', $links ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 '<div class="requires"><p>%1$s</p><p>%2$s</p></div>',
+                       $requires,
</ins><span class="cx" style="display: block; padding: 0 10px">                         $dependency_note
</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="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php   2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        /* translators: %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                        esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        __( 'Install Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 _x( 'Install Now', 'theme' )
</ins><span class="cx" style="display: block; padding: 0 10px">                                 );
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></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        2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php  2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $activate_link,
</span><span class="cx" style="display: block; padding: 0 10px">                                /* translators: %s: Theme name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                esc_attr( sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $title ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                __( 'Activate' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         _x( 'Activate', 'theme' )
</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 ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
</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    2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/plugin-install.php      2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,7 +361,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ?>
</span><span class="cx" style="display: block; padding: 0 10px">                </label>
</span><span class="cx" style="display: block; padding: 0 10px">                <input type="file" id="pluginzip" name="pluginzip" accept=".zip" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php submit_button( _x( 'Install Now', 'plugin' ), '', 'install-plugin-submit', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">         </form>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">        <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -887,7 +887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $button = wp_get_plugin_action_button( $api->name, $api, $compatible_php, $compatible_wp );
</span><span class="cx" style="display: block; padding: 0 10px">                $button = str_replace( 'class="', 'class="right ', $button );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! str_contains( $button, __( 'Activate' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! str_contains( $button, _x( 'Activate', 'plugin' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $button = str_replace( 'class="', 'id="plugin_install_from_iframe" class="', $button );
</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">@@ -954,7 +954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /* translators: %s: Plugin name and version. */
</span><span class="cx" style="display: block; padding: 0 10px">                esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $name ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                esc_attr( $name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                __( 'Install Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _x( 'Install Now', '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 ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,7 +969,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Plugin name and version. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $name ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_attr( $name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'Install Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 _x( 'Install Now', 'plugin' )
</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">                                                $button = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,7 +991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s: Plugin name and version. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $name ) ),
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_attr( $name ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        __( 'Update Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 _x( 'Update Now', 'plugin' )
</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">                                                $button = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,7 +1011,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        );
</span><span class="cx" style="display: block; padding: 0 10px">                                } elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $compatible_php && $compatible_wp && $all_plugin_dependencies_active ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $button_text = __( 'Activate' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $button_text = _x( 'Activate', 'plugin' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                $button_label = _x( 'Activate %s', 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">                                                $activate_url = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1024,7 +1024,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 ( is_network_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        $button_text = __( 'Network Activate' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 $button_text = _x( 'Network Activate', 'plugin' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         /* translators: %s: Plugin name. */
</span><span class="cx" style="display: block; padding: 0 10px">                                                        $button_label = _x( 'Network Activate %s', 'plugin' );
</span><span class="cx" style="display: block; padding: 0 10px">                                                        $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1042,7 +1042,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                                $button = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        '<button type="button" class="button button-disabled" disabled="disabled">%s</button>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate', 'plugin' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 is_network_admin() ? _x( 'Network Activate', 'plugin' ) : _x( '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">                                } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemeinstallphp"></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-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme-install.php     2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/includes/theme-install.php       2024-02-26 20:33:46 UTC (rev 57714)
</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">        </label>
</span><span class="cx" style="display: block; padding: 0 10px">        <input type="file" id="themezip" name="themezip" accept=".zip" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        <?php submit_button( __( 'Install Now' ), '', 'install-theme-submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( _x( 'Install Now', 'theme' ), '', 'install-theme-submit', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</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="trunksrcwpadminpressthisphp"></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/press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/press-this.php 2024-02-26 20:16:09 UTC (rev 57713)
+++ trunk/src/wp-admin/press-this.php   2024-02-26 20:33:46 UTC (rev 57714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        '<a href="%1$s" class="install-now" data-slug="%2$s" data-name="%2$s" aria-label="%3$s">%3$s</a>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        esc_url( $url ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        esc_attr( $plugin_slug ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        __( 'Install Now' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 _x( 'Install Now', 'plugin' )
</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">                                $action = sprintf(
</span></span></pre>
</div>
</div>

</body>
</html>