diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 4a80715176..b8e4042994 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -666,7 +666,7 @@ function site_admin_notice() { if ( !is_super_admin() ) return false; if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) - echo "
" . __( 'Thank you for Upgrading! Please visit the Upgrade Network page to update all your sites.' ) . "
"; + echo "
" . __( 'Thank you for Updating! Please visit the Update Network page to update all your sites.' ) . "
"; } add_action( 'admin_notices', 'site_admin_notice' ); diff --git a/wp-admin/menu.php b/wp-admin/menu.php index c8388c8f57..69b5a16690 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -34,7 +34,7 @@ if ( is_multisite() && is_super_admin() ) { $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'manage_network_users', 'ms-users.php' ); $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'manage_network_themes', 'ms-themes.php' ); $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'manage_network_options', 'ms-options.php' ); - $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'manage_network', 'ms-upgrade-network.php' ); + $submenu[ 'ms-admin.php' ][30] = array( __('Update'), 'manage_network', 'ms-upgrade-network.php' ); $menu[1] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); diff --git a/wp-admin/ms-upgrade-network.php b/wp-admin/ms-upgrade-network.php index af8f8c11c8..f2de8c595e 100644 --- a/wp-admin/ms-upgrade-network.php +++ b/wp-admin/ms-upgrade-network.php @@ -6,7 +6,7 @@ if ( !is_multisite() ) require_once( ABSPATH . WPINC . '/http.php' ); -$title = __('Upgrade Network'); +$title = __('Update Network'); $parent_file = 'ms-admin.php'; require_once('admin-header.php'); @@ -15,7 +15,7 @@ if ( ! current_user_can( 'manage_network' ) ) echo '
'; screen_icon(); -echo '

'.__('Upgrade Network').'

'; +echo '

'.__('Update Network').'

'; $action = isset($_GET['action']) ? $_GET['action'] : 'show'; @@ -37,7 +37,7 @@ switch ( $action ) { echo "
  • $siteurl
  • "; $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) ); if ( is_wp_error( $response ) ) - wp_die( "Warning! Problem upgrading {$siteurl}. Your server may not be able to connect to blogs running on it.
    Error message: " . $response->get_error_message() ."" ); + wp_die( "Warning! Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.
    Error message: " . $response->get_error_message() ."" ); do_action( 'after_mu_upgrade', $response ); do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] ); } @@ -58,8 +58,8 @@ switch ( $action ) { break; case 'show': default: - ?>

    -

    +

    response) || 'latest' == $update->response ) $current = true; - $submit = __('Upgrade Automatically'); + $submit = __('Update Automatically'); $form_action = 'update-core.php?action=do-core-upgrade'; $php_version = phpversion(); $mysql_version = $wpdb->db_version(); $show_buttons = true; if ( 'development' == $update->response ) { - $message = __('You are using a development version of WordPress. You can upgrade to the latest nightly build automatically or download the nightly build and install it manually:'); + $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:'); $download = __('Download nightly build'); } else { if ( $current ) { - $message = sprintf(__('You have the latest version of WordPress. You do not need to upgrade. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string); + $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string); $submit = __('Re-install Automatically'); $form_action = 'update-core.php?action=do-core-reinstall'; } else { $php_compat = version_compare( $php_version, $update->php_version, '>=' ); $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); if ( !$mysql_compat && !$php_compat ) - $message = sprintf( __('You cannot upgrade 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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); + $message = sprintf( __('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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); elseif ( !$php_compat ) - $message = sprintf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version ); elseif ( !$mysql_compat ) - $message = sprintf( __('You cannot upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); + $message = sprintf( __('You cannot update because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version ); else - $message = sprintf(__('You can upgrade to WordPress %1$s automatically or download the package and install it manually:'), $version_string); + $message = sprintf(__('You can update to WordPress %1$s automatically or download the package and install it manually:'), $version_string); if ( !$mysql_compat || !$php_compat ) $show_buttons = false; } @@ -127,15 +127,15 @@ function core_upgrade_preamble() { if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { echo '

    '; - _e('You have the latest version of WordPress. You do not need to upgrade'); + _e('You have the latest version of WordPress. You do not need to update'); echo '

    '; } else { echo '

    '; - _e('Important: before upgrading, please backup your database and files.'); + _e('Important: before updating, please backup your database and files.'); echo '

    '; echo '

    '; - _e( 'There is a new version of WordPress available for upgrade' ); + _e( 'There is a new version of WordPress available for update' ); echo '

    '; } @@ -175,10 +175,10 @@ function list_plugin_updates() { $core_update_version = $core_updates[0]->current; ?>

    -

    +

    -

    +

    @@ -224,13 +224,13 @@ function list_plugin_updates() { echo " - + "; } ?>
    {$plugin_data->Name}" . sprintf(__('You are running version %1$s. Upgrade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "{$plugin_data->Name}" . sprintf(__('You are running version %1$s. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "
    -

    +

    -

    +

    errors->get_error_code() ) { foreach ( $wp_filesystem->errors->get_error_messages() as $message ) @@ -321,7 +321,7 @@ function do_core_upgrade( $reinstall = false ) { if ('up_to_date' != $result->get_error_code() ) show_message( __('Installation Failed') ); } else { - show_message( __('WordPress upgraded successfully') ); + show_message( __('WordPress updated successfully') ); show_message( '' . __('Actions:') . ' ' . __('Go to Dashboard') . '' ); } echo '
    ';