Changeset 13590
- Timestamp:
- 03/04/2010 11:28:15 PM (14 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/includes/ms.php
r13586 r13590 667 667 return false; 668 668 if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) 669 echo "<div id='update-nag'>" . __( 'Thank you for Up grading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your sites.' ) . "</div>";669 echo "<div id='update-nag'>" . __( 'Thank you for Updating! Please visit the <a href="ms-upgrade-network.php">Update Network</a> page to update all your sites.' ) . "</div>"; 670 670 } 671 671 add_action( 'admin_notices', 'site_admin_notice' ); -
trunk/wp-admin/menu.php
r13589 r13590 35 35 $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'manage_network_themes', 'ms-themes.php' ); 36 36 $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'manage_network_options', 'ms-options.php' ); 37 $submenu[ 'ms-admin.php' ][30] = array( __('Up grade'), 'manage_network', 'ms-upgrade-network.php' );37 $submenu[ 'ms-admin.php' ][30] = array( __('Update'), 'manage_network', 'ms-upgrade-network.php' ); 38 38 39 39 $menu[1] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); -
trunk/wp-admin/ms-upgrade-network.php
r13301 r13590 7 7 require_once( ABSPATH . WPINC . '/http.php' ); 8 8 9 $title = __('Up grade Network');9 $title = __('Update Network'); 10 10 $parent_file = 'ms-admin.php'; 11 11 require_once('admin-header.php'); … … 16 16 echo '<div class="wrap">'; 17 17 screen_icon(); 18 echo '<h2>'.__('Up grade Network').'</h2>';18 echo '<h2>'.__('Update Network').'</h2>'; 19 19 20 20 $action = isset($_GET['action']) ? $_GET['action'] : 'show'; … … 38 38 $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) ); 39 39 if ( is_wp_error( $response ) ) 40 wp_die( "<strong>Warning!</strong> Problem up grading {$siteurl}. Your server may not be able to connect to blogs running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );40 wp_die( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" ); 41 41 do_action( 'after_mu_upgrade', $response ); 42 42 do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] ); … … 59 59 case 'show': 60 60 default: 61 ?><p><?php _e("You can up grade all the sites on your network through this page. It works by calling the upgrade script of each site automatically. Hit the link below to upgrade."); ?></p>62 <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Up grade Network"); ?></a></p><?php61 ?><p><?php _e("You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update."); ?></p> 62 <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php 63 63 do_action( 'wpmu_upgrade_page' ); 64 64 break; -
trunk/wp-admin/update-core.php
r13588 r13590 20 20 if ( !isset($update->response) || 'latest' == $update->response ) 21 21 $current = true; 22 $submit = __('Up grade Automatically');22 $submit = __('Update Automatically'); 23 23 $form_action = 'update-core.php?action=do-core-upgrade'; 24 24 $php_version = phpversion(); … … 26 26 $show_buttons = true; 27 27 if ( 'development' == $update->response ) { 28 $message = __('You are using a development version of WordPress. You can up grade to the latest nightly build automatically or download the nightly build and install it manually:');28 $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:'); 29 29 $download = __('Download nightly build'); 30 30 } else { 31 31 if ( $current ) { 32 $message = sprintf(__('You have the latest version of WordPress. You do not need to up grade. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);32 $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); 33 33 $submit = __('Re-install Automatically'); 34 34 $form_action = 'update-core.php?action=do-core-reinstall'; … … 37 37 $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); 38 38 if ( !$mysql_compat && !$php_compat ) 39 $message = sprintf( __('You cannot up grade 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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );39 $message = sprintf( __('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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ); 40 40 elseif ( !$php_compat ) 41 $message = sprintf( __('You cannot up grade 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.'), $update->current, $update->php_version, $php_version );41 $message = sprintf( __('You cannot update 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.'), $update->current, $update->php_version, $php_version ); 42 42 elseif ( !$mysql_compat ) 43 $message = sprintf( __('You cannot up grade 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.'), $update->current, $update->mysql_version, $mysql_version );43 $message = sprintf( __('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.'), $update->current, $update->mysql_version, $mysql_version ); 44 44 else 45 $message = sprintf(__('You can up grade to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> automatically or download the package and install it manually:'), $version_string);45 $message = sprintf(__('You can update to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> automatically or download the package and install it manually:'), $version_string); 46 46 if ( !$mysql_compat || !$php_compat ) 47 47 $show_buttons = false; … … 128 128 if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { 129 129 echo '<h3>'; 130 _e('You have the latest version of WordPress. You do not need to up grade');130 _e('You have the latest version of WordPress. You do not need to update'); 131 131 echo '</h3>'; 132 132 } else { 133 133 echo '<div class="updated"><p>'; 134 _e('<strong>Important:</strong> before up grading, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');134 _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.'); 135 135 echo '</p></div>'; 136 136 137 137 echo '<h3 class="response">'; 138 _e( 'There is a new version of WordPress available for up grade' );138 _e( 'There is a new version of WordPress available for update' ); 139 139 echo '</h3>'; 140 140 } … … 176 176 ?> 177 177 <h3><?php _e('Plugins'); ?></h3> 178 <p><?php _e('The following plugins have new versions available. Check the ones you want to up grade and then click "Upgrade Plugins".'); ?></p>178 <p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p> 179 179 <form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade"> 180 180 <?php wp_nonce_field('upgrade-core'); ?> 181 <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Up grade Plugins'); ?>" name="upgrade" /></p>181 <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p> 182 182 <table class="widefat" cellspacing="0" id="update-plugins-table"> 183 183 <thead> … … 225 225 <tr class='active'> 226 226 <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th> 227 <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Up grade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td>227 <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td> 228 228 </tr>"; 229 229 } … … 231 231 </tbody> 232 232 </table> 233 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Up grade Plugins'); ?>" name="upgrade" /></p>233 <p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p> 234 234 </form> 235 235 <?php … … 303 303 <div class="wrap"> 304 304 <?php screen_icon(); ?> 305 <h2><?php _e('Up grade WordPress'); ?></h2>305 <h2><?php _e('Update WordPress'); ?></h2> 306 306 <?php 307 307 if ( $wp_filesystem->errors->get_error_code() ) { … … 322 322 show_message( __('Installation Failed') ); 323 323 } else { 324 show_message( __('WordPress up graded successfully') );324 show_message( __('WordPress updated successfully') ); 325 325 show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( admin_url() ) . '">' . __('Go to Dashboard') . '</a>' ); 326 326 }
Note: See TracChangeset
for help on using the changeset viewer.