<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[16696] trunk: Standardize around "Update" instead of "Upgrade."
props RanYanivHartstein.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16696">16696</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-02 21:45:47 +0000 (Thu, 02 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize around "Update" instead of "Upgrade." props RanYanivHartstein. props latz. fixes <a href="http://trac.wordpress.org/ticket/14107">#14107</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesupdatephp">trunk/wp-admin/includes/update.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminnetworkupgradephp">trunk/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> $text = _n( 'Disabled <span class="count">(%s)</span>', 'Disabled <span class="count">(%s)</span>', $count );
</span><span class="cx"> break;
</span><span class="cx"> case 'upgrade':
</span><del>- $text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
</del><ins>+ $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
</ins><span class="cx"> break;
</span><span class="cx"> case 'search':
</span><span class="cx"> $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> $text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
</span><span class="cx"> break;
</span><span class="cx"> case 'upgrade':
</span><del>- $text = _n( 'Upgrade Available <span class="count">(%s)</span>', 'Upgrade Available <span class="count">(%s)</span>', $count );
</del><ins>+ $text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
</ins><span class="cx"> break;
</span><span class="cx"> case 'search':
</span><span class="cx"> $text = _n( 'Search Results <span class="count">(%s)</span>', 'Search Results <span class="count">(%s)</span>', $count );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -368,14 +368,14 @@
</span><span class="cx">
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('The plugin is at the latest version.');
</span><del>- $this->strings['no_package'] = __('Upgrade package not available.');
</del><ins>+ $this->strings['no_package'] = __('Update package not available.');
</ins><span class="cx"> $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
</span><span class="cx"> $this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
</span><span class="cx"> $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
</span><span class="cx"> $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
</span><del>- $this->strings['process_failed'] = __('Plugin upgrade failed.');
- $this->strings['process_success'] = __('Plugin upgraded successfully.');
</del><ins>+ $this->strings['process_failed'] = __('Plugin update failed.');
+ $this->strings['process_success'] = __('Plugin updated successfully.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install_strings() {
</span><span class="lines">@@ -608,13 +608,13 @@
</span><span class="cx">
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('The theme is at the latest version.');
</span><del>- $this->strings['no_package'] = __('Upgrade package not available.');
</del><ins>+ $this->strings['no_package'] = __('Update package not available.');
</ins><span class="cx"> $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
</span><span class="cx"> $this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
</span><span class="cx"> $this->strings['remove_old_failed'] = __('Could not remove the old theme.');
</span><del>- $this->strings['process_failed'] = __('Theme upgrade failed.');
- $this->strings['process_success'] = __('Theme upgraded successfully.');
</del><ins>+ $this->strings['process_failed'] = __('Theme update failed.');
+ $this->strings['process_success'] = __('Theme updated successfully.');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install_strings() {
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx">
</span><span class="cx"> function upgrade_strings() {
</span><span class="cx"> $this->strings['up_to_date'] = __('WordPress is at the latest version.');
</span><del>- $this->strings['no_package'] = __('Upgrade package not available.');
</del><ins>+ $this->strings['no_package'] = __('Update package not available.');
</ins><span class="cx"> $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
</span><span class="cx"> $this->strings['copy_failed'] = __('Could not copy files.');
</span><span class="lines">@@ -1017,7 +1017,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function __construct($args = array()) {
</span><del>- $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Upgrade Plugin') );
</del><ins>+ $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx">
</span><span class="cx"> $this->plugin = $args['plugin'];
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function __construct($args = array()) {
</span><del>- $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Upgrade Theme') );
</del><ins>+ $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
</ins><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><span class="cx">
</span><span class="cx"> $this->theme = $args['theme'];
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/theme.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -239,15 +239,15 @@
</span><span class="cx"> $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
</span><span class="cx"> $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
</span><span class="cx"> $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
</span><del>- $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
</del><ins>+ $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
</ins><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> if ( ! current_user_can('update_themes') )
</span><span class="cx"> printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
</span><span class="cx"> else if ( empty($update['package']) )
</span><del>- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic upgrade is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
</del><ins>+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a>. <em>Automatic update is unavailable for this theme.</em>') . '</strong></p>', $theme_name, $details_url, $update['new_version']);
</ins><span class="cx"> else
</span><del>- printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>upgrade automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
</del><ins>+ printf( '<p><strong>' . __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s details</a> or <a href="%4$s" %5$s>update automatically</a>.') . '</strong></p>', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/update.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -199,9 +199,9 @@
</span><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><span class="cx"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
</span><span class="cx"> else if ( empty($r->package) )
</span><del>- printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic upgrade is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
</del><ins>+ printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
</ins><span class="cx"> else
</span><del>- printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">upgrade automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
</del><ins>+ printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( "in_plugin_update_message-$file", $plugin_data, $r );
</span><span class="lines">@@ -274,9 +274,9 @@
</span><span class="cx"> if ( ! current_user_can('update_themes') )
</span><span class="cx"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
</span><span class="cx"> else if ( empty( $r['package'] ) )
</span><del>- printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic upgrade is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
</del><ins>+ printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
</ins><span class="cx"> else
</span><del>- printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">upgrade automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
</del><ins>+ printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update automatically</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
</ins><span class="cx">
</span><span class="cx"> do_action( "in_theme_update_message-$theme_key", $theme, $r );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/includes/upgrade.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -1656,7 +1656,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add a theme header.
</span><del>- $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
</del><ins>+ $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
</ins><span class="cx">
</span><span class="cx"> $stylelines = file_get_contents("$site_dir/style.css");
</span><span class="cx"> if ($stylelines) {
</span></span></pre></div>
<a id="trunkwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/upgrade.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/upgrade.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/network/upgrade.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $parent_file = 'upgrade.php';
</span><span class="cx">
</span><span class="cx"> add_contextual_help($current_screen,
</span><del>- '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database upgrades are applied.') . '</p>' .
</del><ins>+ '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
</ins><span class="cx"> '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
</span><span class="cx"> '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/plugins.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> else
</span><span class="cx"> $plugins = array();
</span><span class="cx">
</span><del>- $title = __( 'Upgrade Plugins' );
</del><ins>+ $title = __( 'Update Plugins' );
</ins><span class="cx"> $parent_file = 'plugins.php';
</span><span class="cx">
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/update-core.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )
</span><span class="cx"> 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"> else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) {
</span><del>- echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this upgrade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'</p>';
</del><ins>+ 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->current ).'</p>';
</ins><span class="cx"> }
</span><span class="cx"> echo '</form>';
</span><span class="cx">
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification. It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>' .
</span><span class="cx"> '<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '</p>' .
</span><del>- '<p>' . __('To upgrade themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' .
</del><ins>+ '<p>' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_Updates_SubPanel" target="_blank">Documentation on Updating WordPress</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-admin/upgrade.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
</span><del>- <title><?php _e( 'WordPress &rsaquo; Upgrade' ); ?></title>
</del><ins>+ <title><?php _e( 'WordPress &rsaquo; Update' ); ?></title>
</ins><span class="cx"> <?php
</span><span class="cx"> wp_admin_css( 'install', true );
</span><span class="cx"> wp_admin_css( 'ie', true );
</span><span class="lines">@@ -57,17 +57,17 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
</span><span class="cx">
</span><del>-<h2><?php _e( 'No Upgrade Required' ); ?></h2>
</del><ins>+<h2><?php _e( 'No Update Required' ); ?></h2>
</ins><span class="cx"> <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
</span><span class="cx"> <p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
</span><span class="cx">
</span><span class="cx"> <?php elseif ( !$php_compat || !$mysql_compat ) :
</span><span class="cx"> if ( !$mysql_compat && !$php_compat )
</span><del>- printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> 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 );
</del><ins>+ printf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> 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 );
</ins><span class="cx"> elseif ( !$php_compat )
</span><del>- printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
</del><ins>+ printf( __('You cannot udate because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
</ins><span class="cx"> elseif ( !$mysql_compat )
</span><del>- printf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
</del><ins>+ printf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
</ins><span class="cx"> ?>
</span><span class="cx"> <?php else :
</span><span class="cx"> switch ( $step ) :
</span><span class="lines">@@ -76,10 +76,10 @@
</span><span class="cx"> $goback = esc_url_raw( $goback );
</span><span class="cx"> $goback = urlencode( $goback );
</span><span class="cx"> ?>
</span><del>-<h2><?php _e( 'Database Upgrade Required' ); ?></h2>
-<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to upgrade your database to the newest version.' ); ?></p>
-<p><?php _e( 'The upgrade process may take a little while, so please be patient.' ); ?></p>
-<p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Upgrade WordPress Database' ); ?></a></p>
</del><ins>+<h2><?php _e( 'Database Update Required' ); ?></h2>
+<p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
+<p><?php _e( 'The update process may take a little while, so please be patient.' ); ?></p>
+<p class="step"><a class="button" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 1:
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> $backto = esc_url_raw( $backto );
</span><span class="cx"> $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
</span><span class="cx"> ?>
</span><del>-<h2><?php _e( 'Upgrade Complete' ); ?></h2>
- <p><?php _e( 'Your WordPress database has been successfully upgraded!' ); ?></p>
</del><ins>+<h2><?php _e( 'Update Complete' ); ?></h2>
+ <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
</ins><span class="cx"> <p class="step"><a class="button" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
</span><span class="cx">
</span><span class="cx"> <!--
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16695 => 16696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-12-02 21:32:19 UTC (rev 16695)
+++ trunk/wp-includes/functions.php 2010-12-02 21:45:47 UTC (rev 16696)
</span><span class="lines">@@ -2596,7 +2596,7 @@
</span><span class="cx"> $trans['edit']['plugin'] = array( __( 'Your attempt to edit this plugin file: &#8220;%s&#8221; has failed.' ), 'use_id' );
</span><span class="cx"> $trans['activate']['plugin'] = array( __( 'Your attempt to activate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
</span><span class="cx"> $trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
</span><del>- $trans['upgrade']['plugin'] = array( __( 'Your attempt to upgrade this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
</del><ins>+ $trans['upgrade']['plugin'] = array( __( 'Your attempt to update this plugin: &#8220;%s&#8221; has failed.' ), 'use_id' );
</ins><span class="cx">
</span><span class="cx"> $trans['add']['post'] = array( __( 'Your attempt to add this post has failed.' ), false );
</span><span class="cx"> $trans['delete']['post'] = array( __( 'Your attempt to delete this post: &#8220;%s&#8221; has failed.' ), 'get_the_title' );
</span></span></pre>
</div>
</div>
</body>
</html>