Index: wp-admin/includes/class-wp-ms-themes-list-table.php =================================================================== --- wp-admin/includes/class-wp-ms-themes-list-table.php (revision 16587) +++ wp-admin/includes/class-wp-ms-themes-list-table.php (working copy) @@ -205,7 +205,7 @@ $text = _n( 'Disabled (%s)', 'Disabled (%s)', $count ); break; case 'upgrade': - $text = _n( 'Upgrade Available (%s)', 'Upgrade Available (%s)', $count ); + $text = _n( 'Update Available (%s)', 'Update Available (%s)', $count ); break; case 'search': $text = _n( 'Search Results (%s)', 'Search Results (%s)', $count ); Index: wp-admin/includes/class-wp-plugins-list-table.php =================================================================== --- wp-admin/includes/class-wp-plugins-list-table.php (revision 16587) +++ wp-admin/includes/class-wp-plugins-list-table.php (working copy) @@ -233,7 +233,7 @@ $text = _n( 'Drop-ins (%s)', 'Drop-ins (%s)', $count ); break; case 'upgrade': - $text = _n( 'Upgrade Available (%s)', 'Upgrade Available (%s)', $count ); + $text = _n( 'Update Available (%s)', 'Update Available (%s)', $count ); break; case 'search': $text = _n( 'Search Results (%s)', 'Search Results (%s)', $count ); Index: wp-admin/includes/class-wp-upgrader.php =================================================================== --- wp-admin/includes/class-wp-upgrader.php (revision 16587) +++ wp-admin/includes/class-wp-upgrader.php (working copy) @@ -368,14 +368,14 @@ function upgrade_strings() { $this->strings['up_to_date'] = __('The plugin is at the latest version.'); - $this->strings['no_package'] = __('Upgrade package not available.'); + $this->strings['no_package'] = __('Update package not available.'); $this->strings['downloading_package'] = __('Downloading update from %s…'); $this->strings['unpack_package'] = __('Unpacking the update…'); $this->strings['deactivate_plugin'] = __('Deactivating the plugin…'); $this->strings['remove_old'] = __('Removing the old version of the plugin…'); $this->strings['remove_old_failed'] = __('Could not remove the old plugin.'); - $this->strings['process_failed'] = __('Plugin upgrade failed.'); - $this->strings['process_success'] = __('Plugin upgraded successfully.'); + $this->strings['process_failed'] = __('Plugin update failed.'); + $this->strings['process_success'] = __('Plugin updated successfully.'); } function install_strings() { @@ -608,13 +608,13 @@ function upgrade_strings() { $this->strings['up_to_date'] = __('The theme is at the latest version.'); - $this->strings['no_package'] = __('Upgrade package not available.'); + $this->strings['no_package'] = __('Update package not available.'); $this->strings['downloading_package'] = __('Downloading update from %s…'); $this->strings['unpack_package'] = __('Unpacking the update…'); $this->strings['remove_old'] = __('Removing the old version of the theme…'); $this->strings['remove_old_failed'] = __('Could not remove the old theme.'); - $this->strings['process_failed'] = __('Theme upgrade failed.'); - $this->strings['process_success'] = __('Theme upgraded successfully.'); + $this->strings['process_failed'] = __('Theme update failed.'); + $this->strings['process_success'] = __('Theme updated successfully.'); } function install_strings() { @@ -861,7 +861,7 @@ function upgrade_strings() { $this->strings['up_to_date'] = __('WordPress is at the latest version.'); - $this->strings['no_package'] = __('Upgrade package not available.'); + $this->strings['no_package'] = __('Update package not available.'); $this->strings['downloading_package'] = __('Downloading update from %s…'); $this->strings['unpack_package'] = __('Unpacking the update…'); $this->strings['copy_failed'] = __('Could not copy files.'); @@ -1017,7 +1017,7 @@ } function __construct($args = array()) { - $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Upgrade Plugin') ); + $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') ); $args = wp_parse_args($args, $defaults); $this->plugin = $args['plugin']; @@ -1388,7 +1388,7 @@ } function __construct($args = array()) { - $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Upgrade Theme') ); + $defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') ); $args = wp_parse_args($args, $defaults); $this->theme = $args['theme']; Index: wp-admin/includes/theme.php =================================================================== --- wp-admin/includes/theme.php (revision 16587) +++ wp-admin/includes/theme.php (working copy) @@ -239,14 +239,14 @@ $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : ''); $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. $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); - $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;"'; + $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Upgrading this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"'; if ( ! current_user_can('update_themes') ) printf( '

' . __('There is a new version of %1$s available. View version %3$s details.') . '

', $theme_name, $details_url, $update['new_version']); else if ( empty($update['package']) ) - printf( '

' . __('There is a new version of %1$s available. View version %3$s details. Automatic upgrade is unavailable for this theme.') . '

', $theme_name, $details_url, $update['new_version']); + printf( '

' . __('There is a new version of %1$s available. View version %3$s details. Automatic update is unavailable for this theme.') . '

', $theme_name, $details_url, $update['new_version']); else - printf( '

' . __('There is a new version of %1$s available. View version %3$s details or upgrade automatically.') . '

', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); + printf( '

' . __('There is a new version of %1$s available. View version %3$s details or update automatically.') . '

', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); } } Index: wp-admin/includes/update.php =================================================================== --- wp-admin/includes/update.php (revision 16587) +++ wp-admin/includes/update.php (working copy) @@ -199,9 +199,9 @@ if ( ! current_user_can('update_plugins') ) printf( __('There is a new version of %1$s available. View version %4$s details.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. View version %4$s details. Automatic upgrade is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); + printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version ); else - printf( __('There is a new version of %1$s available. View version %4$s details or upgrade automatically.'), $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) ); + printf( __('There is a new version of %1$s available. View version %4$s details or update automatically.'), $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) ); } do_action( "in_plugin_update_message-$file", $plugin_data, $r ); @@ -274,9 +274,9 @@ if ( ! current_user_can('update_themes') ) printf( __('There is a new version of %1$s available. View version %4$s details.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version ); else if ( empty( $r['package'] ) ) - printf( __('There is a new version of %1$s available. View version %4$s details. Automatic upgrade is unavailable for this plugin.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] ); + printf( __('There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this plugin.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] ); else - printf( __('There is a new version of %1$s available. View version %4$s details or upgrade automatically.'), $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) ); + printf( __('There is a new version of %1$s available. View version %4$s details or update automatically.'), $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) ); do_action( "in_theme_update_message-$theme_key", $theme, $r ); Index: wp-admin/includes/upgrade.php =================================================================== --- wp-admin/includes/upgrade.php (revision 16587) +++ wp-admin/includes/upgrade.php (working copy) @@ -1656,7 +1656,7 @@ } // Add a theme header. - $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"; + $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"; $stylelines = file_get_contents("$site_dir/style.css"); if ($stylelines) { Index: wp-admin/network/upgrade.php =================================================================== --- wp-admin/network/upgrade.php (revision 16587) +++ wp-admin/network/upgrade.php (working copy) @@ -19,7 +19,7 @@ $parent_file = 'upgrade.php'; add_contextual_help($current_screen, - '

' . __('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.') . '

' . + '

' . __('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.') . '

' . '

' . __('If a version update to core has not happened, clicking this button won’t affect anything.') . '

' . '

' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '

' . '

' . __('For more information:') . '

' . Index: wp-admin/plugins.php =================================================================== --- wp-admin/plugins.php (revision 16587) +++ wp-admin/plugins.php (working copy) @@ -98,7 +98,7 @@ else $plugins = array(); - $title = __( 'Upgrade Plugins' ); + $title = __( 'Update Plugins' ); $parent_file = 'plugins.php'; require_once(ABSPATH . 'wp-admin/admin-header.php'); Index: wp-admin/update-core.php =================================================================== --- wp-admin/update-core.php (revision 16587) +++ wp-admin/update-core.php (working copy) @@ -70,7 +70,7 @@ if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) ) echo '

'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'

'; else if ( 'en_US' == $update->locale && get_locale() != 'en_US' ) { - echo '

'.sprintf( __('You are about to install WordPress %s in English (US). There is a chance this upgrade will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'

'; + echo '

'.sprintf( __('You are about to install WordPress %s in English (US). There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->current ).'

'; } echo ''; @@ -392,7 +392,7 @@ add_contextual_help($current_screen, '

' . __('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.') . '

' . '

' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '

' . - '

' . __('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.') . '

' . + '

' . __('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.') . '

' . '

' . __('For more information:') . '

' . '

' . __('Documentation on Updating WordPress') . '

' . '

' . __('Support Forums') . '

' Index: wp-admin/upgrade.php =================================================================== --- wp-admin/upgrade.php (revision 16587) +++ wp-admin/upgrade.php (working copy) @@ -46,7 +46,7 @@ > - <?php _e( 'WordPress › Upgrade' ); ?> + <?php _e( 'WordPress › Update' ); ?> -

+

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 ); + printf( __('You cannot update 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 ); elseif ( !$php_compat ) - printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); + printf( __('You cannot udate because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); elseif ( !$mysql_compat ) - printf( __('You cannot upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); + printf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); ?> -

-

-

-

+

+

+

+

-

-

+

+